refactor integration test to be inside the specs directory and not in…

… the main level Fixes elastic#5268
pioto · May 12, 2016 · bf12902 · bf12902
1 parent 3dd0a2e
commit bf12902
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 6 deletions.
diff --git a/rakelib/test.rake b/rakelib/test.rake
@@ -24,7 +24,7 @@ namespace "test" do
     # logstash-core-event specs since currently this is the most complete Event and Timestamp specs
     # which actually defines the Event contract and should pass regardless of the actuall underlying
     # implementation.
-    specs = ["spec/**/*_spec.rb", "logstash-core/spec/**/*_spec.rb", "logstash-core-event/spec/**/*_spec.rb"]
+    specs = ["spec/unit/**/*_spec.rb", "logstash-core/spec/**/*_spec.rb", "logstash-core-event/spec/**/*_spec.rb"]
 
     # figure if the logstash-core-event-java gem is loaded and if so add its specific specs in the core specs to run
     begin
@@ -112,7 +112,7 @@ namespace "test" do
     integration_path = File.join(source, "integration_run")
     FileUtils.rm_rf(integration_path)
 
-    exit(RSpec::Core::Runner.run([Rake::FileList["integration/**/*_spec.rb"]]))
+    exit(RSpec::Core::Runner.run([Rake::FileList["spec/integration/**/*_spec.rb"]]))
   end
 
   namespace "integration" do
@@ -124,7 +124,7 @@ namespace "test" do
       FileUtils.mkdir_p(integration_path)
 
       puts "[integration_spec] configuring local environment for running test in #{integration_path}, if you want to change this behavior delete the directory."
-      exit(RSpec::Core::Runner.run([Rake::FileList["integration/**/*_spec.rb"]]))
+      exit(RSpec::Core::Runner.run([Rake::FileList["spec/integration/**/*_spec.rb"]]))
     end
   end
 end

diff --git a/..._config/file_input_to_file_output_spec.rb → ..._config/file_input_to_file_output_spec.rb b/..._config/file_input_to_file_output_spec.rb → ..._config/file_input_to_file_output_spec.rb
diff --git a/integration/plugin_manager/logstash_spec.rb → ...tegration/plugin_manager/logstash_spec.rb b/integration/plugin_manager/logstash_spec.rb → ...tegration/plugin_manager/logstash_spec.rb
@@ -1,6 +1,6 @@
 # Encoding: utf-8
 require_relative "../spec_helper"
-require_relative "../../logstash-core/lib/logstash/version"
+require_relative "../../../logstash-core/lib/logstash/version"
 
 describe "bin/logstash" do
   it "returns the logstash version" do

diff --git a/...ion/plugin_manager/plugin_install_spec.rb → ...ion/plugin_manager/plugin_install_spec.rb b/...ion/plugin_manager/plugin_install_spec.rb → ...ion/plugin_manager/plugin_install_spec.rb
diff --git a/...ration/plugin_manager/plugin_list_spec.rb → ...ration/plugin_manager/plugin_list_spec.rb b/...ration/plugin_manager/plugin_list_spec.rb → ...ration/plugin_manager/plugin_list_spec.rb
diff --git a/...n/plugin_manager/plugin_uninstall_spec.rb → ...n/plugin_manager/plugin_uninstall_spec.rb b/...n/plugin_manager/plugin_uninstall_spec.rb → ...n/plugin_manager/plugin_uninstall_spec.rb
diff --git a/...tion/plugin_manager/plugin_update_spec.rb → ...tion/plugin_manager/plugin_update_spec.rb b/...tion/plugin_manager/plugin_update_spec.rb → ...tion/plugin_manager/plugin_update_spec.rb
diff --git a/integration/spec_helper.rb → spec/integration/spec_helper.rb b/integration/spec_helper.rb → spec/integration/spec_helper.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 require_relative "support/integration_test_helpers"
-require_relative "../logstash-core/lib/logstash/environment"
+require_relative "../../logstash-core/lib/logstash/environment"
 require "fileutils"
 
 if LogStash::Environment.windows?
@@ -9,7 +9,7 @@
 end
 
 # Configure the test environment
-source = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+source = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 integration_path = File.join(source, "integration_run")
 
 puts "[integration_spec] configure environment"

diff --git a/...ation/support/integration_test_helpers.rb → ...ation/support/integration_test_helpers.rb b/...ation/support/integration_test_helpers.rb → ...ation/support/integration_test_helpers.rb
diff --git a/integration/support/sample.log → spec/integration/support/sample.log b/integration/support/sample.log → spec/integration/support/sample.log
diff --git a/spec/bootstrap/bundler_spec.rb → spec/unit/bootstrap/bundler_spec.rb b/spec/bootstrap/bundler_spec.rb → spec/unit/bootstrap/bundler_spec.rb
diff --git a/spec/license_spec.rb → spec/unit/license_spec.rb b/spec/license_spec.rb → spec/unit/license_spec.rb
diff --git a/spec/plugin_manager/gemfile_spec.rb → spec/unit/plugin_manager/gemfile_spec.rb b/spec/plugin_manager/gemfile_spec.rb → spec/unit/plugin_manager/gemfile_spec.rb
diff --git a/spec/plugin_manager/install_spec.rb → spec/unit/plugin_manager/install_spec.rb b/spec/plugin_manager/install_spec.rb → spec/unit/plugin_manager/install_spec.rb
diff --git a/spec/plugin_manager/update_spec.rb → spec/unit/plugin_manager/update_spec.rb b/spec/plugin_manager/update_spec.rb → spec/unit/plugin_manager/update_spec.rb
diff --git a/spec/plugin_manager/util_spec.rb → spec/unit/plugin_manager/util_spec.rb b/spec/plugin_manager/util_spec.rb → spec/unit/plugin_manager/util_spec.rb
diff --git a/spec/util/compress_spec.rb → spec/unit/util/compress_spec.rb b/spec/util/compress_spec.rb → spec/unit/util/compress_spec.rb
diff --git a/spec/util/retryable_spec.rb → spec/unit/util/retryable_spec.rb b/spec/util/retryable_spec.rb → spec/unit/util/retryable_spec.rb