mailboxer 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfe237459d6d5d336aa8a577c1919e2f061bfee
-  data.tar.gz: 9690a641bffbf574024f20559e6fb80008f58344
+  metadata.gz: 4d3dc85202d707157141672e526db6f126cd6969
+  data.tar.gz: dcfd20e099d3355a6c3f0ccc8cc7817ff05262b4
 SHA512:
-  metadata.gz: 9f1f3336341d9f656f9e788fa25bdb2bb7095fbb20a9cba2471ba9e1f0907b6012390c4e3f3a934d3398b28c3f73a60c9f60d78dd5a54fa30a0de20ddeaedc99
-  data.tar.gz: b7f0d86046631dff40628d2e29c349f84e1136a43eb5ab5ee861ce0e8bfde6b6ebd739f192c49fb5824c100c9349d2c47499288359af12299a805061dae90ca4
+  metadata.gz: 339eb28db3520ce5fd59ba8898358aecd98afbd98d644dfeb1f09e4f9f0a7052e6168e5cf492e79c7ffb1bd9849daaaec68faf3a35cbcdfa36ff6f3b15862d8d
+  data.tar.gz: d8dabb5d52bc1a7f108e96d00e7eb4ee2f62b1d93b630660f8461d733ec384591fa853277d0810efccd3763e5466533377fc1c3d1bb5bd21d33bf501f1a68ed7

data/.travis.yml

@@ -1,12 +1,24 @@
 language: ruby
+cache: bundler
+sudo: false
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
+  - 2.1.4
+
+matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails4.1.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails4.1.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails4.1.gemfile
+
 gemfile:
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.0.gemfile
   - gemfiles/rails4.1.gemfile
+  - gemfiles/rails4.2.gemfile
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/app/models/mailboxer/receipt.rb

@@ -72,19 +72,12 @@ class Mailboxer::Receipt < ActiveRecord::Base
       update_receipts({:mailbox_type => :sentbox, :trashed => false}, options)
     end
 
-    #This methods helps to do a update_all with table joins, not currently supported by rails.
-    #According to the github ticket https://github.com/rails/rails/issues/522 it should be
-    #supported with 3.2.
-    def update_receipts(updates,options={})
+    def update_receipts(updates, options={})
       ids = where(options).map { |rcp| rcp.id }
       unless ids.empty?
-        conditions = [""].concat(ids)
-        condition = "id = ? "
-        ids.drop(1).each do
-          condition << "OR id = ? "
-        end
-        conditions[0] = condition
-        Mailboxer::Receipt.except(:where).except(:joins).where(conditions).update_all(updates)
+        sql = ids.map { "#{table_name}.id = ? " }.join(' OR ')
+        conditions = [sql].concat(ids)
+        Mailboxer::Receipt.where(conditions).update_all(updates)
       end
     end
   end

data/gemfiles/rails4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec path: "../"

data/lib/generators/mailboxer/views_generator.rb

@@ -3,7 +3,7 @@ class Mailboxer::ViewsGenerator < Rails::Generators::Base
 
   desc "Copy Mailboxer views into your app"
   def copy_views
-    directory('message_mailer', 'app/views/message_mailer')
-    directory('notification_mailer', 'app/views/notification_mailer')
+    directory('message_mailer', 'app/views/mailboxer/message_mailer')
+    directory('notification_mailer', 'app/views/mailboxer/notification_mailer')
   end
 end

data/lib/mailboxer/mail_dispatcher.rb

@@ -40,9 +40,9 @@ module Mailboxer
       if Mailboxer.custom_deliver_proc
         Mailboxer.custom_deliver_proc.call(mailer, mailable, recipient)
       else
-        mailer.send_email(mailable, recipient).deliver
+        email = mailer.send_email(mailable, recipient)
+        email.respond_to?(:deliver_now) ? email.deliver_now : email.deliver
       end
     end
-
   end
 end

data/lib/mailboxer/version.rb

@@ -1,3 +1,3 @@
 module Mailboxer
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

data/mailboxer.gemspec

@@ -33,7 +33,9 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'racc'
   end
   # Specs
-  s.add_development_dependency 'rspec-rails', '~> 2.99'
+  s.add_development_dependency 'rspec-rails', '~> 3.0'
+  s.add_development_dependency 'rspec-its', '~> 1.1'
+  s.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
   s.add_development_dependency('appraisal', '~> 1.0.0')
   s.add_development_dependency('shoulda-matchers')
   # Fixtures

data/spec/dummy/config/application.rb

@@ -7,6 +7,9 @@ require "mailboxer"
 
 module Dummy
   class Application < Rails::Application
+    def rails_more_than_4_2?
+      Gem::Version.new(Rails.version) >= Gem::Version.new('4.2.0')
+    end
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -37,6 +40,8 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    config.active_record.raise_in_transactional_callbacks = true if rails_more_than_4_2?
+
   end
 end
 

data/spec/integration/message_and_receipt_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Messages And Mailboxer::Receipts" do
+describe "Messages And Mailboxer::Receipts", type: :integration do
 
   describe "two equal entities" do
     before do
@@ -16,8 +16,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message1.sender.id.should == @entity1.id
-        @message1.sender.class.should == @entity1.class
+        expect(@message1.sender.id).to eq @entity1.id
+        expect(@message1.sender.class).to eq @entity1.class
         assert @message1.body.eql?"Body"
         assert @message1.subject.eql?"Subject"
       end
@@ -27,25 +27,25 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message1.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
     end
@@ -59,10 +59,10 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
-        @message2.body.should eq "Reply body"
-        @message2.subject.should eq "Subject"
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
+        expect(@message2.body).to eq "Reply body"
+        expect(@message2.subject).to eq "Subject"
       end
 
       it "should create proper mails" do
@@ -70,29 +70,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -105,8 +105,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -116,29 +116,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
     describe "message replying to conversation" do
@@ -150,8 +150,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -161,29 +161,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
   end
@@ -202,8 +202,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message1.sender.id.should == @entity1.id
-        @message1.sender.class.should == @entity1.class
+        expect(@message1.sender.id).to eq @entity1.id
+        expect(@message1.sender.class).to eq @entity1.class
         assert @message1.body.eql?"Body"
         assert @message1.subject.eql?"Subject"
       end
@@ -213,25 +213,25 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message1.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
     end
@@ -245,8 +245,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -256,29 +256,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -291,8 +291,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -302,29 +302,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
     describe "message replying to conversation (TODO)" do
@@ -368,8 +368,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message1.sender.id.should == @entity1.id
-        @message1.sender.class.should == @entity1.class
+        expect(@message1.sender.id).to eq @entity1.id
+        expect(@message1.sender.class).to eq @entity1.class
         assert @message1.body.eql?"Body"
         assert @message1.subject.eql?"Subject"
       end
@@ -379,28 +379,28 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mails
         @recipients.each do |receiver|
           mail = Mailboxer::Receipt.recipient(receiver).notification(@message1).first
           assert mail
           if mail
-            mail.is_read.should==false
-            mail.trashed.should==false
-            mail.mailbox_type.should=="inbox"
+            expect(mail.is_read).to be false
+            expect(mail.trashed).to be false
+            expect(mail.mailbox_type).to eq "inbox"
           end
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message1.recipients
-        recipients.count.should==3
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==1
+        expect(recipients.count).to eq 3
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 1
       end
 
     end
@@ -414,8 +414,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -425,17 +425,17 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
 
         #No Receiver, No Mail
@@ -446,14 +446,14 @@ describe "Messages And Mailboxer::Receipts" do
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==0
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 0
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -470,8 +470,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -481,32 +481,32 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mails
         @recipients2.each do |receiver|
           mail = Mailboxer::Receipt.recipient(receiver).notification(@message2).first
           assert mail
           if mail
-            mail.is_read.should==false
-            mail.trashed.should==false
-            mail.mailbox_type.should=="inbox"
+            expect(mail.is_read).to be false
+            expect(mail.trashed).to be false
+            expect(mail.mailbox_type).to eq "inbox"
           end
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==3
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==1
+        expect(recipients.count).to eq 3
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
     describe "message replying to conversation (TODO)" do
@@ -550,8 +550,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message1.sender.id.should == @entity1.id
-        @message1.sender.class.should == @entity1.class
+        expect(@message1.sender.id).to eq @entity1.id
+        expect(@message1.sender.class).to eq @entity1.class
         assert @message1.body.eql?"Body"
         assert @message1.subject.eql?"Subject"
       end
@@ -561,28 +561,28 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mails
         @recipients.each do |receiver|
           mail = Mailboxer::Receipt.recipient(receiver).notification(@message1).first
           assert mail
           if mail
-            mail.is_read.should==false
-            mail.trashed.should==false
-            mail.mailbox_type.should=="inbox"
+            expect(mail.is_read).to be false
+            expect(mail.trashed).to be false
+            expect(mail.mailbox_type).to eq "inbox"
           end
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message1.recipients
-        recipients.count.should==3
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==1
+        expect(recipients.count).to eq 3
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 1
       end
 
     end
@@ -596,8 +596,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -607,17 +607,17 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
 
         #No Receiver, No Mail
@@ -628,14 +628,14 @@ describe "Messages And Mailboxer::Receipts" do
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==0
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 0
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -652,8 +652,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -663,32 +663,32 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mails
         @recipients2.each do |receiver|
           mail = Mailboxer::Receipt.recipient(receiver).notification(@message2).first
           assert mail
           if mail
-            mail.is_read.should==false
-            mail.trashed.should==false
-            mail.mailbox_type.should=="inbox"
+            expect(mail.is_read).to be false
+            expect(mail.trashed).to be false
+            expect(mail.mailbox_type).to eq "inbox"
           end
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==3
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
-        recipients.count(@entity3).should==1
+        expect(recipients.count).to eq 3
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
+        expect(recipients.count(@entity3)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -729,8 +729,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message1.sender.id.should == @entity1.id
-        @message1.sender.class.should == @entity1.class
+        expect(@message1.sender.id).to eq @entity1.id
+        expect(@message1.sender.class).to eq @entity1.class
         assert @message1.body.eql?"Body"
         assert @message1.subject.eql?"Subject"
       end
@@ -740,25 +740,25 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message1).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message1.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
     end
@@ -772,8 +772,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -783,29 +783,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
 
@@ -818,8 +818,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -829,29 +829,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
     describe "message replying to conversation" do
@@ -863,8 +863,8 @@ describe "Messages And Mailboxer::Receipts" do
       end
 
       it "should create proper message" do
-        @message2.sender.id.should == @entity2.id
-        @message2.sender.class.should == @entity2.class
+        expect(@message2.sender.id).to eq @entity2.id
+        expect(@message2.sender.class).to eq @entity2.class
         assert @message2.body.eql?"Reply body"
         assert @message2.subject.eql?"Subject"
       end
@@ -874,29 +874,29 @@ describe "Messages And Mailboxer::Receipts" do
         mail = Mailboxer::Receipt.recipient(@entity2).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==true
-          mail.trashed.should==false
-          mail.mailbox_type.should=="sentbox"
+          expect(mail.is_read).to be true
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "sentbox"
         end
         #Receiver Mail
         mail = Mailboxer::Receipt.recipient(@entity1).notification(@message2).first
         assert mail
         if mail
-          mail.is_read.should==false
-          mail.trashed.should==false
-          mail.mailbox_type.should=="inbox"
+          expect(mail.is_read).to be false
+          expect(mail.trashed).to be false
+          expect(mail.mailbox_type).to eq "inbox"
         end
       end
 
       it "should have the correct recipients" do
         recipients = @message2.recipients
-        recipients.count.should==2
-        recipients.count(@entity1).should==1
-        recipients.count(@entity2).should==1
+        expect(recipients.count).to eq 2
+        expect(recipients.count(@entity1)).to eq 1
+        expect(recipients.count(@entity2)).to eq 1
       end
 
       it "should be associated to the same conversation" do
-        @message1.conversation.id.should==@message2.conversation.id
+        expect(@message1.conversation.id).to eq @message2.conversation.id
       end
     end
   end