move integration tests to top-level

inspec · Feb 18, 2016 · 9093237 · 9093237
1 parent 4f29112
commit 9093237
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-test/integration/.kitchen
 Berksfile.lock
+.kitchen
diff --git a/test/integration/.kitchen.yml → .kitchen.yml b/test/integration/.kitchen.yml → .kitchen.yml
diff --git a/Berksfile b/Berksfile
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+source 'https://supermarket.chef.io'
+
+cookbook 'os_prepare', path: './test/cookbooks/os_prepare'
diff --git a/Rakefile b/Rakefile
@@ -123,6 +123,6 @@ namespace :test do
   task :integration do
     concurrency = ENV['CONCURRENCY'] || 1
     path = File.join(File.dirname(__FILE__), 'test', 'integration')
-    sh('sh', '-c', "cd #{path} && bundle exec kitchen test -c #{concurrency}")
+    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency}")
   end
 end
diff --git a/...egration/cookbooks/os_prepare/metadata.rb → test/cookbooks/os_prepare/metadata.rb b/...egration/cookbooks/os_prepare/metadata.rb → test/cookbooks/os_prepare/metadata.rb
diff --git a/...n/cookbooks/os_prepare/recipes/default.rb → test/cookbooks/os_prepare/recipes/default.rb b/...n/cookbooks/os_prepare/recipes/default.rb → test/cookbooks/os_prepare/recipes/default.rb
diff --git a/test/integration/Berksfile b/test/integration/Berksfile
diff --git a/...n/test/integration/default/_debug_spec.rb → test/integration/default/_debug_spec.rb b/...n/test/integration/default/_debug_spec.rb → test/integration/default/_debug_spec.rb
diff --git a/...ation/test/integration/default/os_spec.rb → test/integration/default/os_spec.rb b/...ation/test/integration/default/os_spec.rb → test/integration/default/os_spec.rb
diff --git a/...t/integration/profile/controls/example.rb → test/integration/profile/controls/example.rb b/...t/integration/profile/controls/example.rb → test/integration/profile/controls/example.rb
diff --git a/...st/integration/profile/controls/gordon.rb → test/integration/profile/controls/gordon.rb b/...st/integration/profile/controls/gordon.rb → test/integration/profile/controls/gordon.rb
diff --git a/...ation/test/integration/profile/inspec.yml → test/integration/profile/inspec.yml b/...ation/test/integration/profile/inspec.yml → test/integration/profile/inspec.yml
diff --git a/...ration/profile/libraries/gordon_config.rb → ...ration/profile/libraries/gordon_config.rb b/...ration/profile/libraries/gordon_config.rb → ...ration/profile/libraries/gordon_config.rb