ppl 3.0.0 → 4.0.3

data/spec/ppl/command/mutt_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Mutt do
 
   before(:each) do
@@ -18,7 +17,7 @@ describe Ppl::Command::Mutt do
 
   describe "#name" do
     it "should be 'mutt'" do
-      @command.name.should eq "mutt"
+      expect(@command.name).to eq "mutt"
     end
   end
 
@@ -30,9 +29,9 @@ describe Ppl::Command::Mutt do
 
     it "should search the address book for the query" do
       @input.arguments.push "query"
-      @command.should_receive(:mutt_search).and_return(Ppl::Entity::AddressBook.new)
-      @output.should_receive(:line).with("No matches")
-      @command.execute(@input, @output).should eq false
+      expect(@command).to receive(:mutt_search).and_return(Ppl::Entity::AddressBook.new)
+      expect(@output).to receive(:line).with("No matches")
+      expect(@command.execute(@input, @output)).to eq false
     end
 
     it "should return email address matches" do
@@ -43,13 +42,13 @@ describe Ppl::Command::Mutt do
 
       @input.arguments.push "example"
 
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @format.should_receive(:process).and_return("test@example.org\tTest User")
-      @output.should_receive(:line) do |line|
-        line.should include "Searching address book... 1 email addresses... 1 matching:"
-        line.should include "test@example.org\tTest User"
+      expect(@storage).to receive(:load_address_book).and_return(@address_book)
+      expect(@format).to receive(:process).and_return("test@example.org\tTest User")
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include "Searching address book... 1 email addresses... 1 matching:"
+        expect(line).to include "test@example.org\tTest User"
       end
-      @command.execute(@input, @output).should eq true
+      expect(@command.execute(@input, @output)).to eq true
     end
 
     it "should only return matching email addresses" do
@@ -59,12 +58,12 @@ describe Ppl::Command::Mutt do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("test@test.org")
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("prova@prova.org")
       @address_book.contacts.push(@contact)
-      @storage.stub(:load_address_book).and_return(@address_book)
-      @format.should_receive(:process) do |address_book|
-        address_book.contacts[0].email_addresses.length.should eq 1
-        address_book.contacts[0].email_addresses[0].address.should eq "prova@prova.org"
+      allow(@storage).to receive(:load_address_book).and_return(@address_book)
+      expect(@format).to receive(:process) do |address_book|
+        expect(address_book.contacts[0].email_addresses.length).to eq 1
+        expect(address_book.contacts[0].email_addresses[0].address).to eq "prova@prova.org"
       end
-      @output.stub(:line)
+      allow(@output).to receive(:line)
       @command.execute(@input, @output)
     end
 
@@ -76,13 +75,13 @@ describe Ppl::Command::Mutt do
 
       @input.arguments.push "User"
 
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @format.should_receive(:process).and_return("test@example.org\tTest User")
-      @output.should_receive(:line) do |line|
-        line.should include "Searching address book... 1 email addresses... 1 matching:"
-        line.should include "test@example.org\tTest User"
+      expect(@storage).to receive(:load_address_book).and_return(@address_book)
+      expect(@format).to receive(:process).and_return("test@example.org\tTest User")
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include "Searching address book... 1 email addresses... 1 matching:"
+        expect(line).to include "test@example.org\tTest User"
       end
-      @command.execute(@input, @output).should eq true
+      expect(@command.execute(@input, @output)).to eq true
     end
 
 
@@ -94,11 +93,11 @@ describe Ppl::Command::Mutt do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("prova@prova.org")
       @address_book.contacts << @contact
 
-      @storage.stub(:load_address_book).and_return(@address_book)
-      @format.stub(:process)
-      @output.stub(:line)
-      @output.should_receive(:line) do |line|
-        line.should include "Searching address book... 2 email addresses... 2 matching:"
+      allow(@storage).to receive(:load_address_book).and_return(@address_book)
+      allow(@format).to receive(:process)
+      allow(@output).to receive(:line)
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include "Searching address book... 2 email addresses... 2 matching:"
       end
       @command.execute(@input, @output)
     end
@@ -113,23 +112,23 @@ describe Ppl::Command::Mutt do
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("joe@somewhere.com")
       @contact.email_addresses << Ppl::Entity::EmailAddress.new("LOUD@SHOUTING.COM")
       @address_book.contacts << @contact
-      @storage.stub(:load_address_book).and_return(@address_book)
-      @output.stub(:line)
+      allow(@storage).to receive(:load_address_book).and_return(@address_book)
+      allow(@output).to receive(:line)
     end
 
     it "should ignore case when matching names" do
       @input.arguments.push "joe schmoe"
-      @format.should_receive(:process) do |address_book|
-        address_book.contacts[0].email_addresses.length.should eq 2
+      expect(@format).to receive(:process) do |address_book|
+        expect(address_book.contacts[0].email_addresses.length).to eq 2
       end
       @command.execute(@input, @output)
     end
 
     it "should ignore case when matching email addresses" do
       @input.arguments.push "loud"
-      @format.should_receive(:process) do |address_book|
-        address_book.contacts[0].email_addresses.length.should eq 1
-        address_book.contacts[0].email_addresses[0].address.should eq "LOUD@SHOUTING.COM"
+      expect(@format).to receive(:process) do |address_book|
+        expect(address_book.contacts[0].email_addresses.length).to eq 1
+        expect(address_book.contacts[0].email_addresses[0].address).to eq "LOUD@SHOUTING.COM"
       end
       @command.execute(@input, @output)
     end

data/spec/ppl/command/mv_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Mv do
 
   before(:each) do
@@ -14,7 +13,7 @@ describe Ppl::Command::Mv do
 
   describe "#name" do
     it "should be 'mv'" do
-      @command.name.should eq "mv"
+      expect(@command.name).to eq "mv"
     end
   end
 
@@ -31,24 +30,24 @@ describe Ppl::Command::Mv do
     end
 
     it "should return false if the new id is taken" do
-      @storage.should_receive(:require_contact).with("old").and_return(@contact)
-      @storage.should_receive(:load_contact).with("new").and_return(@contact)
-      @output.should_receive(:error)
+      expect(@storage).to receive(:require_contact).with("old").and_return(@contact)
+      expect(@storage).to receive(:load_contact).with("new").and_return(@contact)
+      expect(@output).to receive(:error)
       @input.arguments = ["old", "new"]
 
-      @command.execute(@input, @output).should eq false
+      expect(@command.execute(@input, @output)).to eq false
     end
 
     it "should rename the given contact" do
-      @storage.should_receive(:require_contact).with("old").and_return(@contact)
-      @storage.should_receive(:load_contact).with("new").and_return(nil)
+      expect(@storage).to receive(:require_contact).with("old").and_return(@contact)
+      expect(@storage).to receive(:load_contact).with("new").and_return(nil)
 
-      @storage.should_receive(:delete_contact).with(@contact) do |contact|
-        contact.id.should eq "old"
+      expect(@storage).to receive(:delete_contact).with(@contact) do |contact|
+        expect(contact.id).to eq "old"
       end
 
-      @storage.should_receive(:save_contact).with(@contact) do |contact|
-        contact.id.should eq "new"
+      expect(@storage).to receive(:save_contact).with(@contact) do |contact|
+        expect(contact.id).to eq "new"
       end
 
       @input.arguments = ["old", "new"]

data/spec/ppl/command/name_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Name do
 
   before(:each) do
@@ -25,51 +24,51 @@ describe Ppl::Command::Name do
 
   describe "#name" do
     it "should be 'name'" do
-      @command.name.should eq "name"
+      expect(@command.name).to eq "name"
     end
   end
 
   describe "#execute" do
 
     it "should list all contact names if no contact ID is given" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process).and_return("all the names")
-      @output.should_receive(:line).with("all the names")
+      expect(@storage).to receive(:load_address_book).and_return(@address_book)
+      expect(@list_format).to receive(:process).and_return("all the names")
+      expect(@output).to receive(:line).with("all the names")
       @input.arguments = []
       @command.execute(@input, @output)
     end
 
     it "should show the specified contact's name if no name is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("John Doe")
-      @output.should_receive(:line).with("John Doe")
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@show_format).to receive(:process).and_return("John Doe")
+      expect(@output).to receive(:line).with("John Doe")
       @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq true
+      expect(@command.execute(@input, @output)).to eq true
     end
 
     it "should not output anything if there's nothing to show" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process).and_return("")
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@show_format).to receive(:process).and_return("")
       @input.arguments = ["jim"]
-      @command.execute(@input, @output).should eq false
+      expect(@command.execute(@input, @output)).to eq false
     end
 
     it "should change the contact's name if a name is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @name_service.should_receive(:update).with(@contact.name, {
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@name_service).to receive(:update).with(@contact.name, {
         :full => "Jim Jamieson"
       })
-      @storage.should_receive(:save_contact)
+      expect(@storage).to receive(:save_contact)
       @input.arguments = ["jim", "Jim Jamieson"]
       @command.execute(@input, @output)
     end
 
     it "should change the contact's name if a name is given" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @name_service.should_receive(:update).with(@contact.name, {
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@name_service).to receive(:update).with(@contact.name, {
         :family => "Smith"
       })
-      @storage.should_receive(:save_contact)
+      expect(@storage).to receive(:save_contact)
       @input.arguments = ["jim"]
       @input.options = { :family => "Smith" }
       @command.execute(@input, @output)

data/spec/ppl/command/nick_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Nick do
 
   before(:each) do
@@ -7,7 +6,7 @@ describe Ppl::Command::Nick do
 
   describe "#name" do
     it "should be 'nick'" do
-      @command.name.should eq "nick"
+      expect(@command.name).to eq "nick"
     end
   end
 

data/spec/ppl/command/org_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Org do
 
   before(:each) do
@@ -7,7 +6,7 @@ describe Ppl::Command::Org do
 
   describe "#name" do
     it "should be 'org'" do
-      @command.name.should eq "org"
+      expect(@command.name).to eq "org"
     end
   end
 

data/spec/ppl/command/phone_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Phone do
 
   before(:each) do
@@ -7,7 +6,7 @@ describe Ppl::Command::Phone do
 
   describe "#name" do
     it "should be 'phone'" do
-      @command.name.should eq "phone"
+      expect(@command.name).to eq "phone"
     end
   end
 
@@ -21,8 +20,8 @@ describe Ppl::Command::Phone do
       @show_format = double(Ppl::Format::Contact)
       @input = Ppl::Application::Input.new
       @output = double(Ppl::Application::Output)
-      @storage.stub(:require_contact).and_return(@contact)
-      @storage.stub(:save_contact)
+      allow(@storage).to receive(:require_contact).and_return(@contact)
+      allow(@storage).to receive(:save_contact)
       @command.phone_service = @service
       @command.storage = @storage
       @command.list_format = @list_format
@@ -30,40 +29,40 @@ describe Ppl::Command::Phone do
     end
 
     it "should list all phone numbers by default" do
-      @storage.should_receive(:load_address_book).and_return(@address_book)
-      @list_format.should_receive(:process)
-      @output.should_receive(:line)
+      expect(@storage).to receive(:load_address_book).and_return(@address_book)
+      expect(@list_format).to receive(:process)
+      expect(@output).to receive(:line)
       @command.execute(@input, @output)
     end
 
     it "should show a single contact's numbers if one is specified" do
       @input.arguments << "jdoe"
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @show_format.should_receive(:process)
-      @output.should_receive(:line)
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@show_format).to receive(:process)
+      expect(@output).to receive(:line)
       @command.execute(@input, @output)
     end
 
     it "should delegate to the service layer to remove a phone number" do
       @input.arguments = ["jdoe", "01234567890"]
       @input.options[:delete] = true
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @service.should_receive(:remove).with(@contact, "01234567890")
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@service).to receive(:remove).with(@contact, "01234567890")
       @command.execute(@input, @output)
     end
 
     it "should delegate to the service layer to add a new phone number" do
       @input.arguments = ["jdoe", "98776332"]
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @service.should_receive(:add).with(@contact, "98776332", @input.options)
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@service).to receive(:add).with(@contact, "98776332", @input.options)
       @command.execute(@input, @output)
     end
 
     it "should delegate to the service layer to update an existing number" do
       @contact.phone_numbers << Ppl::Entity::PhoneNumber.new("012345678")
       @input.arguments = ["jdoe", "012345678"]
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @service.should_receive(:update).with(@contact, "012345678", {})
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@service).to receive(:update).with(@contact, "012345678", {})
       @command.execute(@input, @output)
     end
 

data/spec/ppl/command/post_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Post do
 
   before(:each) do
@@ -27,7 +26,7 @@ describe Ppl::Command::Post do
 
   describe "#name" do
     it "should be 'post'" do
-      @command.name.should eq "post"
+      expect(@command.name).to eq "post"
     end
   end
 
@@ -38,9 +37,9 @@ describe Ppl::Command::Post do
       before { @input.arguments = [] }
 
       it "displays postal address information for the whole address book" do
-        @storage.should_receive(:load_address_book).and_return(@address_book)
-        @address_book_format.should_receive(:process).and_return("all the postal addresses")
-        @output.should_receive(:line).with("all the postal addresses")
+        expect(@storage).to receive(:load_address_book).and_return(@address_book)
+        expect(@address_book_format).to receive(:process).and_return("all the postal addresses")
+        expect(@output).to receive(:line).with("all the postal addresses")
         @input.arguments = []
         @command.execute(@input, @output)
       end
@@ -51,16 +50,16 @@ describe Ppl::Command::Post do
       before { @input.arguments = ["jim"] }
 
       it "shows all of a contact's postal addresses" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @contact_format.should_receive(:process).and_return("1 Test Road")
-        @output.should_receive(:line).with("1 Test Road")
-        @command.execute(@input, @output).should eq true
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@contact_format).to receive(:process).and_return("1 Test Road")
+        expect(@output).to receive(:line).with("1 Test Road")
+        expect(@command.execute(@input, @output)).to eq true
       end
 
       it "outputs nothing if the contact has no addresses" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @contact_format.should_receive(:process).and_return("")
-        @command.execute(@input, @output).should eq false
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@contact_format).to receive(:process).and_return("")
+        expect(@command.execute(@input, @output)).to eq false
       end
 
     end
@@ -70,16 +69,16 @@ describe Ppl::Command::Post do
       before { @input.arguments = ["jim", "home"] }
 
       it "shows a single postal address" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @postal_address_format.should_receive(:process).with(@address).and_return("1 Test Road")
-        @output.should_receive(:line).with("1 Test Road")
-        @command.execute(@input, @output).should eq true
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@postal_address_format).to receive(:process).with(@address).and_return("1 Test Road")
+        expect(@output).to receive(:line).with("1 Test Road")
+        expect(@command.execute(@input, @output)).to eq true
       end
 
       it "raises an error if there's no such address" do
         @input.arguments[1] = "other"
-        @storage.should_receive(:require_contact).and_return(@contact)
-        expect{@command.execute(@input, @output).should eq true}.to raise_error(Ppl::Error::PostalAddressNotFound)
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect{expect(@command.execute(@input, @output)).to eq true}.to raise_error(Ppl::Error::PostalAddressNotFound)
       end
 
     end
@@ -90,10 +89,10 @@ describe Ppl::Command::Post do
       before { @input.options = { :delete => true }}
 
       it "deletes the postal address" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @service.should_receive(:remove).with(@contact, "home")
-        @storage.should_receive(:save_contact)
-        @command.execute(@input, @output).should eq true
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@service).to receive(:remove).with(@contact, "home")
+        expect(@storage).to receive(:save_contact)
+        expect(@command.execute(@input, @output)).to eq true
       end
 
     end
@@ -104,10 +103,10 @@ describe Ppl::Command::Post do
       before { @input.options = { :country => "New Country" }}
 
       it "updates the postal address" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @service.should_receive(:update).with(@contact, "home", {:country => "New Country"})
-        @storage.should_receive(:save_contact)
-        @command.execute(@input, @output).should eq true
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@service).to receive(:update).with(@contact, "home", {:country => "New Country"})
+        expect(@storage).to receive(:save_contact)
+        expect(@command.execute(@input, @output)).to eq true
       end
 
     end
@@ -119,10 +118,10 @@ describe Ppl::Command::Post do
       before { @input.options = { :street => "123 Swim St" }}
 
       it "adds the postal address" do
-        @storage.should_receive(:require_contact).and_return(@contact)
-        @service.should_receive(:add).with(@contact, "newaddress", {:street => "123 Swim St"})
-        @storage.should_receive(:save_contact)
-        @command.execute(@input, @output).should eq true
+        expect(@storage).to receive(:require_contact).and_return(@contact)
+        expect(@service).to receive(:add).with(@contact, "newaddress", {:street => "123 Swim St"})
+        expect(@storage).to receive(:save_contact)
+        expect(@command.execute(@input, @output)).to eq true
       end
 
     end