spec/ppl/format/custom/contact_spec.rb in ppl-4.0.1 vs spec/ppl/format/custom/contact_spec.rb in ppl-4.0.2

@@ -6,94 +6,94 @@
   end
 
   describe "%n" do
     it "should be replaced with a newlines" do
       @format.format = "%n"
-      @format.process(@contact).should eq "\n"
+      expect(@format.process(@contact)).to eq "\n"
     end
   end
 
   describe "%i" do
     it "should output the contact's ID" do
       @contact.id = "test"
       @format.format = "%i"
-      @format.process(@contact).should eq "test"
+      expect(@format.process(@contact)).to eq "test"
     end
   end
 
   describe "%N" do
     it "should output the contact's name" do
       @contact.name = "John Doe"
       @format.format = "%N"
-      @format.process(@contact).should eq "John Doe"
+      expect(@format.process(@contact)).to eq "John Doe"
     end
   end
 
   describe "%k" do
     it "should output the contact's nickname" do
       @contact.nicknames << "Johnny"
       @format.format = "%k"
-      @format.process(@contact).should eq "Johnny"
+      expect(@format.process(@contact)).to eq "Johnny"
     end
   end
 
   describe "%a" do
     it "should output the contact's age" do
       @contact.birthday = Date.parse("2000-01-01")
-      Date.stub(:today).and_return(Date.parse("2010-01-02"))
+      allow(Date).to receive(:today).and_return(Date.parse("2010-01-02"))
       @format.format = "%a"
-      @format.process(@contact).should eq "10"
+      expect(@format.process(@contact)).to eq "10"
     end
   end
 
   describe "%b" do
     it "should output the contact's birthday" do
       @contact.birthday = Date.parse("1985-06-07")
       @format.format = "%b"
-      @format.process(@contact).should eq "1985-06-07"
+      expect(@format.process(@contact)).to eq "1985-06-07"
     end
     it "should cause no errors if there's no birthday" do
       @contact.birthday = nil
       @format.format = "%b"
-      @format.process(@contact).should eq ""
+      expect(@format.process(@contact)).to eq ""
     end
   end
 
   describe "%e" do
     before(:each) do
       @format.format = "%e"
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("[e-mail]")
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("[e-mail]")
     end
     it "should output the first email address" do
-      @format.process(@contact).should eq "[e-mail]"
+      expect(@format.process(@contact)).to eq "[e-mail]"
     end
     it "should output the preferred email address" do
       @contact.email_addresses[1].preferred = true
-      @format.process(@contact).should eq "[e-mail]"
+      expect(@format.process(@contact)).to eq "[e-mail]"
     end
   end
 
   describe "%p" do
     before(:each) do
       @format.format = "%p"
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("0123456789")
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("1098765432")
     end
     it "should output the first phone number" do
-      @format.process(@contact).should eq "0123456789"
+      expect(@format.process(@contact)).to eq "0123456789"
     end
     it "should output the preferred phone number" do
       @contact.phone_numbers[1].preferred = true
-      @format.process(@contact).should eq "1098765432"
+      expect(@format.process(@contact)).to eq "1098765432"
     end
   end
 
   describe "%o" do
     it "should output the contact's organization" do
       @contact.organizations << "WTF Inc"
       @format.format = "%o"
-      @format.process(@contact).should eq "WTF Inc"
+      expect(@format.process(@contact)).to eq "WTF Inc"
     end
   end
 
 end