Migrate to rspec3 matchers

Author: stschulte

spec/unit/provider/oratab/parsed_spec.rb

@@ -16,88 +16,88 @@
       :ensure      => :present,
       :home        => '/u01/app/oracle/product/9.2.0.1.0',
       :atboot      => :yes,
-      :description => 'managed by puppet',
+      :description => 'managed by puppet'
     )
   end
 
   [:destroy, :create, :exists?].each do |method|
     it "should respond to #{method}" do
-      provider.should respond_to method
+      expect(provider).to respond_to method
     end
   end
 
   [:home, :atboot, :description].each do |property|
     it "should have getter and setter for property #{property}" do
-      provider.should respond_to property
-      provider.should respond_to "#{property}=".intern
+      expect(provider).to respond_to property
+      expect(provider).to respond_to "#{property}=".intern
     end
   end
 
   describe "when parsing a line" do
 
     describe "with no description" do
       it "should capture the name" do
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N')[:name].should == 'TEST'
-        described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:N')[:name].should == 'TEST_01'
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N')[:name]).to eq('TEST')
+        expect(described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:N')[:name]).to eq('TEST_01')
       end
 
       it "should capture the home directory" do
-        described_class.parse_line('TEST:/db_1:N')[:home].should == '/db_1'
-        described_class.parse_line('TEST:/db_1:Y')[:home].should == '/db_1'
-        described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:Y')[:home].should == '/app/oracle/db/11.2/db_1'
+        expect(described_class.parse_line('TEST:/db_1:N')[:home]).to eq('/db_1')
+        expect(described_class.parse_line('TEST:/db_1:Y')[:home]).to eq('/db_1')
+        expect(described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:Y')[:home]).to eq('/app/oracle/db/11.2/db_1')
       end
 
       it "should capture the atboot flag" do
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N')[:atboot].should == :no
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y')[:atboot].should == :yes
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N')[:atboot]).to eq(:no)
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y')[:atboot]).to eq(:yes)
       end
     end
 
     describe "with a description" do
       it "should capture the name" do
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:name].should == 'TEST'
-        described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:N # even ## fancier')[:name].should == 'TEST_01'
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:name]).to eq('TEST')
+        expect(described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:N # even ## fancier')[:name]).to eq('TEST_01')
       end
       it "should capture the home directory" do
-        described_class.parse_line('TEST:/db_1:N # fancy comment')[:home].should == '/db_1'
-        described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:Y# even ## fancier')[:home].should == '/app/oracle/db/11.2/db_1'
+        expect(described_class.parse_line('TEST:/db_1:N # fancy comment')[:home]).to eq('/db_1')
+        expect(described_class.parse_line('TEST_01:/app/oracle/db/11.2/db_1:Y# even ## fancier')[:home]).to eq('/app/oracle/db/11.2/db_1')
       end
       it "should capture the atboot flag" do
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:atboot].should == :no
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y## even ## fancier')[:atboot].should == :yes
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:atboot]).to eq(:no)
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y## even ## fancier')[:atboot]).to eq(:yes)
       end
       it "should capture the description" do
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:description].should == 'fancy comment'
-        described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y## even ## fancier')[:description].should == '# even ## fancier'
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:N # fancy comment')[:description]).to eq('fancy comment')
+        expect(described_class.parse_line('TEST:/app/oracle/db/11.2/db_1:Y## even ## fancier')[:description]).to eq('# even ## fancier')
       end
     end
   end
 
   describe "when calling instances" do
     before :each do
       @instances = described_class.instances
-      @instances.size.should == 3
+      expect(@instances.size).to eq(3)
     end
 
     it "should be able to get the first entry" do
-      @instances[0].get(:name).should == 'TEST'
-      @instances[0].get(:home).should == '/app/oracle/db/11.2/db_1'
-      @instances[0].get(:atboot).should == :no
-      @instances[0].get(:description).should == 'line added by Agent'
+      expect(@instances[0].get(:name)).to eq('TEST')
+      expect(@instances[0].get(:home)).to eq('/app/oracle/db/11.2/db_1')
+      expect(@instances[0].get(:atboot)).to eq(:no)
+      expect(@instances[0].get(:description)).to eq('line added by Agent')
     end
 
     it "should be able to get the second entry" do
-      @instances[1].get(:name).should == 'PROD'
-      @instances[1].get(:home).should == '/app/oracle/db/11.2/db_2'
-      @instances[1].get(:atboot).should == :yes
-      @instances[1].get(:description).should == :absent
+      expect(@instances[1].get(:name)).to eq('PROD')
+      expect(@instances[1].get(:home)).to eq('/app/oracle/db/11.2/db_2')
+      expect(@instances[1].get(:atboot)).to eq(:yes)
+      expect(@instances[1].get(:description)).to eq(:absent)
     end
 
     it "should be able to get the third entry" do
-      @instances[2].get(:name).should == 'DR'
-      @instances[2].get(:home).should == '/app/oracle/db/11.2/db_4'
-      @instances[2].get(:atboot).should == :no
-      @instances[2].get(:description).should == 'i am still # an inline comment'
+      expect(@instances[2].get(:name)).to eq('DR')
+      expect(@instances[2].get(:home)).to eq('/app/oracle/db/11.2/db_4')
+      expect(@instances[2].get(:atboot)).to eq(:no)
+      expect(@instances[2].get(:description)).to eq('i am still # an inline comment')
     end
   end
 

spec/unit/type/oratab_spec.rb

@@ -5,19 +5,19 @@
 describe Puppet::Type.type(:oratab) do
 
   it "should have :name as its keyattribute" do
-    described_class.key_attributes.should == [:name]
+    expect(described_class.key_attributes).to eq([:name])
   end
 
   describe "when validating attributes" do
     [:name, :provider].each do |param|
       it "should have a #{param} parameter" do
-        described_class.attrtype(param).should == :param
+        expect(described_class.attrtype(param)).to eq(:param)
       end
     end
 
     [:ensure, :home, :atboot, :description, :target].each do |property|
       it "should have a #{property} property" do
-        described_class.attrtype(property).should == :property
+        expect(described_class.attrtype(property)).to eq(:property)
       end
     end
   end
@@ -82,10 +82,10 @@
         expect { described_class.new(:name => 'TEST01E', :atboot => :N) }.to_not raise_error
       end
       it "should alias Y to yes" do
-        described_class.new(:name => 'TEST01E', :atboot => :Y)[:atboot].should == :yes
+        expect(described_class.new(:name => 'TEST01E', :atboot => :Y)[:atboot]).to eq(:yes)
       end
       it "should alias N to no" do
-        described_class.new(:name => 'TEST01E', :atboot => :N)[:atboot].should == :no
+        expect(described_class.new(:name => 'TEST01E', :atboot => :N)[:atboot]).to eq(:no)
       end
       it "should not support other values" do
         expect { described_class.new(:name => 'TEST01E', :atboot => :yess) }.to raise_error(Puppet::Error, /Invalid value/)