diff options
author | Bryan McLellan <btm@opscode.com> | 2015-02-17 11:59:50 -0500 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2015-02-17 12:01:19 -0500 |
commit | 6d7b7b78ff0c7471f79201cdf0adb5ccba007945 (patch) | |
tree | 3e6d45900d604e244b8cc6642b6cc3fe03cb5653 | |
parent | 8407fecd7dbad9a0c2034e8b488198e76341ebd0 (diff) | |
download | ohai-6d7b7b78ff0c7471f79201cdf0adb5ccba007945.tar.gz |
Convert specs to RSpec 3.2.0 syntax with Transpec
This conversion is done by Transpec 3.0.7 with the following command:
transpec spec/unit/plugins/network_spec.rb spec/unit/plugins/cloud_spec.rb spec/unit/plugins/cloud_v2_spec.rb spec/unit/plugins/digital_ocean_spec.rb
* 31 conversions
from: obj.should
to: expect(obj).to
* 27 conversions
from: == expected
to: eq(expected)
* 18 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 7 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
-rw-r--r-- | spec/unit/plugins/cloud_spec.rb | 22 | ||||
-rw-r--r-- | spec/unit/plugins/cloud_v2_spec.rb | 30 | ||||
-rw-r--r-- | spec/unit/plugins/digital_ocean_spec.rb | 80 |
3 files changed, 66 insertions, 66 deletions
diff --git a/spec/unit/plugins/cloud_spec.rb b/spec/unit/plugins/cloud_spec.rb index 3ed2c89a..31a9332b 100644 --- a/spec/unit/plugins/cloud_spec.rb +++ b/spec/unit/plugins/cloud_spec.rb @@ -252,41 +252,41 @@ describe Ohai::System, "plugin cloud" do end it "populates cloud public hostname" do - @plugin[:cloud][:public_hostname].should == "public.example.com" + expect(@plugin[:cloud][:public_hostname]).to eq("public.example.com") end it "populates cloud local hostname" do - @plugin[:cloud][:local_hostname].should be_nil + expect(@plugin[:cloud][:local_hostname]).to be_nil end it "populates cloud public ips" do - @plugin[:cloud][:public_ips].should == @plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'} + - @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'} + expect(@plugin[:cloud][:public_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'} + + @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'}) end it "populates cloud private ips" do - @plugin[:cloud][:private_ips].should == @plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'} + - @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'} + expect(@plugin[:cloud][:private_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'} + + @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'}) end it "populates cloud public_ipv4" do - @plugin[:cloud][:public_ipv4].should == @plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'} + expect(@plugin[:cloud][:public_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'}) end it "populates cloud local_ipv4" do - @plugin[:cloud][:local_ipv4].should == @plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'} + expect(@plugin[:cloud][:local_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'}) end it "populates cloud public_ipv6" do - @plugin[:cloud][:public_ipv6].should == @plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'} + expect(@plugin[:cloud][:public_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'}) end it "populates cloud local_ipv6" do - @plugin[:cloud][:local_ipv6].should == @plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'} + expect(@plugin[:cloud][:local_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'}) end it "populates cloud provider" do - @plugin[:cloud][:provider].should == "digital_ocean" + expect(@plugin[:cloud][:provider]).to eq("digital_ocean") end end diff --git a/spec/unit/plugins/cloud_v2_spec.rb b/spec/unit/plugins/cloud_v2_spec.rb index 753dec3b..5dc2b6ce 100644 --- a/spec/unit/plugins/cloud_v2_spec.rb +++ b/spec/unit/plugins/cloud_v2_spec.rb @@ -306,53 +306,53 @@ describe Ohai::System, "plugin cloud" do end it "populates cloud public hostname" do - @plugin[:cloud_v2][:public_hostname].should == "public.example.com" + expect(@plugin[:cloud_v2][:public_hostname]).to eq("public.example.com") end it "populates cloud local hostname" do - @plugin[:cloud_v2][:local_hostname].should be_nil + expect(@plugin[:cloud_v2][:local_hostname]).to be_nil end it "populates cloud public_ipv4_addrs" do - @plugin[:cloud_v2][:public_ipv4_addrs].should == @plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'} - .map{|ip| ip['ip_address']} + expect(@plugin[:cloud_v2][:public_ipv4_addrs]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'} + .map{|ip| ip['ip_address']}) end it "populates cloud local_ipv4_addrs" do - @plugin[:cloud_v2][:local_ipv4_addrs].should == @plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'} - .map{|ip| ip['ip_address']} + expect(@plugin[:cloud_v2][:local_ipv4_addrs]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'} + .map{|ip| ip['ip_address']}) end it "populates cloud public_ipv4" do - @plugin[:cloud_v2][:public_ipv4].should == @plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'}['ip_address'] + expect(@plugin[:cloud_v2][:public_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'}['ip_address']) end it "populates cloud local_ipv4" do - @plugin[:cloud_v2][:local_ipv4].should == @plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'}['ip_address'] + expect(@plugin[:cloud_v2][:local_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'}['ip_address']) end it "populates cloud public_ipv6_addrs" do - @plugin[:cloud_v2][:public_ipv6_addrs].should == @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'} - .map{|ip| ip['ip_address']} + expect(@plugin[:cloud_v2][:public_ipv6_addrs]).to eq(@plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'} + .map{|ip| ip['ip_address']}) end it "populates cloud local_ipv6_addrs" do - @plugin[:cloud_v2][:local_ipv6_addrs].should == @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'} - .map{|ip| ip['ip_address']} + expect(@plugin[:cloud_v2][:local_ipv6_addrs]).to eq(@plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'} + .map{|ip| ip['ip_address']}) end it "populates cloud public_ipv6" do - @plugin[:cloud_v2][:public_ipv6].should == @plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'}['ip_address'] + expect(@plugin[:cloud_v2][:public_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'}['ip_address']) end it "populates cloud local_ipv6" do - @plugin[:cloud_v2][:local_ipv6].should == @plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'}['ip_address'] + expect(@plugin[:cloud_v2][:local_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'}['ip_address']) end it "populates cloud provider" do - @plugin[:cloud_v2][:provider].should == "digital_ocean" + expect(@plugin[:cloud_v2][:provider]).to eq("digital_ocean") end end diff --git a/spec/unit/plugins/digital_ocean_spec.rb b/spec/unit/plugins/digital_ocean_spec.rb index d73e1960..eb2742de 100644 --- a/spec/unit/plugins/digital_ocean_spec.rb +++ b/spec/unit/plugins/digital_ocean_spec.rb @@ -51,10 +51,10 @@ describe Ohai::System, "plugin digital_ocean" do } } - File.stub(:exist?).with(hint_path_nix).and_return(true) - File.stub(:read).with(hint_path_nix).and_return(hint) - File.stub(:exist?).with(hint_path_win).and_return(true) - File.stub(:read).with(hint_path_win).and_return(hint) + allow(File).to receive(:exist?).with(hint_path_nix).and_return(true) + allow(File).to receive(:read).with(hint_path_nix).and_return(hint) + allow(File).to receive(:exist?).with(hint_path_win).and_return(true) + allow(File).to receive(:read).with(hint_path_win).and_return(hint) end @@ -64,22 +64,22 @@ describe Ohai::System, "plugin digital_ocean" do end it "does not create the digital_ocean mash" do - @plugin[:digital_ocean].should be_nil + expect(@plugin[:digital_ocean]).to be_nil end end shared_examples_for "digital_ocean_networking" do it "creates the networks attribute" do - @plugin[:digital_ocean][:networks].should_not be_nil + expect(@plugin[:digital_ocean][:networks]).not_to be_nil end it "pulls ip addresses from the network interfaces" do - @plugin[:digital_ocean][:networks][:v4].should == [{"ip_address" => "1.2.3.4", + expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{"ip_address" => "1.2.3.4", "type" => "public", - "netmask" => "255.255.255.0"}] - @plugin[:digital_ocean][:networks][:v6].should == [{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001", + "netmask" => "255.255.255.0"}]) + expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001", "type"=>"public", - "cidr"=>128}] + "cidr"=>128}]) end end @@ -89,27 +89,27 @@ describe Ohai::System, "plugin digital_ocean" do end it "creates a digital_ocean mash" do - @plugin[:digital_ocean].should_not be_nil + expect(@plugin[:digital_ocean]).not_to be_nil end it "has all hint attributes" do - @plugin[:digital_ocean][:droplet_id].should_not be_nil - @plugin[:digital_ocean][:name].should_not be_nil - @plugin[:digital_ocean][:image_id].should_not be_nil - @plugin[:digital_ocean][:size_id].should_not be_nil - @plugin[:digital_ocean][:region_id].should_not be_nil + expect(@plugin[:digital_ocean][:droplet_id]).not_to be_nil + expect(@plugin[:digital_ocean][:name]).not_to be_nil + expect(@plugin[:digital_ocean][:image_id]).not_to be_nil + expect(@plugin[:digital_ocean][:size_id]).not_to be_nil + expect(@plugin[:digital_ocean][:region_id]).not_to be_nil end it "skips the ip_addresses hint attribute" do - @plugin[:digital_ocean][:ip_addresses].should be_nil + expect(@plugin[:digital_ocean][:ip_addresses]).to be_nil end it "has correct values for all hint attributes" do - @plugin[:digital_ocean][:droplet_id].should == 12345678 - @plugin[:digital_ocean][:name].should == "example.com" - @plugin[:digital_ocean][:image_id].should == 3240036 - @plugin[:digital_ocean][:size_id].should == 66 - @plugin[:digital_ocean][:region_id].should == 4 + expect(@plugin[:digital_ocean][:droplet_id]).to eq(12345678) + expect(@plugin[:digital_ocean][:name]).to eq("example.com") + expect(@plugin[:digital_ocean][:image_id]).to eq(3240036) + expect(@plugin[:digital_ocean][:size_id]).to eq(66) + expect(@plugin[:digital_ocean][:region_id]).to eq(4) end include_examples 'digital_ocean_networking' @@ -117,8 +117,8 @@ describe Ohai::System, "plugin digital_ocean" do describe "with digital_ocean hint file" do before do - File.stub(:exist?).with(hint_path_nix).and_return(true) - File.stub(:exist?).with(hint_path_win).and_return(true) + allow(File).to receive(:exist?).with(hint_path_nix).and_return(true) + allow(File).to receive(:exist?).with(hint_path_win).and_return(true) end context "without private networking enabled" do @@ -140,32 +140,32 @@ describe Ohai::System, "plugin digital_ocean" do end it "should extract the private networking ips" do - @plugin[:digital_ocean][:networks][:v4].should == [{"ip_address" => "1.2.3.4", + expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{"ip_address" => "1.2.3.4", "type" => "public", "netmask" => "255.255.255.0"}, {"ip_address" => "10.128.142.89", "type" => "private", - "netmask" => "255.255.255.0"}] - @plugin[:digital_ocean][:networks][:v6].should == [{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001", + "netmask" => "255.255.255.0"}]) + expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001", "type"=>"public", "cidr"=>128}, {"ip_address"=>"fdf8:f53b:82e4:0000:0000:0000:0000:0053", "type"=>"private", - "cidr"=>128}] + "cidr"=>128}]) end end end describe "without digital_ocean hint file" do before do - File.stub(:exist?).with(hint_path_nix).and_return(false) - File.stub(:exist?).with(hint_path_win).and_return(false) + allow(File).to receive(:exist?).with(hint_path_nix).and_return(false) + allow(File).to receive(:exist?).with(hint_path_win).and_return(false) end describe "with the /etc/digitalocean file" do before do - File.stub(:exist?).with(digitalocean_path).and_return(true) + allow(File).to receive(:exist?).with(digitalocean_path).and_return(true) @plugin.run end it_should_behave_like "digital_ocean_networking" @@ -173,7 +173,7 @@ describe Ohai::System, "plugin digital_ocean" do describe "without the /etc/digitalocean file" do before do - File.stub(:exist?).with(digitalocean_path).and_return(false) + allow(File).to receive(:exist?).with(digitalocean_path).and_return(false) end it_should_behave_like "!digital_ocean" end @@ -184,18 +184,18 @@ describe Ohai::System, "plugin digital_ocean" do let(:ec2_hint_path_win) { 'C:\chef\ohai\hints/ec2.json' } before do - File.stub(:exist?).with(hint_path_nix).and_return(false) - File.stub(:exist?).with(hint_path_win).and_return(false) + allow(File).to receive(:exist?).with(hint_path_nix).and_return(false) + allow(File).to receive(:exist?).with(hint_path_win).and_return(false) - File.stub(:exist?).with(ec2_hint_path_nix).and_return(true) - File.stub(:read).with(ec2_hint_path_nix).and_return('') - File.stub(:exist?).with(ec2_hint_path_win).and_return(true) - File.stub(:read).with(ec2_hint_path_win).and_return('') + allow(File).to receive(:exist?).with(ec2_hint_path_nix).and_return(true) + allow(File).to receive(:read).with(ec2_hint_path_nix).and_return('') + allow(File).to receive(:exist?).with(ec2_hint_path_win).and_return(true) + allow(File).to receive(:read).with(ec2_hint_path_win).and_return('') end describe "with the /etc/digitalocean file" do before do - File.stub(:exist?).with(digitalocean_path).and_return(true) + allow(File).to receive(:exist?).with(digitalocean_path).and_return(true) @plugin.run end it_should_behave_like "digital_ocean_networking" @@ -203,7 +203,7 @@ describe Ohai::System, "plugin digital_ocean" do describe "without the /etc/digitalocean file" do before do - File.stub(:exist?).with(digitalocean_path).and_return(false) + allow(File).to receive(:exist?).with(digitalocean_path).and_return(false) end it_should_behave_like "!digital_ocean" end |