summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSeth Vargo <sethvargo@gmail.com>2013-05-17 00:53:42 -0400
committerSeth Vargo <sethvargo@gmail.com>2013-05-19 18:09:04 -0500
commit966b1367cddd6cf5d39db42e07f866b74baa42e8 (patch)
treedc8286102e659157076ba96f676b1de0ca4184f0 /spec
parent7cd27caa8b324dde6008cbe4910608d2262c11f8 (diff)
downloadchef-zero-966b1367cddd6cf5d39db42e07f866b74baa42e8.tar.gz
Move everything to spec/; gitignore rspec.failures
Diffstat (limited to 'spec')
-rw-r--r--spec/run.rb2
-rw-r--r--spec/support/pedant.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/run.rb b/spec/run.rb
index 69240b9..b1cc74f 100644
--- a/spec/run.rb
+++ b/spec/run.rb
@@ -12,7 +12,7 @@ server = ChefZero::Server.new(port: 8889)
server.start_background
Pedant.config.suite = 'api'
-Pedant.config[:config_file] = 'test/support/pedant.rb'
+Pedant.config[:config_file] = 'spec/support/pedant.rb'
Pedant.setup([
'--skip-validation',
'--skip-authentication',
diff --git a/spec/support/pedant.rb b/spec/support/pedant.rb
index d4c24e5..0210858 100644
--- a/spec/support/pedant.rb
+++ b/spec/support/pedant.rb
@@ -62,7 +62,7 @@ include_internal false
# are using pre-existing users, you must supply a ':key_file' key,
# which should be the fully-qualified path /on the machine Pedant is
# running on/ to a private key for that user.
-key = 'test/support/stickywicket.pem'
+key = 'spec/support/stickywicket.pem'
superuser_name 'admin'
superuser_key key
webui_key key