ppl 3.0.0 → 4.0.3

data/spec/ppl/entity/email_address_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::EmailAddress do
 
   before(:each) do
@@ -7,20 +6,20 @@ describe Ppl::Entity::EmailAddress do
 
   describe "#address" do
     it "should return a value" do
-      @email_address.address.should eq nil
+      expect(@email_address.address).to eq nil
     end
   end
 
   describe "#preferred" do
     it "should be false by default" do
-      @email_address.preferred.should eq false
+      expect(@email_address.preferred).to eq false
     end
   end
 
   describe "#initialize" do
     it "should accept an address" do
       email = Ppl::Entity::EmailAddress.new("bob@example.org")
-      email.address.should eq "bob@example.org"
+      expect(email.address).to eq "bob@example.org"
     end
   end
 

data/spec/ppl/entity/name_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::Name do
 
   before(:each) do
@@ -8,7 +7,7 @@ describe Ppl::Entity::Name do
   describe "#to_s" do
     it "returns the full name" do
       @name.full = "Mr. Testing"
-      @name.to_s.should eq "Mr. Testing"
+      expect(@name.to_s).to eq "Mr. Testing"
     end
   end
 

data/spec/ppl/entity/phone_number_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::PhoneNumber do
 
   before(:each) do
@@ -7,30 +6,30 @@ describe Ppl::Entity::PhoneNumber do
 
   describe "#number" do
     it "should return a value" do
-      @phone_number.number.should eq nil
+      expect(@phone_number.number).to eq nil
     end
   end
 
   describe "#preferred" do
     it "should be false by default" do
-      @phone_number.preferred.should eq false
+      expect(@phone_number.preferred).to eq false
     end
   end
 
   describe "#type" do
     it "should return a value" do
-      @phone_number.type.should eq nil
+      expect(@phone_number.type).to eq nil
     end
   end
 
   describe "#initialize" do
     it "should accept a number" do
       phone = Ppl::Entity::PhoneNumber.new(12345)
-      phone.number.should eq 12345
+      expect(phone.number).to eq 12345
     end
     it "should accept a type" do
       phone = Ppl::Entity::PhoneNumber.new(nil, "cell")
-      phone.type.should eq "cell"
+      expect(phone.type).to eq "cell"
     end
   end
 

data/spec/ppl/entity/postal_address_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::PostalAddress do
 
   before(:each) do
@@ -7,13 +6,13 @@ describe Ppl::Entity::PostalAddress do
 
   describe "#preferred" do
     it "should be false by default" do
-      @address.preferred.should eq false
+      expect(@address.preferred).to eq false
     end
   end
 
   describe "#street" do
     it "should return a value" do
-      @address.street.should be nil
+      expect(@address.street).to be nil
     end
   end
 

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::Ages 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, :age], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :age], colors)
       format = Ppl::Format::AddressBook::Ages.new(colors)
     end
   end
@@ -25,7 +24,7 @@ describe Ppl::Format::AddressBook::Ages 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:",
         :age => "",
       })
@@ -34,7 +33,7 @@ describe Ppl::Format::AddressBook::Ages do
 
     it "should show an age if it's available" do
       @contact.birthday = Date.parse("1970-01-01")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id  => "test:",
         :age => "10",
       })

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::Birthdays 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, :birthday], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :birthday], colors)
       format = Ppl::Format::AddressBook::Birthdays.new(colors)
     end
   end
@@ -26,7 +25,7 @@ describe Ppl::Format::AddressBook::Birthdays 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:",
         :birthday => nil,
       })
@@ -35,7 +34,7 @@ describe Ppl::Format::AddressBook::Birthdays do
 
     it "should show the birthday if it's available" do
       @contact.birthday = Date.parse("2001-02-03")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id        => "test:",
         :birthday  => "2001-02-03",
       })

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::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([:id, :email_addresses], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :email_addresses], colors)
       format = Ppl::Format::AddressBook::EmailAddresses.new(colors)
     end
   end
@@ -26,7 +25,7 @@ describe Ppl::Format::AddressBook::EmailAddresses 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:",
         :email_addresses => "",
       })
@@ -35,7 +34,7 @@ describe Ppl::Format::AddressBook::EmailAddresses do
 
     it "should show an email address if it's available" do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("jdoe@example.org")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id              => "test:",
         :email_addresses => "jdoe@example.org",
       })

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

@@ -1,4 +1,3 @@
-
 describe Ppl::Format::AddressBook::MuttQuery do
 
   before(:each) do
@@ -17,7 +16,7 @@ describe Ppl::Format::AddressBook::MuttQuery do
   describe "#process" do
 
     it "should list the given contacts" do
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :email => "test@example.org",
         :name  => "Test Contact",
       })
@@ -26,11 +25,11 @@ describe Ppl::Format::AddressBook::MuttQuery do
 
     it "should list all of each contact's email addresses" do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("test2@example.com")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :email => "test@example.org",
         :name  => "Test Contact",
       })
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :email => "test2@example.com",
         :name  => "Test Contact",
       })

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::Names 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, :name], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :name], colors)
       format = Ppl::Format::AddressBook::Names.new(colors)
     end
   end
@@ -26,7 +25,7 @@ describe Ppl::Format::AddressBook::Names 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:",
         :name => nil,
       })
@@ -35,7 +34,7 @@ describe Ppl::Format::AddressBook::Names do
 
     it "should show the name if it's available" do
       @contact.name = "John Doe"
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id   => "test:",
         :name => "John Doe",
       })

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::Nicknames 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, :nicknames], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :nicknames], colors)
       format = Ppl::Format::AddressBook::Nicknames.new(colors)
     end
   end
@@ -26,7 +25,7 @@ describe Ppl::Format::AddressBook::Nicknames 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:",
         :nicknames => "",
       })
@@ -35,7 +34,7 @@ describe Ppl::Format::AddressBook::Nicknames do
 
     it "should show a nickname if it's available" do
       @contact.nicknames.push("Stupid")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id        => "test:",
         :nicknames => "Stupid",
       })
@@ -46,7 +45,7 @@ describe Ppl::Format::AddressBook::Nicknames do
 
   describe "#disable_colors!" do
     it "should turn off the table's colors" do
-      @table.should_receive(:disable_colors!)
+      expect(@table).to receive(:disable_colors!)
       @format.disable_colors!
     end
   end

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

@@ -1,9 +1,8 @@
-
 describe Ppl::Format::AddressBook::OneLine 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, :name, :email], colors)
+      expect(Ppl::Format::Table).to receive(:new).with([:id, :name, :email], colors)
       format = Ppl::Format::AddressBook::OneLine.new(colors)
     end
   end
@@ -26,7 +25,7 @@ describe Ppl::Format::AddressBook::OneLine 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:",
         :name  => nil,
         :email => nil,
@@ -37,7 +36,7 @@ describe Ppl::Format::AddressBook::OneLine do
     it "should show all the info if it's available" do
       @contact.name = "John Doe"
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("jdoe@example.org")
-      @table.should_receive(:add_row).with({
+      expect(@table).to receive(:add_row).with({
         :id    => "test:",
         :name  => "John Doe",
         :email => "<jdoe@example.org>",
@@ -49,8 +48,8 @@ describe Ppl::Format::AddressBook::OneLine do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("jdoe@example.org")
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("fred@testtest.es")
       @contact.email_addresses[1].preferred = true
-      @table.should_receive(:add_row) do |row|
-        row[:email].should eq "<fred@testtest.es>"
+      expect(@table).to receive(:add_row) do |row|
+        expect(row[:email]).to eq "<fred@testtest.es>"
       end
       @format.process(@address_book)
     end

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

@@ -1,9 +1,8 @@
-
 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
@@ -26,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 => "",
       })
@@ -35,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

@@ -1,9 +1,8 @@
-
 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
@@ -26,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 => "",
       })
@@ -35,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

@@ -1,9 +1,8 @@
-
 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
@@ -29,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

@@ -1,9 +1,8 @@
-
 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
@@ -26,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 => "",
       })
@@ -35,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/address_book_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Format::AddressBook do
 
   before(:each) do

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

@@ -1,4 +1,3 @@
-
 describe Ppl::Format::Contact::Age do
 
   before(:each) do
@@ -11,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