passaporteweb-client 0.2.0 → 0.3.0

data/spec/passaporte_web/notification_spec.rb

@@ -4,24 +4,24 @@ require 'spec_helper'
 describe PassaporteWeb::Notification do
 
   describe "constants" do
-    it { PassaporteWeb::Notification::ATTRIBUTES.should == [:body, :target_url, :uuid, :absolute_url, :scheduled_to, :sender_data, :read_at, :notification_type, :destination] }
-    it { PassaporteWeb::Notification::CREATABLE_ATTRIBUTES.should == [:body, :target_url, :scheduled_to, :destination] }
+    it { expect(PassaporteWeb::Notification::ATTRIBUTES).to eq([:body, :target_url, :uuid, :absolute_url, :scheduled_to, :sender_data, :read_at, :notification_type, :destination]) }
+    it { expect(PassaporteWeb::Notification::CREATABLE_ATTRIBUTES).to eq([:body, :target_url, :scheduled_to, :destination]) }
   end
 
   describe ".new" do
     it "should instanciate an empty object" do
       notification = PassaporteWeb::Notification.new
-      notification.should_not be_persisted
-      notification.attributes.should == {:body=>nil, :target_url=>nil, :uuid=>nil, :absolute_url=>nil, :scheduled_to=>nil, :sender_data=>nil, :read_at=>nil, :notification_type=>nil, :destination=>nil}
-      notification.uuid.should be_nil
-      notification.destination.should be_nil
-      notification.body.should be_nil
-      notification.target_url.should be_nil
-      notification.scheduled_to.should be_nil
-      notification.absolute_url.should be_nil
-      notification.sender_data.should be_nil
-      notification.read_at.should be_nil
-      notification.notification_type.should be_nil
+      expect(notification).not_to be_persisted
+      expect(notification.attributes).to eq({:body=>nil, :target_url=>nil, :uuid=>nil, :absolute_url=>nil, :scheduled_to=>nil, :sender_data=>nil, :read_at=>nil, :notification_type=>nil, :destination=>nil})
+      expect(notification.uuid).to be_nil
+      expect(notification.destination).to be_nil
+      expect(notification.body).to be_nil
+      expect(notification.target_url).to be_nil
+      expect(notification.scheduled_to).to be_nil
+      expect(notification.absolute_url).to be_nil
+      expect(notification.sender_data).to be_nil
+      expect(notification.read_at).to be_nil
+      expect(notification.notification_type).to be_nil
     end
     it "should instanciate an object with attributes set" do
       attributes = {
@@ -31,17 +31,17 @@ describe PassaporteWeb::Notification do
         "scheduled_to" => "2012-01-01 00:00:00"
       }
       notification = PassaporteWeb::Notification.new(attributes)
-      notification.should_not be_persisted
-      notification.uuid.should be_nil
-      notification.attributes.should == {:body=>"Feliz ano novo!", :target_url=>"https://app.passaporteweb.com.br", :uuid=>nil, :absolute_url=>nil, :scheduled_to=>"2012-01-01 00:00:00", :sender_data=>nil, :read_at=>nil, :notification_type=>nil, :destination=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df"}
-      notification.destination.should == "ac3540c7-5453-424d-bdfd-8ef2d9ff78df"
-      notification.body.should == "Feliz ano novo!"
-      notification.target_url.should == "https://app.passaporteweb.com.br"
-      notification.scheduled_to.should == "2012-01-01 00:00:00"
-      notification.absolute_url.should be_nil
-      notification.sender_data.should be_nil
-      notification.read_at.should be_nil
-      notification.notification_type.should be_nil
+      expect(notification).not_to be_persisted
+      expect(notification.uuid).to be_nil
+      expect(notification.attributes).to eq({:body=>"Feliz ano novo!", :target_url=>"https://app.passaporteweb.com.br", :uuid=>nil, :absolute_url=>nil, :scheduled_to=>"2012-01-01 00:00:00", :sender_data=>nil, :read_at=>nil, :notification_type=>nil, :destination=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df"})
+      expect(notification.destination).to eq("ac3540c7-5453-424d-bdfd-8ef2d9ff78df")
+      expect(notification.body).to eq("Feliz ano novo!")
+      expect(notification.target_url).to eq("https://app.passaporteweb.com.br")
+      expect(notification.scheduled_to).to eq("2012-01-01 00:00:00")
+      expect(notification.absolute_url).to be_nil
+      expect(notification.sender_data).to be_nil
+      expect(notification.read_at).to be_nil
+      expect(notification.notification_type).to be_nil
     end
   end
 
@@ -54,42 +54,42 @@ describe PassaporteWeb::Notification do
         data = PassaporteWeb::Notification.find_all
 
         notifications = data.notifications
-        notifications.size.should == 2
+        expect(notifications.size).to eq(2)
         expect(notifications.map { |n| n.instance_of?(described_class) }.uniq).to be_truthy
         n1, n2 = notifications
-        n1.body.should == '"oioioi"' # TODO why? was it created like this?
-        n2.body.should == '"oioioisss"'
-        n1.uuid.should == "2ca046be-0178-418d-80ac-3a334c264009"
-        n2.uuid.should == "11f40530-2de0-471d-b1f7-ff39ea21363f"
+        expect(n1.body).to eq('"oioioi"') # TODO why? was it created like this?
+        expect(n2.body).to eq('"oioioisss"')
+        expect(n1.uuid).to eq("2ca046be-0178-418d-80ac-3a334c264009")
+        expect(n2.uuid).to eq("11f40530-2de0-471d-b1f7-ff39ea21363f")
 
         meta = data.meta
-        meta.limit.should == 20
-        meta.next_page.should == nil
-        meta.prev_page.should == nil
-        meta.first_page.should == 1
-        meta.last_page.should == 1
+        expect(meta.limit).to eq(20)
+        expect(meta.next_page).to eq(nil)
+        expect(meta.prev_page).to eq(nil)
+        expect(meta.first_page).to eq(1)
+        expect(meta.last_page).to eq(1)
       end
       it "should return notifications for the authenticated user according to params, along with pagination information" do
         data = PassaporteWeb::Notification.find_all(2, 1, nil, true, "newest-first")
 
         notifications = data.notifications
-        notifications.size.should == 1
+        expect(notifications.size).to eq(1)
         expect(notifications.map { |n| n.instance_of?(described_class) }.uniq). to be_truthy
         n1 = notifications.first
-        n1.body.should == '"oioioi"' # TODO why? was it created like this?
-        n1.uuid.should == "2ca046be-0178-418d-80ac-3a334c264009"
+        expect(n1.body).to eq('"oioioi"') # TODO why? was it created like this?
+        expect(n1.uuid).to eq("2ca046be-0178-418d-80ac-3a334c264009")
 
         meta = data.meta
-        meta.limit.should == 1
-        meta.next_page.should == nil
-        meta.prev_page.should == 1
-        meta.first_page.should == 1
-        meta.last_page.should == 2
+        expect(meta.limit).to eq(1)
+        expect(meta.next_page).to eq(nil)
+        expect(meta.prev_page).to eq(1)
+        expect(meta.first_page).to eq(1)
+        expect(meta.last_page).to eq(2)
       end
     end
     context "on failure" do
       it "400 Bad Request" do
-        PassaporteWeb::Notification.find_all(1, 20, nil, true, 'lalala').should == {"ordering"=>["Faça uma escolha válida. lalala não está disponível."]}
+        expect(PassaporteWeb::Notification.find_all(1, 20, nil, true, 'lalala')).to eq({"ordering"=>["Faça uma escolha válida. lalala não está disponível."]})
       end
       it "404 Not Found" do
         expect {
@@ -105,15 +105,15 @@ describe PassaporteWeb::Notification do
     end
     context "on success" do
       it "should return count of notifications for the authenticated user" do
-        PassaporteWeb::Notification.count.should == 2
+        expect(PassaporteWeb::Notification.count).to eq(2)
       end
       it "should return count of notifications for the authenticated user, according to params" do
-        PassaporteWeb::Notification.count(true, '2013-04-02').should == 2
+        expect(PassaporteWeb::Notification.count(true, '2013-04-02')).to eq(2)
       end
     end
     context "on failure" do
       it "it should return an error message if an invalid parameter is sent" do
-        PassaporteWeb::Notification.count(false, "lalala").should == {"since"=>["Informe uma data/hora válida."]}
+        expect(PassaporteWeb::Notification.count(false, "lalala")).to eq({"since"=>["Informe uma data/hora válida."]})
       end
     end
   end
@@ -124,32 +124,32 @@ describe PassaporteWeb::Notification do
       context "on success" do
         it "should create the Notification on PassaporteWeb, authenticated as the user" do
           PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
-          notification.should_not be_persisted
+          expect(notification).not_to be_persisted
           expect(notification.save).to be_truthy # by default authenticates as the user
-          notification.should be_persisted
-          notification.uuid.should_not be_nil
-          notification.absolute_url.should_not be_nil
-          notification.destination.should be_nil # FIXME is this right? shouldn't it be a5868d14-6529-477a-9c6b-a09dd42a7cd2 ???
-          notification.scheduled_to.should == '2013-04-19 00:00:00' # FIXME is this right? shouldn't it be 2013-04-19 10:50:19 ???
-          notification.body.should == 'feliz aniversário!'
-          notification.target_url.should == 'http://pittlandia.net/' # PW added the trailing slash, WTF?
-          notification.sender_data.should == {"name" => "Rodrigo Martins", "uuid" => "385f5f3c-8d33-4b95-9e0d-e87962985244"}
-          notification.read_at.should be_nil
-          notification.notification_type.should be_nil
+          expect(notification).to be_persisted
+          expect(notification.uuid).not_to be_nil
+          expect(notification.absolute_url).not_to be_nil
+          expect(notification.destination).to be_nil # FIXME is this right? shouldn't it be a5868d14-6529-477a-9c6b-a09dd42a7cd2 ???
+          expect(notification.scheduled_to).to eq('2013-04-19 00:00:00') # FIXME is this right? shouldn't it be 2013-04-19 10:50:19 ???
+          expect(notification.body).to eq('feliz aniversário!')
+          expect(notification.target_url).to eq('http://pittlandia.net/') # PW added the trailing slash, WTF?
+          expect(notification.sender_data).to eq({"name" => "Rodrigo Martins", "uuid" => "385f5f3c-8d33-4b95-9e0d-e87962985244"})
+          expect(notification.read_at).to be_nil
+          expect(notification.notification_type).to be_nil
         end
         it "should create the Notification on PassaporteWeb, authenticated as the application" do
-          notification.should_not be_persisted
+          expect(notification).not_to be_persisted
           expect(notification.save('application')).to be_truthy
-          notification.should be_persisted
-          notification.uuid.should_not be_nil
-          notification.absolute_url.should_not be_nil
-          notification.destination.should be_nil # FIXME is this right? shouldn't it be a5868d14-6529-477a-9c6b-a09dd42a7cd2 ???
-          notification.scheduled_to.should == '2013-04-19 00:00:00' # FIXME is this right? shouldn't it be 2013-04-19 10:50:19 ???
-          notification.body.should == 'feliz aniversário!'
-          notification.target_url.should == 'http://pittlandia.net/' # PW added the trailing slash, WTF?
-          notification.sender_data.should == {"name" => "Identity Client", "slug" => "identity_client"}
-          notification.read_at.should be_nil
-          notification.notification_type.should be_nil
+          expect(notification).to be_persisted
+          expect(notification.uuid).not_to be_nil
+          expect(notification.absolute_url).not_to be_nil
+          expect(notification.destination).to be_nil # FIXME is this right? shouldn't it be a5868d14-6529-477a-9c6b-a09dd42a7cd2 ???
+          expect(notification.scheduled_to).to eq('2013-04-19 00:00:00') # FIXME is this right? shouldn't it be 2013-04-19 10:50:19 ???
+          expect(notification.body).to eq('feliz aniversário!')
+          expect(notification.target_url).to eq('http://pittlandia.net/') # PW added the trailing slash, WTF?
+          expect(notification.sender_data).to eq({"name" => "Identity Client", "slug" => "identity_client"})
+          expect(notification.read_at).to be_nil
+          expect(notification.notification_type).to be_nil
         end
       end
       context "on failure" do
@@ -161,19 +161,19 @@ describe PassaporteWeb::Notification do
         it "should return false and set the errors with the reason for the failure, authenticated as the user" do
           PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
           notification.target_url = 'lalalala'
-          notification.should_not be_persisted
+          expect(notification).not_to be_persisted
           expect(notification.save('user')).to be_falsy
-          notification.should_not be_persisted
-          notification.uuid.should be_nil
-          notification.errors.should == {"field_errors"=>{"target_url"=>["Informe uma URL válida."]}}
+          expect(notification).not_to be_persisted
+          expect(notification.uuid).to be_nil
+          expect(notification.errors).to eq({"field_errors"=>{"target_url"=>["Informe uma URL válida."]}})
         end
         it "should return false and set the errors with the reason for the failure, authenticated as the application" do
           notification.destination = nil # required field
-          notification.should_not be_persisted
+          expect(notification).not_to be_persisted
           expect(notification.save('application')).to be_falsy
-          notification.should_not be_persisted
-          notification.uuid.should be_nil
-          notification.errors.should == {"field_errors"=>{"destination"=>["Este campo é obrigatório."]}}
+          expect(notification).not_to be_persisted
+          expect(notification.uuid).to be_nil
+          expect(notification.errors).to eq({"field_errors"=>{"destination"=>["Este campo é obrigatório."]}})
         end
       end
     end
@@ -186,17 +186,17 @@ describe PassaporteWeb::Notification do
     end
     context "on success" do
       it "should mark the Notification as read" do
-        notification.read_at.should be_nil
+        expect(notification.read_at).to be_nil
         expect(notification.read!).to be_truthy
-        notification.read_at.should_not be_nil
+        expect(notification.read_at).not_to be_nil
       end
     end
     context "on failure" do
       it "should return false if the notification is already read" do
         read_notification = described_class.find_all(1,20,nil,true).notifications.detect { |n| !n.read_at.nil? }
-        read_notification.read_at.should_not be_nil
+        expect(read_notification.read_at).not_to be_nil
         expect(read_notification.read!).to be_falsy
-        read_notification.errors.should == {message: 'notification already read'}
+        expect(read_notification.errors).to eq({message: 'notification already read'})
       end
     end
   end
@@ -205,19 +205,19 @@ describe PassaporteWeb::Notification do
     let(:notification) { described_class.new(body: 'novinha', destination: 'a5868d14-6529-477a-9c6b-a09dd42a7cd2', scheduled_to: '2013-04-06') } # 2.days.from_now
     it "should return false if the record is not persisted" do
       expect(notification.destroy).to be_falsy
-      notification.errors.should == {message: 'notification not persisted yet'}
+      expect(notification.errors).to eq({message: 'notification not persisted yet'})
     end
     it "should destroy the notification on PassaporteWeb if the notification has not been read and is scheduled", vcr: true do
       expect(notification.save('application')).to be_truthy
-      notification.read_at.should be_nil
-      notification.scheduled_to.should == "2013-04-06 00:00:00"
+      expect(notification.read_at).to be_nil
+      expect(notification.scheduled_to).to eq("2013-04-06 00:00:00")
       expect(notification.destroy).to be_truthy
     end
     it "should not exclude non-scheduled notification", vcr: true do
       notification.scheduled_to = nil
       expect(notification.save('application')).to be_truthy
       expect(notification.destroy).to be_falsy
-      notification.errors.should == "Only scheduled notifications can be deleted via API"
+      expect(notification.errors).to eq("Only scheduled notifications can be deleted via API")
     end
   end
 

data/spec/passaporte_web/service_account_member_spec.rb

@@ -11,30 +11,30 @@ describe PassaporteWeb::ServiceAccountMember do
   describe ".new" do
     it "should instanciate a minumum object" do
       member = described_class.new(mock_service_account, mock_identity)
-      member.service_account.should == mock_service_account
-      member.identity.should == mock_identity
-      member.roles.should == ['user']
-      member.membership_details_url.should be_nil
-      member.errors.should be_empty
-      member.should_not be_persisted
-      member.should_not be_destroyed
+      expect(member.service_account).to eq(mock_service_account)
+      expect(member.identity).to eq(mock_identity)
+      expect(member.roles).to eq(['user'])
+      expect(member.membership_details_url).to be_nil
+      expect(member.errors).to be_empty
+      expect(member).not_to be_persisted
+      expect(member).not_to be_destroyed
     end
     it "should instanciate an object with attributes set" do
       member = described_class.new(mock_service_account, mock_identity, ['admin', 'user'])
-      member.roles.should == ['admin', 'user']
+      expect(member.roles).to eq(['admin', 'user'])
     end
   end
 
   describe ".find", vcr: true do
     it "should return an instance of ServiceAccountMember with all attributes set" do
       member = described_class.find(service_account, identity)
-      member.service_account.should == service_account
-      member.identity.should == identity
-      member.roles.should == ['admin','user']
-      member.membership_details_url.should == "/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/"
-      member.errors.should be_empty
-      member.should be_persisted
-      member.should_not be_destroyed
+      expect(member.service_account).to eq(service_account)
+      expect(member.identity).to eq(identity)
+      expect(member.roles).to eq(['admin','user'])
+      expect(member.membership_details_url).to eq("/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/")
+      expect(member.errors).to be_empty
+      expect(member).to be_persisted
+      expect(member).not_to be_destroyed
     end
     it "should raise an 404 error if the membership does not exist" do
       expect {
@@ -47,20 +47,20 @@ describe PassaporteWeb::ServiceAccountMember do
     it "should destroy the membership, removing the association between service_account and identity" do
       member = described_class.find(service_account, identity)
       expect(member.destroy).to be_truthy
-      member.should_not be_persisted
-      member.should be_destroyed
-      member.errors.should be_empty
+      expect(member).not_to be_persisted
+      expect(member).to be_destroyed
+      expect(member.errors).to be_empty
       expect {
         described_class.find(service_account, identity)
       }.to raise_error(RestClient::ResourceNotFound, '404 Resource Not Found')
     end
     it "should return false if the role is owner" do
       member = described_class.find(service_account, identity)
-      member.roles.should include('owner')
+      expect(member.roles).to include('owner')
       expect(member.destroy).to be_falsy
-      member.should be_persisted
-      member.should_not be_destroyed
-      member.errors.should == "Service owner cannot be removed from members list"
+      expect(member).to be_persisted
+      expect(member).not_to be_destroyed
+      expect(member.errors).to eq("Service owner cannot be removed from members list")
 
       expect {
         described_class.find(service_account, identity)
@@ -74,31 +74,31 @@ describe PassaporteWeb::ServiceAccountMember do
       context "on success" do
         it "should create the membership between the service_account and the identity" do
           expect(member.save).to be_truthy
-          member.service_account.should == service_account
-          member.identity.should == identity
-          member.roles.should == ['admin','user']
-          member.membership_details_url.should == "/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/"
-          member.errors.should be_empty
-          member.should be_persisted
-          member.should_not be_destroyed
+          expect(member.service_account).to eq(service_account)
+          expect(member.identity).to eq(identity)
+          expect(member.roles).to eq(['admin','user'])
+          expect(member.membership_details_url).to eq("/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/")
+          expect(member.errors).to be_empty
+          expect(member).to be_persisted
+          expect(member).not_to be_destroyed
 
           member = described_class.find(service_account, identity)
-          member.service_account.should == service_account
-          member.identity.should == identity
-          member.roles.should == ['admin','user']
-          member.membership_details_url.should == "/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/"
-          member.errors.should be_empty
-          member.should be_persisted
-          member.should_not be_destroyed
+          expect(member.service_account).to eq(service_account)
+          expect(member.identity).to eq(identity)
+          expect(member.roles).to eq(['admin','user'])
+          expect(member.membership_details_url).to eq("/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/")
+          expect(member.errors).to be_empty
+          expect(member).to be_persisted
+          expect(member).not_to be_destroyed
         end
       end
       context "on failure" do
         it "should not create the membership and set the errors on the object" do
           member.roles = ['owner'] # can't create membership for the owner
           expect(member.save).to be_falsy
-          member.errors.should == "Adding a member as owner is not allowed"
-          member.should_not be_persisted
-          member.should_not be_destroyed
+          expect(member.errors).to eq("Adding a member as owner is not allowed")
+          expect(member).not_to be_persisted
+          expect(member).not_to be_destroyed
 
           expect {
             described_class.find(service_account, identity)
@@ -106,9 +106,9 @@ describe PassaporteWeb::ServiceAccountMember do
         end
         it "should return false if the membership already exists" do
           expect(member.save).to be_falsy
-          member.errors.should == "Identity with uuid=5e32f927-c4ab-404e-a91c-b2abc05afb56 is already in members list of service identity_client at account 859d3542-84d6-4909-b1bd-4f43c1312065"
-          member.should_not be_persisted
-          member.should_not be_destroyed
+          expect(member.errors).to eq("Identity with uuid=5e32f927-c4ab-404e-a91c-b2abc05afb56 is already in members list of service identity_client at account 859d3542-84d6-4909-b1bd-4f43c1312065")
+          expect(member).not_to be_persisted
+          expect(member).not_to be_destroyed
 
           expect {
             described_class.find(service_account, identity)
@@ -120,27 +120,27 @@ describe PassaporteWeb::ServiceAccountMember do
       let(:member) { described_class.find(service_account, identity) }
       context "on success" do
         it "should update the member roles" do
-          member.roles.should == ['admin', 'user']
+          expect(member.roles).to eq(['admin', 'user'])
           member.roles = ['user']
           expect(member.save).to be_truthy
-          member.errors.should be_empty
-          member.roles.should == ['user']
+          expect(member.errors).to be_empty
+          expect(member.roles).to eq(['user'])
 
           member = described_class.find(service_account, identity)
-          member.roles.should == ['user']
+          expect(member.roles).to eq(['user'])
         end
       end
       context "on failure" do
         it "should return false and set the errors" do
           pending "está deixando setar como owner e não deixa setar sem nenhum role, como fazer?"
-          member.roles.should == ['admin', 'user']
+          expect(member.roles).to eq(['admin', 'user'])
           member.roles = ['owner']
           expect(member.save).to be_falsy
-          member.errors.should_not be_empty
-          member.roles.should == ['owner']
+          expect(member.errors).not_to be_empty
+          expect(member.roles).to eq(['owner'])
 
           member = described_class.find(service_account, identity)
-          member.roles.should == ['admin', 'user']
+          expect(member.roles).to eq(['admin', 'user'])
         end
       end
     end

data/spec/passaporte_web/service_account_spec.rb

@@ -6,7 +6,7 @@ describe PassaporteWeb::ServiceAccount do
   describe ".new" do
     it "should instanciate an empty object" do
       service_account = PassaporteWeb::ServiceAccount.new
-      service_account.attributes.should == {:plan_slug=>nil, :expiration=>nil, :identity=>nil, :roles=>nil, :member_uuid=>nil, :role=>nil, :include_expired_accounts=>nil, :name=>nil, :members_data=>nil, :url=>nil, :service_data=>nil, :account_data=>nil, :add_member_url=>nil}
+      expect(service_account.attributes).to eq({:plan_slug=>nil, :expiration=>nil, :identity=>nil, :roles=>nil, :member_uuid=>nil, :role=>nil, :include_expired_accounts=>nil, :name=>nil, :members_data=>nil, :url=>nil, :service_data=>nil, :account_data=>nil, :add_member_url=>nil})
     end
     it "should instanciate an object with attributes set" do
       attributes = {
@@ -25,15 +25,15 @@ describe PassaporteWeb::ServiceAccount do
         "add_member_url" => nil
       }
       service_account = PassaporteWeb::ServiceAccount.new(attributes)
-      service_account.attributes.should == { :plan_slug=>"free", :expiration=>"2011-12-31", :identity=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df", :roles=>"admin,user", :member_uuid=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df", :role=>"owner", :include_expired_accounts=>"true", :name=>"Conta Pessoa", :members_data=>nil, :url=>nil, :service_data=>nil, :account_data=>nil, :add_member_url=>nil }
-      service_account.plan_slug.should == "free"
-      service_account.expiration.should == "2011-12-31"
-      service_account.identity.should == "ac3540c7-5453-424d-bdfd-8ef2d9ff78df"
-      service_account.roles.should == "admin,user"
-      service_account.member_uuid.should == "ac3540c7-5453-424d-bdfd-8ef2d9ff78df"
-      service_account.role.should == "owner"
-      service_account.include_expired_accounts.should == "true"
-      service_account.name.should == "Conta Pessoa"
+      expect(service_account.attributes).to eq({ :plan_slug=>"free", :expiration=>"2011-12-31", :identity=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df", :roles=>"admin,user", :member_uuid=>"ac3540c7-5453-424d-bdfd-8ef2d9ff78df", :role=>"owner", :include_expired_accounts=>"true", :name=>"Conta Pessoa", :members_data=>nil, :url=>nil, :service_data=>nil, :account_data=>nil, :add_member_url=>nil })
+      expect(service_account.plan_slug).to eq("free")
+      expect(service_account.expiration).to eq("2011-12-31")
+      expect(service_account.identity).to eq("ac3540c7-5453-424d-bdfd-8ef2d9ff78df")
+      expect(service_account.roles).to eq("admin,user")
+      expect(service_account.member_uuid).to eq("ac3540c7-5453-424d-bdfd-8ef2d9ff78df")
+      expect(service_account.role).to eq("owner")
+      expect(service_account.include_expired_accounts).to eq("true")
+      expect(service_account.name).to eq("Conta Pessoa")
     end
   end
 
@@ -43,39 +43,39 @@ describe PassaporteWeb::ServiceAccount do
       accounts_and_meta = PassaporteWeb::ServiceAccount.find_all
 
       service_accounts = accounts_and_meta.service_accounts
-      service_accounts.should be_instance_of(Array)
-      service_accounts.size.should == 15
-      service_accounts.map { |a| a.instance_of?(PassaporteWeb::ServiceAccount) }.uniq.should == [true]
-      service_accounts.map(&:plan_slug).uniq.sort.should == ['free', 'passaporteweb-client-ruby']
-      service_accounts.map(&:persisted?).uniq.sort.should == [true]
+      expect(service_accounts).to be_instance_of(Array)
+      expect(service_accounts.size).to eq(15)
+      expect(service_accounts.map { |a| a.instance_of?(PassaporteWeb::ServiceAccount) }.uniq).to eq([true])
+      expect(service_accounts.map(&:plan_slug).uniq.sort).to eq(['free', 'passaporteweb-client-ruby'])
+      expect(service_accounts.map(&:persisted?).uniq.sort).to eq([true])
 
       meta = accounts_and_meta.meta
-      meta.limit.should == 20
-      meta.next_page.should == nil
-      meta.prev_page.should == nil
-      meta.first_page.should == 1
-      meta.last_page.should == 1
+      expect(meta.limit).to eq(20)
+      expect(meta.next_page).to eq(nil)
+      expect(meta.prev_page).to eq(nil)
+      expect(meta.first_page).to eq(1)
+      expect(meta.last_page).to eq(1)
     end
     it "should return information about all possible pages" do
       accounts_and_meta = PassaporteWeb::ServiceAccount.find_all(3, 3)
 
       service_accounts = accounts_and_meta.service_accounts
-      service_accounts.should be_instance_of(Array)
-      service_accounts.size.should == 3
+      expect(service_accounts).to be_instance_of(Array)
+      expect(service_accounts.size).to eq(3)
 
       meta = accounts_and_meta.meta
-      meta.limit.should == 3
-      meta.next_page.should == 4
-      meta.prev_page.should == 2
-      meta.first_page.should == 1
-      meta.last_page.should == 5
+      expect(meta.limit).to eq(3)
+      expect(meta.next_page).to eq(4)
+      expect(meta.prev_page).to eq(2)
+      expect(meta.first_page).to eq(1)
+      expect(meta.last_page).to eq(5)
     end
     it "should ask for page 1 and 20 accounts per page by default" do
-      PassaporteWeb::Http.should_receive(:get).with("/organizations/api/accounts/?page=1&limit=20").and_return(mock_response)
+      expect(PassaporteWeb::Http).to receive(:get).with("/organizations/api/accounts/?page=1&limit=20").and_return(mock_response)
       PassaporteWeb::ServiceAccount.find_all
     end
     it "should ask for page and accounts per page as supplied" do
-      PassaporteWeb::Http.should_receive(:get).with("/organizations/api/accounts/?page=4&limit=100").and_return(mock_response)
+      expect(PassaporteWeb::Http).to receive(:get).with("/organizations/api/accounts/?page=4&limit=100").and_return(mock_response)
       PassaporteWeb::ServiceAccount.find_all(4, 100)
     end
     it "should raise an error if the page does not exist" do
@@ -89,18 +89,18 @@ describe PassaporteWeb::ServiceAccount do
     context "on success" do
       it "should return an instance of Account with all the details" do
         service_account = PassaporteWeb::ServiceAccount.find("859d3542-84d6-4909-b1bd-4f43c1312065")
-        service_account.should be_instance_of(PassaporteWeb::ServiceAccount)
-        service_account.plan_slug.should == "free"
-        service_account.should be_persisted
-        service_account.account_data.should == {"name" => "Investimentos", "uuid" => "859d3542-84d6-4909-b1bd-4f43c1312065"}
-        service_account.service_data.should == {"name" => "Identity Client", "slug" => "identity_client"}
-        service_account.members_data.should == [
+        expect(service_account).to be_instance_of(PassaporteWeb::ServiceAccount)
+        expect(service_account.plan_slug).to eq("free")
+        expect(service_account).to be_persisted
+        expect(service_account.account_data).to eq({"name" => "Investimentos", "uuid" => "859d3542-84d6-4909-b1bd-4f43c1312065"})
+        expect(service_account.service_data).to eq({"name" => "Identity Client", "slug" => "identity_client"})
+        expect(service_account.members_data).to eq([
           {"membership_details_url"=>"/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/20a8bbe1-3b4a-4e46-a69a-a7c524bd2ab8/", "identity"=>"20a8bbe1-3b4a-4e46-a69a-a7c524bd2ab8", "roles"=>["owner"]},
           {"membership_details_url"=>"/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/5e32f927-c4ab-404e-a91c-b2abc05afb56/", "identity"=>"5e32f927-c4ab-404e-a91c-b2abc05afb56", "roles"=>["user"]}
-        ]
-        service_account.expiration.should be_nil
-        service_account.url.should == "/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/"
-        service_account.add_member_url.should == "/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/"
+        ])
+        expect(service_account.expiration).to be_nil
+        expect(service_account.url).to eq("/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/")
+        expect(service_account.add_member_url).to eq("/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/")
       end
     end
     context "on failure" do
@@ -116,13 +116,13 @@ describe PassaporteWeb::ServiceAccount do
     let(:service_account) { PassaporteWeb::ServiceAccount.find("859d3542-84d6-4909-b1bd-4f43c1312065") }
     it "should return the uuid of the ServiceAccount" do
       service_account = PassaporteWeb::ServiceAccount.find("859d3542-84d6-4909-b1bd-4f43c1312065")
-      service_account.account_data.should == {"name" => "Investimentos", "uuid" => "859d3542-84d6-4909-b1bd-4f43c1312065"}
-      service_account.uuid.should == '859d3542-84d6-4909-b1bd-4f43c1312065'
+      expect(service_account.account_data).to eq({"name" => "Investimentos", "uuid" => "859d3542-84d6-4909-b1bd-4f43c1312065"})
+      expect(service_account.uuid).to eq('859d3542-84d6-4909-b1bd-4f43c1312065')
     end
     it "should return nil if the ServiceAccount has no uuid yet" do
       service_account = PassaporteWeb::ServiceAccount.new
-      service_account.account_data.should be_nil
-      service_account.uuid.should be_nil
+      expect(service_account.account_data).to be_nil
+      expect(service_account.uuid).to be_nil
     end
   end
 
@@ -130,32 +130,32 @@ describe PassaporteWeb::ServiceAccount do
     let(:service_account) { PassaporteWeb::ServiceAccount.find("859d3542-84d6-4909-b1bd-4f43c1312065") }
     context "on success" do
       it "should update the ServiceAccount attributes on the server" do
-        service_account.plan_slug.should == 'free'
-        service_account.expiration.should == '2014-04-01 00:00:00'
+        expect(service_account.plan_slug).to eq('free')
+        expect(service_account.expiration).to eq('2014-04-01 00:00:00')
 
         service_account.plan_slug = 'basic'
         service_account.expiration = '2014-05-01'
 
-        service_account.should be_persisted
+        expect(service_account).to be_persisted
         expect(service_account.save).to be_truthy
-        service_account.should be_persisted
+        expect(service_account).to be_persisted
 
-        service_account.plan_slug.should == 'basic'
-        service_account.expiration.should == '2014-05-01 00:00:00'
+        expect(service_account.plan_slug).to eq('basic')
+        expect(service_account.expiration).to eq('2014-05-01 00:00:00')
 
         service_account = PassaporteWeb::ServiceAccount.find("859d3542-84d6-4909-b1bd-4f43c1312065")
-        service_account.plan_slug.should == 'basic'
-        service_account.expiration.should == '2014-05-01 00:00:00'
+        expect(service_account.plan_slug).to eq('basic')
+        expect(service_account.expiration).to eq('2014-05-01 00:00:00')
       end
     end
     context "on failure" do
       it "should return false and set the errors hash" do
         service_account.plan_slug = nil # required
         service_account.expiration = nil
-        service_account.should be_persisted
+        expect(service_account).to be_persisted
         expect(service_account.save).to be_falsy
-        service_account.should be_persisted
-        service_account.errors.should == {"field_errors"=>{"plan_slug"=>["Este campo é obrigatório."]}}
+        expect(service_account).to be_persisted
+        expect(service_account.errors).to eq({"field_errors"=>{"plan_slug"=>["Este campo é obrigatório."]}})
       end
     end
   end