features/support/env.rb in berkshelf-6.3.4 vs features/support/env.rb in berkshelf-7.0.0
- old
+ new
@@ -40,19 +40,20 @@
Berkshelf.initialize_filesystem
Berkshelf::CookbookStore.instance.initialize_filesystem
reload_configs
Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil)
- endpoints = [
- {
- type: "chef_server",
- options: {
- url: "http://localhost:#{CHEF_SERVER_PORT}",
- client_name: "reset",
- client_key: File.expand_path("spec/config/berkshelf.pem"),
- },
- },
- ]
+ # This appears to be dead code
+ #endpoints = [
+ # {
+ # type: "chef_server",
+ # options: {
+ # url: "http://localhost:#{CHEF_SERVER_PORT}",
+ # client_name: "reset",
+ # client_key: File.expand_path("spec/config/berkshelf.pem"),
+ # },
+ # },
+ #]
Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5
@aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15