ppl 4.0.1 → 4.0.2

data/spec/ppl/command/show_spec.rb

@@ -14,7 +14,7 @@ describe Ppl::Command::Show do
 
   describe "#name" do
     it "should be 'show'" do
-      @command.name.should eq "show"
+      expect(@command.name).to eq "show"
     end
   end
 
@@ -26,12 +26,12 @@ describe Ppl::Command::Show do
     end
 
     it "should show the contact's name" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @format.should_receive(:process).and_return("John Doe")
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@format).to receive(:process).and_return("John Doe")
 
       @input.arguments = ["john"]
 
-      @output.should_receive(:line).with("John Doe")
+      expect(@output).to receive(:line).with("John Doe")
       @command.execute(@input, @output)
     end
   end

data/spec/ppl/command/url_spec.rb

@@ -6,7 +6,7 @@ describe Ppl::Command::Url do
 
   describe "#name" do
     it "should be 'url'" do
-      @command.name.should eq "url"
+      expect(@command.name).to eq "url"
     end
   end
 

data/spec/ppl/command/version_spec.rb

@@ -8,16 +8,16 @@ describe Ppl::Command::Version do
 
   describe "#name" do
     it "should be 'version'" do
-      @command.name.should eq "version"
+      expect(@command.name).to eq "version"
     end
   end
 
   describe "#execute" do
     it "should show the version number" do
-      @output.should_receive(:line) do |line|
-        line.should include Ppl::Version
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include Ppl::Version
       end
-      @command.execute(@input, @output).should eq true
+      expect(@command.execute(@input, @output)).to eq true
     end
   end
 

data/spec/ppl/entity/address_book_spec.rb

@@ -6,7 +6,7 @@ describe Ppl::Entity::AddressBook do
 
   describe "#contacts" do
     it "should be an array" do
-      @address_book.contacts.should be_an(Array)
+      expect(@address_book.contacts).to be_an(Array)
     end
   end
 

data/spec/ppl/entity/contact_spec.rb

@@ -6,72 +6,72 @@ describe Ppl::Entity::Contact do
 
   describe "#id" do
     it "should return a value" do
-      @contact.id.should be nil
+      expect(@contact.id).to be nil
     end
   end
 
   describe "#id=" do
     it "should accept a value" do
       @contact.id = "john"
-      @contact.id.should eq "john"
+      expect(@contact.id).to eq "john"
     end
   end
 
   describe "#email_addresses" do
     it "should return an array" do
-      @contact.email_addresses.should be_a(Array)
+      expect(@contact.email_addresses).to be_a(Array)
     end
   end
 
   describe "#postal_addresses" do
     it "should return an array" do
-      @contact.postal_addresses.should be_a(Array)
+      expect(@contact.postal_addresses).to be_a(Array)
     end
   end
 
   describe "#birthday" do
     it "should return a value" do
-      @contact.birthday.should eq nil
+      expect(@contact.birthday).to eq nil
     end
   end
 
   describe "#postal_address" do
     it "should return a value" do
-      @contact.postal_address.should eq nil
+      expect(@contact.postal_address).to eq nil
     end
   end
 
   describe "#urls" do
     it "should return an array" do
-      @contact.urls.should be_a(Array)
+      expect(@contact.urls).to be_a(Array)
     end
   end
 
   describe "#nicknames" do
     it "should return an array" do
-      @contact.nicknames.should be_a(Array)
+      expect(@contact.nicknames).to be_a(Array)
     end
   end
 
   describe "#organizations" do
     it "should return an array" do
-      @contact.organizations.should be_a(Array)
+      expect(@contact.organizations).to be_a(Array)
     end
   end
 
   describe "#phone_numbers" do
     it "should return an array" do
-      @contact.phone_numbers.should be_a(Array)
+      expect(@contact.phone_numbers).to be_a(Array)
     end
   end
 
   describe "#age" do
     it "should return nil if the date of birth is unknown" do
-      @contact.age(Date.today).should eq nil
+      expect(@contact.age(Date.today)).to eq nil
     end
     it "should return the contact's age" do
       @contact.birthday = Date.parse("1970-01-01")
-      @contact.age(Date.parse("1980-01-02")).should eq 10
+      expect(@contact.age(Date.parse("1980-01-02"))).to eq 10
     end
   end
 
@@ -82,12 +82,12 @@ describe Ppl::Entity::Contact do
     end
 
     it "returns nil if there's no preferred address" do
-      @contact.preferred_email_address.should eq nil
+      expect(@contact.preferred_email_address).to eq nil
     end
 
     it "returns the preferred email address" do
       @contact.email_addresses[0].preferred = true
-      @contact.preferred_email_address.should be_a(Ppl::Entity::EmailAddress)
+      expect(@contact.preferred_email_address).to be_a(Ppl::Entity::EmailAddress)
     end
 
   end
@@ -99,12 +99,12 @@ describe Ppl::Entity::Contact do
     end
 
     it "returns nil if there's no preferred number" do
-      @contact.preferred_phone_number.should eq nil
+      expect(@contact.preferred_phone_number).to eq nil
     end
 
     it "returns the preferred phone number" do
       @contact.phone_numbers[0].preferred = true
-      @contact.preferred_phone_number.should be_a(Ppl::Entity::PhoneNumber)
+      expect(@contact.preferred_phone_number).to be_a(Ppl::Entity::PhoneNumber)
     end
 
   end

data/spec/ppl/entity/email_address_spec.rb

@@ -6,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

@@ -7,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

@@ -6,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

@@ -6,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

@@ -2,7 +2,7 @@ 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
@@ -24,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 => "",
       })
@@ -33,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

@@ -2,7 +2,7 @@ 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
@@ -25,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,
       })
@@ -34,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

@@ -2,7 +2,7 @@ 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
@@ -25,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 => "",
       })
@@ -34,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

@@ -16,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",
       })
@@ -25,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

@@ -2,7 +2,7 @@ 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
@@ -25,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,
       })
@@ -34,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

@@ -2,7 +2,7 @@ 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
@@ -25,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 => "",
       })
@@ -34,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",
       })
@@ -45,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

@@ -2,7 +2,7 @@ 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
@@ -25,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,
@@ -36,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>",
@@ -48,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