diff options
Diffstat (limited to 'spec/unit/version_constraint_spec.rb')
-rw-r--r-- | spec/unit/version_constraint_spec.rb | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/spec/unit/version_constraint_spec.rb b/spec/unit/version_constraint_spec.rb index dfa4740d51..0ae502f66d 100644 --- a/spec/unit/version_constraint_spec.rb +++ b/spec/unit/version_constraint_spec.rb @@ -26,18 +26,18 @@ describe Chef::VersionConstraint do v_error = Chef::Exceptions::InvalidCookbookVersion bad_version.each do |s| it "should raise #{v_error} when given #{s}" do - lambda { Chef::VersionConstraint.new s }.should raise_error(v_error) + expect { Chef::VersionConstraint.new s }.to raise_error(v_error) end end bad_op.each do |s| it "should raise #{o_error} when given #{s}" do - lambda { Chef::VersionConstraint.new s }.should raise_error(o_error) + expect { Chef::VersionConstraint.new s }.to raise_error(o_error) end end it "should interpret a lone version number as implicit = OP" do vc = Chef::VersionConstraint.new("1.2.3") - vc.to_s.should == "= 1.2.3" + expect(vc.to_s).to eq("= 1.2.3") end it "should allow initialization with [] for back compatibility" do @@ -52,28 +52,28 @@ describe Chef::VersionConstraint do it "should default to >= 0.0.0" do vc = Chef::VersionConstraint.new - vc.to_s.should == ">= 0.0.0" + expect(vc.to_s).to eq(">= 0.0.0") end it "should default to >= 0.0.0 when initialized with nil" do - Chef::VersionConstraint.new(nil).to_s.should == ">= 0.0.0" + expect(Chef::VersionConstraint.new(nil).to_s).to eq(">= 0.0.0") end it "should work with Chef::Version classes" do vc = Chef::VersionConstraint.new("1.0") - vc.version.should be_an_instance_of(Chef::Version) + expect(vc.version).to be_an_instance_of(Chef::Version) end it "should allow ops without space separator" do - Chef::VersionConstraint.new("=1.2.3").should eql(Chef::VersionConstraint.new("= 1.2.3")) - Chef::VersionConstraint.new(">1.2.3").should eql(Chef::VersionConstraint.new("> 1.2.3")) - Chef::VersionConstraint.new("<1.2.3").should eql(Chef::VersionConstraint.new("< 1.2.3")) - Chef::VersionConstraint.new(">=1.2.3").should eql(Chef::VersionConstraint.new(">= 1.2.3")) - Chef::VersionConstraint.new("<=1.2.3").should eql(Chef::VersionConstraint.new("<= 1.2.3")) + expect(Chef::VersionConstraint.new("=1.2.3")).to eql(Chef::VersionConstraint.new("= 1.2.3")) + expect(Chef::VersionConstraint.new(">1.2.3")).to eql(Chef::VersionConstraint.new("> 1.2.3")) + expect(Chef::VersionConstraint.new("<1.2.3")).to eql(Chef::VersionConstraint.new("< 1.2.3")) + expect(Chef::VersionConstraint.new(">=1.2.3")).to eql(Chef::VersionConstraint.new(">= 1.2.3")) + expect(Chef::VersionConstraint.new("<=1.2.3")).to eql(Chef::VersionConstraint.new("<= 1.2.3")) end it "should allow ops with multiple spaces" do - Chef::VersionConstraint.new("= 1.2.3").should eql(Chef::VersionConstraint.new("= 1.2.3")) + expect(Chef::VersionConstraint.new("= 1.2.3")).to eql(Chef::VersionConstraint.new("= 1.2.3")) end describe "include?" do @@ -82,70 +82,70 @@ describe Chef::VersionConstraint do @vc = Chef::VersionConstraint.new "> 1.2.3" end it "String" do - @vc.should include "1.4" + expect(@vc).to include "1.4" end it "Chef::Version" do - @vc.should include Chef::Version.new("1.4") + expect(@vc).to include Chef::Version.new("1.4") end it "Chef::CookbookVersion" do cv = Chef::CookbookVersion.new("alice", '/tmp/blah.txt') cv.version = "1.4" - @vc.should include cv + expect(@vc).to include cv end end it "strictly less than" do vc = Chef::VersionConstraint.new "< 1.2.3" - vc.should_not include "1.3.0" - vc.should_not include "1.2.3" - vc.should include "1.2.2" + expect(vc).not_to include "1.3.0" + expect(vc).not_to include "1.2.3" + expect(vc).to include "1.2.2" end it "strictly greater than" do vc = Chef::VersionConstraint.new "> 1.2.3" - vc.should include "1.3.0" - vc.should_not include "1.2.3" - vc.should_not include "1.2.2" + expect(vc).to include "1.3.0" + expect(vc).not_to include "1.2.3" + expect(vc).not_to include "1.2.2" end it "less than or equal to" do vc = Chef::VersionConstraint.new "<= 1.2.3" - vc.should_not include "1.3.0" - vc.should include "1.2.3" - vc.should include "1.2.2" + expect(vc).not_to include "1.3.0" + expect(vc).to include "1.2.3" + expect(vc).to include "1.2.2" end it "greater than or equal to" do vc = Chef::VersionConstraint.new ">= 1.2.3" - vc.should include "1.3.0" - vc.should include "1.2.3" - vc.should_not include "1.2.2" + expect(vc).to include "1.3.0" + expect(vc).to include "1.2.3" + expect(vc).not_to include "1.2.2" end it "equal to" do vc = Chef::VersionConstraint.new "= 1.2.3" - vc.should_not include "1.3.0" - vc.should include "1.2.3" - vc.should_not include "0.3.0" + expect(vc).not_to include "1.3.0" + expect(vc).to include "1.2.3" + expect(vc).not_to include "0.3.0" end it "pessimistic ~> x.y.z" do vc = Chef::VersionConstraint.new "~> 1.2.3" - vc.should include "1.2.3" - vc.should include "1.2.4" + expect(vc).to include "1.2.3" + expect(vc).to include "1.2.4" - vc.should_not include "1.2.2" - vc.should_not include "1.3.0" - vc.should_not include "2.0.0" + expect(vc).not_to include "1.2.2" + expect(vc).not_to include "1.3.0" + expect(vc).not_to include "2.0.0" end it "pessimistic ~> x.y" do vc = Chef::VersionConstraint.new "~> 1.2" - vc.should include "1.3.3" - vc.should include "1.4" + expect(vc).to include "1.3.3" + expect(vc).to include "1.4" - vc.should_not include "2.2" - vc.should_not include "0.3.0" + expect(vc).not_to include "2.2" + expect(vc).not_to include "0.3.0" end end @@ -153,13 +153,13 @@ describe Chef::VersionConstraint do it 'shows a patch-level if one is given' do vc = Chef::VersionConstraint.new '~> 1.2.0' - vc.to_s.should == '~> 1.2.0' + expect(vc.to_s).to eq('~> 1.2.0') end it 'shows no patch-level if one is not given' do vc = Chef::VersionConstraint.new '~> 1.2' - vc.to_s.should == '~> 1.2' + expect(vc.to_s).to eq('~> 1.2') end end @@ -167,13 +167,13 @@ describe Chef::VersionConstraint do it 'shows a patch-level if one is given' do vc = Chef::VersionConstraint.new '~> 1.2.0' - vc.inspect.should == '(~> 1.2.0)' + expect(vc.inspect).to eq('(~> 1.2.0)') end it 'shows no patch-level if one is not given' do vc = Chef::VersionConstraint.new '~> 1.2' - vc.inspect.should == '(~> 1.2)' + expect(vc.inspect).to eq('(~> 1.2)') end end end |