passaporteweb-client 0.1.0 → 0.2.0

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.1.6
+  - 2.2.2

data/Gemfile.lock

@@ -1,54 +1,76 @@
 PATH
   remote: .
   specs:
-    passaporteweb-client (0.0.19)
+    passaporteweb-client (0.2.0)
       multi_json (~> 1.9.0)
-      rest-client (~> 1.6.7)
+      rest-client (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.3)
-    awesome_print (1.1.0)
-    coderay (1.0.9)
-    colorize (0.5.8)
-    coveralls (0.6.3)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
+    awesome_print (1.6.1)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     crack (0.3.2)
-    diff-lcs (1.2.1)
-    json (1.7.7)
-    method_source (0.8.1)
-    mime-types (1.21)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    json (1.8.3)
+    method_source (0.8.2)
+    mime-types (2.6.1)
     multi_json (1.9.2)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    netrc (0.10.3)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rake (10.0.4)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.4)
-    thor (0.18.0)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.5.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     vcr (2.4.0)
     webmock (1.9.3)
       addressable (>= 2.2.7)
@@ -58,15 +80,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print (~> 1.1)
-  bundler (~> 1.5.3)
-  coveralls (~> 0.6)
+  awesome_print (~> 1.6)
+  bundler (~> 1.9)
+  coveralls (~> 0.8)
+  json (= 1.8.3)
   passaporteweb-client!
-  pry (~> 0.9)
-  pry-nav (~> 0.2)
-  rake (~> 10.0)
-  rdoc (~> 4.0)
-  rspec (~> 2.13)
-  simplecov (~> 0.7)
+  pry-byebug (~> 3.1)
+  rake (~> 10.4)
+  rdoc (~> 4.2)
+  rspec (~> 3.3.0)
+  simplecov (~> 0.10)
   vcr (~> 2.4)
   webmock (~> 1.9.3)

data/README.rdoc

@@ -6,6 +6,7 @@ A Ruby client for the PassaporteWeb REST API
 {<img src="https://travis-ci.org/myfreecomm/passaporteweb-client-ruby.png?branch=master" alt="Build Status" />}[https://travis-ci.org/myfreecomm/passaporteweb-client-ruby]
 {<img src="https://coveralls.io/repos/myfreecomm/passaporteweb-client-ruby/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/myfreecomm/passaporteweb-client-ruby]
 {<img src="https://codeclimate.com/github/myfreecomm/passaporteweb-client-ruby.png" alt="Code Climate Status" />}[https://codeclimate.com/github/myfreecomm/passaporteweb-client-ruby]
+{<img src="http://inch-ci.org/github/myfreecomm/passaporteweb-client-ruby.svg" alt="Inline docs" />}[http://inch-ci.org/github/myfreecomm/passaporteweb-client-ruby]
 
 PassaporteWeb API docs: https://app.passaporteweb.com.br/static/docs/
 
@@ -29,6 +30,10 @@ Or install it yourself as:
 
   $ gem install passaporteweb-client
 
+== Support
+
+This gem supports Ruby 2.1 and Ruby 2.2.
+
 == Usage
 
 === Mapping of API endpoints to this client

data/lib/passaporte_web/service_account.rb

@@ -97,6 +97,22 @@ module PassaporteWeb
       @persisted == true
     end
 
+    # Activates an existing ServiceAccount. Returns true if successfull or false if not. In case of failure,
+    # it will fill the <tt>errors</tt> attribute with the reason for the failure to save the object.
+    #
+    # API method: <tt>PUT /organizations/api/activate/</tt>
+    #
+    # API documentation: http://myfreecomm.github.io/passaporte-web/pweb/api/account_manager.html#put-organizations-api-activate
+    def activate(identity)
+      response = Http.put("/organizations/api/activate/", {slug: self.plan_slug, identity: identity, global_account: self.uuid})
+      raise "unexpected response: #{response.code} - #{response.body}" unless response.code == 200
+      @errors = {}
+      true
+    rescue *[RestClient::Conflict, RestClient::BadRequest] => e
+      @errors = MultiJson.decode(e.response.body)
+      false
+    end
+
     private
 
     def update

data/lib/passaporte_web/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module PassaporteWeb
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/passaporteweb-client.gemspec

@@ -8,8 +8,8 @@ require File.join([File.dirname(__FILE__),'lib','passaporte_web','version.rb'])
 Gem::Specification.new do |spec|
   spec.name          = "passaporteweb-client"
   spec.version       = PassaporteWeb::VERSION
-  spec.authors       = ["Rodrigo Tassinari de Oliveira", "Rodrigo Martins"]
-  spec.email         = ["rodrigo@pittlandia.net", "rodrigo.tassinari@myfreecomm.com.br", "rodrigo@rrmartins.com", "rodrigo.martins@myfreecomm.com.br"]
+  spec.authors       = ["Rodrigo Tassinari de Oliveira", "Eduardo Hertz", "Rafael B. Tauil"]
+  spec.email         = ["rodrigo@pittlandia.net", "rodrigo.tassinari@myfreecomm.com.br", "eduardo.hertz@myfreecomm.com.br", "rafael@tauil.com.br"]
   spec.description   = %q{A Ruby client for the PassaporteWeb REST API}
   spec.summary       = %q{A Ruby client for the PassaporteWeb REST API: https://app.passaporteweb.com.br/static/docs/}
   spec.homepage      = "https://github.com/myfreecomm/passaporteweb-client-ruby"
@@ -23,18 +23,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rest-client", "~> 1.6.7"
+  spec.add_dependency "rest-client", "~> 1.8.0"
   spec.add_dependency "multi_json", "~> 1.9.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5.3"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rdoc', '~> 4.0'
-  spec.add_development_dependency "rspec", "~> 2.13"
+  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "rake", "~> 10.4"
+  spec.add_development_dependency 'rdoc', '~> 4.2'
+  spec.add_development_dependency "rspec", "~> 3.3.0"
   spec.add_development_dependency "vcr", "~> 2.4"
   spec.add_development_dependency "webmock", "~> 1.9.3"
-  spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "pry-nav", "~> 0.2"
-  spec.add_development_dependency "awesome_print", "~> 1.1"
-  spec.add_development_dependency "simplecov", "~> 0.7"
-  spec.add_development_dependency "coveralls", "~> 0.6"
+  spec.add_development_dependency "pry-byebug", "~> 3.1"
+  spec.add_development_dependency "awesome_print", "~> 1.6"
+  spec.add_development_dependency "simplecov", "~> 0.10"
+  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "json", "1.8.3"
 end

data/spec/passaporte_web/http_spec.rb

@@ -13,7 +13,7 @@ describe PassaporteWeb::Http do
     end
   end
 
-  let(:mock_response) { mock('restclient http response') }
+  let(:mock_response) { 'restclient http response' }
 
   describe ".get" do
     it "should use RestClient.get with the supplied params and common options" do

data/spec/passaporte_web/identity_service_account_spec.rb

@@ -87,7 +87,7 @@ describe PassaporteWeb::IdentityServiceAccount do
           name: 'Conta Nova em Folha'
         }
         account = described_class.new(identity, attributes)
-        account.save.should be_true
+        expect(account.save).to be_truthy
         account.should be_persisted
 
         account.plan_slug.should == 'basic'
@@ -135,7 +135,7 @@ describe PassaporteWeb::IdentityServiceAccount do
           name: 'Conta Nova em Folha 2: A missão'
         }
         account = described_class.new(identity, attributes)
-        account.save.should be_false
+        expect(account.save).to be_falsy
         account.should_not be_persisted
         account.errors.should == {"field_errors"=>{"expiration"=>["Cannot set the expiration to the past."]}}
       end

data/spec/passaporte_web/identity_service_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe PassaporteWeb::IdentityService do
   let(:identity) { PassaporteWeb::Identity.find('5e32f927-c4ab-404e-a91c-b2abc05afb56') }
-  let(:mock_identity) { mock('Identity', uuid: 'identity-uuid') }
+  let(:mock_identity) { double('Identity', uuid: 'identity-uuid') }
   let(:identity_service_data_hash) { {:foo => 'bar', 'spam' => :eggs, 'integer' => 2, :float => 3.456, :array => [1, 2.0, 'three', :four], :hash => {oba: 'eba'}} }
   let(:identity_service_data_hash_as_strings) { {"foo"=>"bar", "hash"=>{"oba"=>"eba"}, "spam"=>"eggs", "integer"=>2, "array"=>[1, 2.0, "three", "four"], "float"=>3.456} }
 
@@ -14,7 +14,7 @@ describe PassaporteWeb::IdentityService do
       identity_service.identity.should == mock_identity
       identity_service.slug.should be_nil
       identity_service.is_active.should be_nil
-      identity_service.is_active?.should be_false
+      expect(identity_service.is_active?).to be_falsy
       identity_service.service_data.should be_nil
       identity_service.errors.should be_empty
       identity_service.should_not be_persisted
@@ -31,7 +31,7 @@ describe PassaporteWeb::IdentityService do
       identity_service.identity.should == mock_identity
       identity_service.slug.should == 'identity_client'
       identity_service.is_active.should == true
-      identity_service.is_active?.should be_true
+      expect(identity_service.is_active?).to be_truthy
       identity_service.service_data.should == identity_service_data_hash
       identity_service.errors.should be_empty
       identity_service.should_not be_persisted
@@ -44,8 +44,8 @@ describe PassaporteWeb::IdentityService do
       identity_service.should be_instance_of(described_class)
       identity_service.identity.should == identity
       identity_service.slug.should == 'identity_client'
-      identity_service.is_active.should == true
-      identity_service.is_active?.should be_true
+      expect(identity_service.is_active).to be_truthy
+      expect(identity_service.is_active?).to be_truthy
       identity_service.service_data.should be_nil
       identity_service.errors.should be_empty
       identity_service.should be_persisted
@@ -65,7 +65,7 @@ describe PassaporteWeb::IdentityService do
         'service_data' => identity_service_data_hash
       }
       identity_service = described_class.new(other_identity, attributes)
-      identity_service.save.should be_true
+      expect(identity_service.save).to be_truthy
       identity_service.service_data.should == identity_service_data_hash_as_strings
 
       identity_service = described_class.find(other_identity, 'identity_client')
@@ -75,7 +75,7 @@ describe PassaporteWeb::IdentityService do
       identity_service = described_class.find(identity, 'identity_client')
       identity_service.service_data.should be_empty
       identity_service.service_data = identity_service_data_hash
-      identity_service.save.should be_true
+      expect(identity_service.save).to be_truthy
       identity_service.service_data.should == identity_service_data_hash_as_strings
 
       identity_service = described_class.find(identity, 'identity_client')

data/spec/passaporte_web/identity_spec.rb

@@ -128,7 +128,7 @@ describe PassaporteWeb::Identity do
     # REGRSSION
     it "should return the is_active and id_token fields" do
       identity = described_class.find('13b972ab-0946-4a5b-8217-60255a9cbee7', true, true)
-      identity.is_active.should be_true
+      expect(identity.is_active).to be_truthy
       identity.id_token.should be_nil # não mostra token pois não foi autenticado com a senha do usuário
     end
     it "should raise an error if no profiles exist with that uuid" do
@@ -175,7 +175,7 @@ describe PassaporteWeb::Identity do
     # REGRSSION
     it "should return the is_active and id_token fields" do
       identity = described_class.find_by_email('mobileteste269@mailinator.com', true, true)
-      identity.is_active.should be_true
+      expect(identity.is_active).to be_truthy
       identity.id_token.should be_nil # não mostra token pois não foi autenticado com a senha do usuário
     end
     it "should raise an error if no profiles exist with that email" do
@@ -205,12 +205,12 @@ describe PassaporteWeb::Identity do
       identity.email_list.count.should == 2
       # Primary e-mail
       identity.email_list[0]['address'].should == 'jaime.lannister@mailinator.com'
-      identity.email_list[0]['is_primary'].should be_true
-      identity.email_list[0]['is_active'].should be_true
+      expect(identity.email_list[0]['is_primary']).to be_truthy
+      expect(identity.email_list[0]['is_active']).to be_truthy
       # Secondary email
       identity.email_list[1]['address'].should == 'kingslayer@mailinator.com'
-      identity.email_list[1]['is_primary'].should be_false
-      identity.email_list[1]['is_active'].should be_true
+      expect(identity.email_list[1]['is_primary']).to be_falsy
+      expect(identity.email_list[1]['is_active']).to be_truthy
     end
     it "should raise an error if no profiles exist with that email" do
       expect {
@@ -231,11 +231,11 @@ describe PassaporteWeb::Identity do
     # REGRSSION
     it "should return the is_active and id_token fields" do
       identity = described_class.authenticate('mobileteste269@mailinator.com', 'vivalasvegas')
-      identity.is_active.should be_true
+      expect(identity.is_active).to be_truthy
       identity.id_token.should == '9864ec27fb4fd866f6fad5bc041d0363d0bc0fd2945858a1'
     end
     it "should return false if the password is wrong for the given email" do
-      described_class.authenticate('teste@teste.com', 'wrong password').should be_false
+      expect(described_class.authenticate('teste@teste.com', 'wrong password')).to be_falsy
     end
     it "should return false if no Identity exists on PassaporteWeb with that email" do
       described_class.authenticate('non_existing_email@teste.com', 'some password')
@@ -245,10 +245,10 @@ describe PassaporteWeb::Identity do
   describe "#authenticate", vcr: true do
     let(:identity) { described_class.find("5e32f927-c4ab-404e-a91c-b2abc05afb56") }
     it "should return true if the password is correct" do
-      identity.authenticate('123456').should be_true
+      expect(identity.authenticate('123456')).to be_truthy
     end
     it "should return false if the password is wrong" do
-      identity.authenticate('wrong password').should be_false
+      expect(identity.authenticate('wrong password')).to be_falsy
     end
     it "should raise an error if the email is not set" do
       identity.instance_variable_set(:@email, nil)
@@ -266,7 +266,7 @@ describe PassaporteWeb::Identity do
           identity.first_name.should == 'Testador'
           identity.should be_persisted
           identity.first_name = 'Testador 2'
-          identity.save.should be_true
+          expect(identity.save).to be_truthy
           identity.should be_persisted
           identity.first_name.should == 'Testador 2'
 
@@ -278,7 +278,7 @@ describe PassaporteWeb::Identity do
         it "should return false and set the errors hash" do
           identity.cpf = 42
           identity.should be_persisted
-          identity.save.should be_false
+          expect(identity.save).to be_falsy
           identity.should be_persisted
           identity.errors.should == {"cpf" => ["Certifique-se de que o valor tenha no mínimo 11 caracteres (ele possui 2)."]}
         end
@@ -298,7 +298,7 @@ describe PassaporteWeb::Identity do
           }
           identity = described_class.new(attributes)
           identity.should_not be_persisted
-          identity.save.should be_true
+          expect(identity.save).to be_truthy
           identity.should be_persisted
         end
         it "should save with all params" do
@@ -317,7 +317,7 @@ describe PassaporteWeb::Identity do
           }
           identity = described_class.new(attributes)
           identity.should_not be_persisted
-          identity.save.should be_true
+          expect(identity.save).to be_truthy
           identity.should be_persisted
         end
         # REGRESSION
@@ -332,9 +332,9 @@ describe PassaporteWeb::Identity do
             send_myfreecomm_news: true
           }
           identity = described_class.new(attributes)
-          mock_response = mock('response', code: 201, body: MultiJson.encode(attributes))
+          mock_response = double('response', code: 201, body: MultiJson.encode(attributes))
           PassaporteWeb::Http.should_receive(:post).with("/accounts/api/create/", attributes).and_return(mock_response)
-          identity.save.should be_true
+          expect(identity.save).to be_truthy
         end
       end
       context "on failure" do
@@ -347,7 +347,7 @@ describe PassaporteWeb::Identity do
           }
           identity = described_class.new(attributes)
           identity.should_not be_persisted
-          identity.save.should_not be_true
+          expect(identity.save).to_not be_truthy
           identity.should_not be_persisted
           identity.errors.should == {"password2"=>["Este campo é obrigatório."], "password"=>["Este campo é obrigatório."]}
         end

data/spec/passaporte_web/notification_spec.rb

@@ -55,7 +55,7 @@ describe PassaporteWeb::Notification do
 
         notifications = data.notifications
         notifications.size.should == 2
-        notifications.map { |n| n.instance_of?(described_class) }.uniq.should be_true
+        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"'
@@ -74,7 +74,7 @@ describe PassaporteWeb::Notification do
 
         notifications = data.notifications
         notifications.size.should == 1
-        notifications.map { |n| n.instance_of?(described_class) }.uniq.should be_true
+        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"
@@ -125,7 +125,7 @@ describe PassaporteWeb::Notification do
         it "should create the Notification on PassaporteWeb, authenticated as the user" do
           PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
           notification.should_not be_persisted
-          notification.save.should be_true # by default authenticates as the user
+          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
@@ -139,7 +139,7 @@ describe PassaporteWeb::Notification do
         end
         it "should create the Notification on PassaporteWeb, authenticated as the application" do
           notification.should_not be_persisted
-          notification.save('application').should be_true
+          expect(notification.save('application')).to be_truthy
           notification.should be_persisted
           notification.uuid.should_not be_nil
           notification.absolute_url.should_not be_nil
@@ -156,13 +156,13 @@ describe PassaporteWeb::Notification do
         it "should return false an do nothing if the Notification is already persisted" do
           PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
           notification = described_class.find_all(1,20,nil,true).notifications.last
-          notification.save.should be_false
+          expect(notification.save).to be_falsy
         end
         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
-          notification.save('user').should be_false
+          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."]}}
@@ -170,7 +170,7 @@ describe PassaporteWeb::Notification do
         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
-          notification.save('application').should be_false
+          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."]}}
@@ -187,7 +187,7 @@ describe PassaporteWeb::Notification do
     context "on success" do
       it "should mark the Notification as read" do
         notification.read_at.should be_nil
-        notification.read!.should be_true
+        expect(notification.read!).to be_truthy
         notification.read_at.should_not be_nil
       end
     end
@@ -195,7 +195,7 @@ describe PassaporteWeb::Notification 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
-        read_notification.read!.should be_false
+        expect(read_notification.read!).to be_falsy
         read_notification.errors.should == {message: 'notification already read'}
       end
     end
@@ -204,19 +204,19 @@ describe PassaporteWeb::Notification do
   describe "#destroy" 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
-      notification.destroy.should be_false
+      expect(notification.destroy).to be_falsy
       notification.errors.should == {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
-      notification.save('application').should be_true
+      expect(notification.save('application')).to be_truthy
       notification.read_at.should be_nil
       notification.scheduled_to.should == "2013-04-06 00:00:00"
-      notification.destroy.should be_true
+      expect(notification.destroy).to be_truthy
     end
     it "should not exclude non-scheduled notification", vcr: true do
       notification.scheduled_to = nil
-      notification.save('application').should be_true
-      notification.destroy.should be_false
+      expect(notification.save('application')).to be_truthy
+      expect(notification.destroy).to be_falsy
       notification.errors.should == "Only scheduled notifications can be deleted via API"
     end
   end