ppl 4.0.1 → 4.0.2

data/spec/ppl/format/address_book/organizations_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::AddressBook::Organizations do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:id, :organizations], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :organizations], colors)
       format = Ppl::Format::AddressBook::Organizations.new(colors)
     end
   end
@@ -25,7 +25,7 @@ describe Ppl::Format::AddressBook::Organizations do
   describe "#process" do
 
     it "should at least show the contact's id" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id            => "test:",
         :organizations => "",
       })
@@ -34,7 +34,7 @@ describe Ppl::Format::AddressBook::Organizations do
 
     it "should show the organization if it's available" do
       @contact.organizations.push("Example Ltd")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id            => "test:",
         :organizations => "Example Ltd",
       })

data/spec/ppl/format/address_book/phone_numbers_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:id, :phone_numbers], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :phone_numbers], colors)
       format = Ppl::Format::AddressBook::PhoneNumbers.new(colors)
     end
   end
@@ -25,7 +25,7 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
   describe "#process" do
 
     it "should at least show the contact's id" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id            => "test:",
         :phone_numbers => "",
       })
@@ -34,7 +34,7 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
 
     it "should show the phone number if it's available" do
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id            => "test:",
         :phone_numbers => "01234567890",
       })

data/spec/ppl/format/address_book/postal_addresses_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::AddressBook::PostalAddresses do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:id, :address_ids], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :address_ids], colors)
       format = Ppl::Format::AddressBook::PostalAddresses.new(colors)
     end
   end
@@ -28,7 +28,7 @@ describe Ppl::Format::AddressBook::PostalAddresses do
   describe "#process" do
 
     it "shows the contact's and address' IDs" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id          => "test:",
         :address_ids => "home",
       })

data/spec/ppl/format/address_book/urls_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::AddressBook::Urls do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:id, :urls], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :urls], colors)
       format = Ppl::Format::AddressBook::Urls.new(colors)
     end
   end
@@ -25,7 +25,7 @@ describe Ppl::Format::AddressBook::Urls do
   describe "#process" do
 
     it "should at least show the contact's id" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id   => "test:",
         :urls => "",
       })
@@ -34,7 +34,7 @@ describe Ppl::Format::AddressBook::Urls do
 
     it "should show a URL if it's available" do
       @contact.urls.push "http://example.org/~jdoe"
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id   => "test:",
         :urls => "http://example.org/~jdoe",
       })

data/spec/ppl/format/contact/age_spec.rb

@@ -10,21 +10,21 @@ describe Ppl::Format::Contact::Age do
   describe "#process" do
 
     it "should return an empty string if the contact lacks a birth date" do
-      @color.stub(:colorize)
-      @contact.should_receive(:age).and_return(nil)
-      @format.process(@contact).should eq ""
+      allow(@color).to receive(:colorize)
+      expect(@contact).to receive(:age).and_return(nil)
+      expect(@format.process(@contact)).to eq ""
     end
 
     it "should return the contact's age if the birthdate is known" do
-      @contact.should_receive(:age).and_return(10)
-      @format.process(@contact).should eq "10"
+      expect(@contact).to receive(:age).and_return(10)
+      expect(@format.process(@contact)).to eq "10"
     end
 
     it "should colorize the string if configured to do so" do
-      @contact.should_receive(:age).and_return(10)
+      expect(@contact).to receive(:age).and_return(10)
       @format.colors = { "age" => "blue" }
-      @color.should_receive(:colorize).and_return("age in blue")
-      @format.process(@contact).should eq "age in blue"
+      expect(@color).to receive(:colorize).and_return("age in blue")
+      expect(@format.process(@contact)).to eq "age in blue"
     end
 
   end

data/spec/ppl/format/contact/birthday_spec.rb

@@ -10,18 +10,18 @@ describe Ppl::Format::Contact::Birthday do
   describe "#process" do
 
     it "should return an empty string if the contact lacks a birthday" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+      expect(@format.process(Ppl::Entity::Contact.new)).to eq ""
     end
 
     it "should return the contact's birthday if it is set" do
       @contact.birthday = Date.parse("1970-01-01")
-      @format.process(@contact).should eq "1970-01-01"
+      expect(@format.process(@contact)).to eq "1970-01-01"
     end
 
     it "should colorize the string if configured to do so" do
       @format.colors = { "birthday" => "blue" }
-      @color.should_receive(:colorize).and_return("birthday in blue")
-      @format.process(@contact).should eq "birthday in blue"
+      expect(@color).to receive(:colorize).and_return("birthday in blue")
+      expect(@format.process(@contact)).to eq "birthday in blue"
     end
 
   end

data/spec/ppl/format/contact/email_addresses_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::Contact::EmailAddresses do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:star, :email_addresses], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:star, :email_addresses], colors)
       format = Ppl::Format::Contact::EmailAddresses.new(colors)
     end
   end
@@ -22,7 +22,7 @@ describe Ppl::Format::Contact::EmailAddresses do
   describe "#process" do
 
     it "should pass each email address to the table" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :star            => " ",
         :email_addresses => "test@example.org",
       })
@@ -31,7 +31,7 @@ describe Ppl::Format::Contact::EmailAddresses do
 
     it "should mark the preferred email with a star" do
       @email.preferred = true
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :star            => "*",
         :email_addresses => "test@example.org",
       })

data/spec/ppl/format/contact/full_spec.rb

@@ -12,26 +12,26 @@ describe Ppl::Format::Contact::Full do
     @format.phone_number_format = @phone_number_format
     @format.postal_address_format = @postal_address_format
 
-    @email_address_format.stub(:process)
+    allow(@email_address_format).to receive(:process)
   end
 
   describe "#process" do
 
     it "should return an empty string if the contact lacks any properties" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+      expect(@format.process(Ppl::Entity::Contact.new)).to eq ""
     end
 
     it "should start with the contact's name" do
       @contact.name = Ppl::Entity::Name.new
       @contact.name.full = "John Doe"
-      @format.process(@contact).should eq "John Doe"
+      expect(@format.process(@contact)).to eq "John Doe"
     end
 
     it "should include their email address in brackets" do
       @contact.name = Ppl::Entity::Name.new
       @contact.name.full = "John Doe"
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("john@example.org")
-      @format.process(@contact).should include "John Doe <john@example.org>"
+      expect(@format.process(@contact)).to include "John Doe <john@example.org>"
     end
 
     it "should include their preferred email address in brackets" do
@@ -40,40 +40,40 @@ describe Ppl::Format::Contact::Full do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("john@example.org")
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("fred@testtest.es")
       @contact.email_addresses[1].preferred = true
-      @format.process(@contact).should include "John Doe <fred@testtest.es>"
+      expect(@format.process(@contact)).to include "John Doe <fred@testtest.es>"
     end
 
     it "should invoke the email address formatter if there are any addresses" do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("john@example.net")
-      @email_address_format.should_receive(:process).with(@contact)
+      expect(@email_address_format).to receive(:process).with(@contact)
       @format.process(@contact)
     end
 
     it "should invoke the phone number formatter if there are any numbers" do
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("01234567890")
-      @phone_number_format.should_receive(:process).with(@contact)
+      expect(@phone_number_format).to receive(:process).with(@contact)
       @format.process(@contact)
     end
 
     it "should show their birthday if available" do
       @contact.birthday = Date.parse("1980-01-01")
-      @format.process(@contact).should include "1980-01-01"
+      expect(@format.process(@contact)).to include "1980-01-01"
     end
 
     it "should show all their organizations" do
       @contact.organizations.push("Example Ltd")
-      @format.process(@contact).should include "Example Ltd"
+      expect(@format.process(@contact)).to include "Example Ltd"
     end
 
     it "should show their postal address if available" do
       @contact.postal_addresses << @address
-      @postal_address_format.should_receive(:process).and_return("")
+      expect(@postal_address_format).to receive(:process).and_return("")
       @format.process(@contact)
     end
 
     it "should show all their URLs" do
       @contact.urls.push "http://example.org"
-      @format.process(@contact).should include "http://example.org"
+      expect(@format.process(@contact)).to include "http://example.org"
     end
 
   end

data/spec/ppl/format/contact/nicknames_spec.rb

@@ -10,18 +10,18 @@ describe Ppl::Format::Contact::Nicknames do
   describe "#process" do
 
     it "should return an empty string if the contact lacks a nickname" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+      expect(@format.process(Ppl::Entity::Contact.new)).to eq ""
     end
 
     it "should return the contact's nickname if one is set" do
       @contact.nicknames.push("Dopey")
-      @format.process(@contact).should eq "Dopey"
+      expect(@format.process(@contact)).to eq "Dopey"
     end
 
     it "should colorize the string if configured to do so" do
       @format.colors = { "nicknames" => "blue" }
-      @color.should_receive(:colorize).and_return("nicknames in blue")
-      @format.process(@contact).should eq "nicknames in blue"
+      expect(@color).to receive(:colorize).and_return("nicknames in blue")
+      expect(@format.process(@contact)).to eq "nicknames in blue"
     end
 
   end

data/spec/ppl/format/contact/organization_spec.rb

@@ -10,18 +10,18 @@ describe Ppl::Format::Contact::Organization do
   describe "#process" do
 
     it "should return an empty string if the contact lacks an organization" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+      expect(@format.process(Ppl::Entity::Contact.new)).to eq ""
     end
 
     it "should return the contact's organization if it is set" do
       @contact.organizations.push("Example Ltd")
-      @format.process(@contact).should eq "Example Ltd"
+      expect(@format.process(@contact)).to eq "Example Ltd"
     end
 
     it "should colorize the string if configured to do so" do
       @format.colors = { "organizations" => "blue" }
-      @color.should_receive(:colorize).and_return("organizations in blue")
-      @format.process(@contact).should eq "organizations in blue"
+      expect(@color).to receive(:colorize).and_return("organizations in blue")
+      expect(@format.process(@contact)).to eq "organizations in blue"
     end
 
   end

data/spec/ppl/format/contact/phone_number_spec.rb

@@ -3,7 +3,7 @@ describe Ppl::Format::Contact::PhoneNumber do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"number" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:star, :phone_numbers, :type], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:star, :phone_numbers, :type], colors)
       format = Ppl::Format::Contact::PhoneNumber.new(colors)
     end
   end
@@ -20,7 +20,7 @@ describe Ppl::Format::Contact::PhoneNumber do
     end
 
     it "should always include the phone number" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :star          => " ",
         :phone_numbers => "01234567890",
         :type          => nil,
@@ -30,7 +30,7 @@ describe Ppl::Format::Contact::PhoneNumber do
 
     it "should put the type in parentheses" do
       @number.type = "work"
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :star          => " ",
         :phone_numbers => "01234567890",
         :type          => "(work)",
@@ -40,7 +40,7 @@ describe Ppl::Format::Contact::PhoneNumber do
 
     it "should mark preferred numbers with a star" do
       @number.preferred = true
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :star          => "*",
         :phone_numbers => "01234567890",
         :type          => nil,

data/spec/ppl/format/contact/postal_address_spec.rb

@@ -13,7 +13,7 @@ describe Ppl::Format::Contact::PostalAddress do
 
     it "should return the contact's street address if it is set" do
       @address.street = "1 Test Road"
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :label => "Street:",
         :value => "1 Test Road",
       })

data/spec/ppl/format/contact/postal_addresses_spec.rb

@@ -2,7 +2,7 @@ describe Ppl::Format::Contact::PostalAddresses do
   describe "#initialize" do
     it "should pass the colors through to the table" do
       colors = {"address_id" => "blue"}
-      Ppl::Format::Table.should_receive(:new).with([:star, :address_id, :address_text], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:star, :address_id, :address_text], colors)
       format = Ppl::Format::Contact::PostalAddresses.new(colors)
     end
   end
@@ -24,8 +24,8 @@ describe Ppl::Format::Contact::PostalAddresses do
 
     it "passes each postal address to the postal address formatter" do
       @contact.postal_addresses << @address
-      @pa_fmt.should_receive(:process).with(@address, @table)
-      @table.should_receive(:to_s)
+      expect(@pa_fmt).to receive(:process).with(@address, @table)
+      expect(@table).to receive(:to_s)
       @format.process(@contact)
     end
 

data/spec/ppl/format/contact/urls_spec.rb

@@ -10,18 +10,18 @@ describe Ppl::Format::Contact::Urls do
   describe "#process" do
 
     it "should return an empty string if the contact lacks a URL" do
-      @format.process(Ppl::Entity::Contact.new).should eq ""
+      expect(@format.process(Ppl::Entity::Contact.new)).to eq ""
     end
 
     it "should return the contact's URL if one is set" do
       @contact.urls.push "http://example.org/~jdoe"
-      @format.process(@contact).should eq "http://example.org/~jdoe"
+      expect(@format.process(@contact)).to eq "http://example.org/~jdoe"
     end
 
     it "should colorize the string if configured to do so" do
       @format.colors = { "urls" => "blue" }
-      @color.should_receive(:colorize).and_return("urls in blue")
-      @format.process(@contact).should eq "urls in blue"
+      expect(@color).to receive(:colorize).and_return("urls in blue")
+      expect(@format.process(@contact)).to eq "urls in blue"
     end
 
   end

data/spec/ppl/format/custom/contact_spec.rb

@@ -8,7 +8,7 @@ describe Ppl::Format::Custom::Contact do
   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
 
@@ -16,7 +16,7 @@ describe Ppl::Format::Custom::Contact 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
 
@@ -24,7 +24,7 @@ describe Ppl::Format::Custom::Contact 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
 
@@ -32,16 +32,16 @@ describe Ppl::Format::Custom::Contact 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
 
@@ -49,12 +49,12 @@ describe Ppl::Format::Custom::Contact 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
 
@@ -65,11 +65,11 @@ describe Ppl::Format::Custom::Contact do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("b@example.org")
     end
     it "should output the first email address" do
-      @format.process(@contact).should eq "a@example.org"
+      expect(@format.process(@contact)).to eq "a@example.org"
     end
     it "should output the preferred email address" do
       @contact.email_addresses[1].preferred = true
-      @format.process(@contact).should eq "b@example.org"
+      expect(@format.process(@contact)).to eq "b@example.org"
     end
   end
 
@@ -80,11 +80,11 @@ describe Ppl::Format::Custom::Contact do
       @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
 
@@ -92,7 +92,7 @@ describe Ppl::Format::Custom::Contact 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