diff options
Diffstat (limited to 'spec/unit/policy_builder/policyfile_spec.rb')
-rw-r--r-- | spec/unit/policy_builder/policyfile_spec.rb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/spec/unit/policy_builder/policyfile_spec.rb b/spec/unit/policy_builder/policyfile_spec.rb index f02c79ef12..5e2844201d 100644 --- a/spec/unit/policy_builder/policyfile_spec.rb +++ b/spec/unit/policy_builder/policyfile_spec.rb @@ -96,7 +96,7 @@ describe Chef::PolicyBuilder::Policyfile do http = double("Chef::REST") server_url = "https://api.opscode.com/organizations/example" Chef::Config[:chef_server_url] = server_url - Chef::REST.should_receive(:new).with(server_url).and_return(http) + expect(Chef::REST).to receive(:new).with(server_url).and_return(http) expect(policy_builder.http_api).to eq(http) end @@ -107,7 +107,7 @@ describe Chef::PolicyBuilder::Policyfile do end it "always gives `false` for #temporary_policy?" do - expect(initialize_pb.temporary_policy?).to be_false + expect(initialize_pb.temporary_policy?).to be_falsey end context "chef-solo" do @@ -168,15 +168,15 @@ describe Chef::PolicyBuilder::Policyfile do before do # TODO: agree on this name and logic. Chef::Config[:deployment_group] = "example-policy-stage" - policy_builder.stub(:http_api).and_return(http_api) + allow(policy_builder).to receive(:http_api).and_return(http_api) end context "when the deployment group cannot be loaded" do let(:error404) { Net::HTTPServerException.new("404 message", :body) } before do - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) - http_api.should_receive(:get). + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) + expect(http_api).to receive(:get). with("data/policyfiles/example-policy-stage"). and_raise(error404) end @@ -186,7 +186,7 @@ describe Chef::PolicyBuilder::Policyfile do end it "sends error message to the event system" do - events.should_receive(:node_load_failed).with(node_name, an_instance_of(err_namespace::ConfigurationError), Chef::Config) + expect(events).to receive(:node_load_failed).with(node_name, an_instance_of(err_namespace::ConfigurationError), Chef::Config) expect { policy_builder.load_node }.to raise_error(err_namespace::ConfigurationError) end @@ -195,7 +195,7 @@ describe Chef::PolicyBuilder::Policyfile do describe "when the deployment_group is not configured" do before do Chef::Config[:deployment_group] = nil - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) end it "errors while loading the node" do @@ -206,14 +206,14 @@ describe Chef::PolicyBuilder::Policyfile do it "passes error information to the event system" do # TODO: also make sure something acceptable happens with the error formatters err_class = err_namespace::ConfigurationError - events.should_receive(:node_load_failed).with(node_name, an_instance_of(err_class), Chef::Config) + expect(events).to receive(:node_load_failed).with(node_name, an_instance_of(err_class), Chef::Config) expect { policy_builder.load_node }.to raise_error(err_class) end end context "and a deployment_group is configured" do before do - http_api.should_receive(:get).with("data/policyfiles/example-policy-stage").and_return(parsed_policyfile_json) + expect(http_api).to receive(:get).with("data/policyfiles/example-policy-stage").and_return(parsed_policyfile_json) end it "fetches the policy file from a data bag item" do @@ -239,7 +239,7 @@ describe Chef::PolicyBuilder::Policyfile do end it "implements #expand_run_list in a manner compatible with ExpandNodeObject" do - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) policy_builder.load_node expect(policy_builder.expand_run_list).to respond_to(:recipes) expect(policy_builder.expand_run_list.recipes).to eq(["example1::default", "example2::server"]) @@ -278,7 +278,7 @@ describe Chef::PolicyBuilder::Policyfile do describe "building the node object" do before do - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) policy_builder.load_node policy_builder.build_node @@ -339,7 +339,7 @@ describe Chef::PolicyBuilder::Policyfile do let(:error404) { Net::HTTPServerException.new("404 message", :body) } before do - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) # Remove references to example2 cookbook because we're iterating # over a Hash data structure and on ruby 1.8.7 iteration order will @@ -350,7 +350,7 @@ describe Chef::PolicyBuilder::Policyfile do policy_builder.load_node policy_builder.build_node - http_api.should_receive(:get).with("cookbooks/example1/#{example1_xyz_version}"). + expect(http_api).to receive(:get).with("cookbooks/example1/#{example1_xyz_version}"). and_raise(error404) end @@ -362,17 +362,17 @@ describe Chef::PolicyBuilder::Policyfile do context "and the cookbooks can be fetched" do before do - Chef::Node.should_receive(:find_or_create).with(node_name).and_return(node) + expect(Chef::Node).to receive(:find_or_create).with(node_name).and_return(node) policy_builder.load_node policy_builder.build_node - http_api.should_receive(:get).with("cookbooks/example1/#{example1_xyz_version}"). + expect(http_api).to receive(:get).with("cookbooks/example1/#{example1_xyz_version}"). and_return(example1_cookbook_object) - http_api.should_receive(:get).with("cookbooks/example2/#{example2_xyz_version}"). + expect(http_api).to receive(:get).with("cookbooks/example2/#{example2_xyz_version}"). and_return(example2_cookbook_object) - Chef::CookbookSynchronizer.stub(:new). + allow(Chef::CookbookSynchronizer).to receive(:new). with(expected_cookbook_hash, events). and_return(cookbook_synchronizer) end @@ -382,13 +382,13 @@ describe Chef::PolicyBuilder::Policyfile do end it "syncs the desired cookbooks via CookbookSynchronizer" do - cookbook_synchronizer.should_receive(:sync_cookbooks) + expect(cookbook_synchronizer).to receive(:sync_cookbooks) policy_builder.sync_cookbooks end it "builds a run context" do - cookbook_synchronizer.should_receive(:sync_cookbooks) - Chef::RunContext.any_instance.should_receive(:load).with(policy_builder.run_list_expansion_ish) + expect(cookbook_synchronizer).to receive(:sync_cookbooks) + expect_any_instance_of(Chef::RunContext).to receive(:load).with(policy_builder.run_list_expansion_ish) run_context = policy_builder.setup_run_context expect(run_context.node).to eq(node) expect(run_context.cookbook_collection.keys).to match_array(["example1", "example2"]) |