summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Vargo <sethvargo@gmail.com>2013-05-17 00:52:07 -0400
committerSeth Vargo <sethvargo@gmail.com>2013-05-19 18:09:04 -0500
commit7cd27caa8b324dde6008cbe4910608d2262c11f8 (patch)
tree684dc53a1c1547102161ca64c9780485403ca8a7
parentc3c30c9bec279537a755aded4f86cd9f1931618a (diff)
downloadchef-zero-7cd27caa8b324dde6008cbe4910608d2262c11f8.tar.gz
Rename to spec
-rw-r--r--Rakefile2
-rw-r--r--spec/run.rb (renamed from test/run-pedant.rb)2
-rw-r--r--spec/support/pedant.rb (renamed from test/support/pedant.rb)0
-rw-r--r--spec/support/stickywicket.pem (renamed from test/support/stickywicket.pem)0
4 files changed, 2 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index f80bca2..b506dfc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,5 +15,5 @@ RDoc::Task.new do |rdoc|
end
task :test do
- sh "ruby test/run-pedant.rb"
+ sh "ruby spec/run.rb"
end
diff --git a/test/run-pedant.rb b/spec/run.rb
index c474f17..69240b9 100644
--- a/test/run-pedant.rb
+++ b/spec/run.rb
@@ -9,7 +9,7 @@ require 'pedant'
require 'pedant/opensource'
server = ChefZero::Server.new(port: 8889)
-thread = server.start_background
+server.start_background
Pedant.config.suite = 'api'
Pedant.config[:config_file] = 'test/support/pedant.rb'
diff --git a/test/support/pedant.rb b/spec/support/pedant.rb
index d4c24e5..d4c24e5 100644
--- a/test/support/pedant.rb
+++ b/spec/support/pedant.rb
diff --git a/test/support/stickywicket.pem b/spec/support/stickywicket.pem
index ff09e73..ff09e73 100644
--- a/test/support/stickywicket.pem
+++ b/spec/support/stickywicket.pem