message_train 0.5.2 → 0.5.3

data/spec/helpers/message_train/messages_helper_spec.rb

@@ -13,41 +13,45 @@ describe MessageTrain::MessagesHelper do
   describe '#messages_class' do
     context 'when it is unread' do
       subject { helper.message_class(first_user.box(:in), unread_message) }
-      it { should match /unread/ }
+      it { should match(/unread/) }
     end
     context 'when it is read' do
       subject { helper.message_class(first_user.box(:in), read_message) }
-      it { should match /read/ }
-      it { should_not match /unread/ }
+      it { should match(/read/) }
+      it { should_not match(/unread/) }
     end
     context 'when it is a draft' do
       subject { helper.message_class(first_user.box(:in), draft_message) }
-      it { should match /draft/ }
+      it { should match(/draft/) }
     end
     context 'when it is trashed' do
       context 'in the inbox' do
         subject { helper.message_class(first_user.box(:in), trashed_message) }
-        it { should match /hide/ }
+        it { should match(/hide/) }
       end
       context 'in the trash box' do
-        subject { helper.message_class(first_user.box(:trash), trashed_message) }
-        it { should_not match /hide/ }
+        subject do
+          helper.message_class(first_user.box(:trash), trashed_message)
+        end
+        it { should_not match(/hide/) }
       end
     end
     context 'when it is not trashed' do
       context 'in the inbox' do
         subject { helper.message_class(first_user.box(:in), unread_message) }
-        it { should_not match /hide/ }
+        it { should_not match(/hide/) }
       end
       context 'in the trash box' do
         subject { helper.message_class(first_user.box(:trash), unread_message) }
-        it { should match /hide/ }
+        it { should match(/hide/) }
       end
     end
     context 'when it is ignored' do
       context 'in the trash box' do
-        subject { helper.message_class(first_user.box(:trash), ignored_message) }
-        it { should match /hide/ }
+        subject do
+          helper.message_class(first_user.box(:trash), ignored_message)
+        end
+        it { should match(/hide/) }
       end
     end
   end
@@ -59,13 +63,18 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.message_trashed_toggle(unread_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Trashed',
-                                   'data-confirm' => 'Are you sure?',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Trashed',
+              'data-confirm' => 'Are you sure?',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
       end
       context 'when the message is trashed' do
@@ -73,12 +82,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_trashed_toggle(trashed_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Untrashed',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Untrashed',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
       end
     end
@@ -88,26 +102,38 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:in, first_user))
         end
         subject { helper.message_trashed_toggle(membered_group_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Trashed',
-                                   'data-confirm' => 'Are you sure?',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Trashed',
+              'data-confirm' => 'Are you sure?',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
       end
       context 'when the message is trashed' do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
-        subject { helper.message_trashed_toggle(membered_group_trashed_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Untrashed',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.message_trashed_toggle(membered_group_trashed_message)
+        end
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Untrashed',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
       end
     end
@@ -120,12 +146,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.message_read_toggle(unread_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Read',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Read',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
       end
       context 'when the message is read' do
@@ -133,12 +164,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_read_toggle(read_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Unread',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Unread',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
       end
     end
@@ -148,12 +184,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:in, first_user))
         end
         subject { helper.message_read_toggle(membered_group_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Read',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Read',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
       end
       context 'when the message is read' do
@@ -161,12 +202,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:trash, first_user))
         end
         subject { helper.message_read_toggle(membered_group_read_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Unread',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Unread',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
       end
     end
@@ -179,13 +225,18 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_deleted_toggle(unread_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Deleted',
-                                   'data-confirm' => 'Delete forever? This cannot be undone.',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Deleted',
+              'data-confirm' => 'Delete forever? This cannot be undone.',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
       end
     end
@@ -195,13 +246,18 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:trash, first_user))
         end
         subject { helper.message_deleted_toggle(membered_group_message) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Deleted',
-                                   'data-confirm' => 'Delete forever? This cannot be undone.',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Deleted',
+              'data-confirm' => 'Delete forever? This cannot be undone.',
+              'data-method' => 'put',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
       end
     end
@@ -209,9 +265,9 @@ describe MessageTrain::MessagesHelper do
 
   describe '#message_recipients' do
     subject { helper.message_recipients(to_many_message) }
-    it { should match /^([^\,]+\,){2} and ([^\,]+)$/ }
-    it { should match /Second User/ }
-    it { should match /Third User/ }
-    it { should match /Fourth User/ }
+    it { should match(/^([^\,]+\,){2} and ([^\,]+)$/) }
+    it { should match(/Second User/) }
+    it { should match(/Third User/) }
+    it { should match(/Fourth User/) }
   end
-end
+end

data/spec/message_train_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "MessageTrain" do
+describe 'MessageTrain' do
   it 'should return correct version string' do
-    MessageTrain.version_string.should == "MessageTrain version #{MessageTrain::VERSION}"
+    MessageTrain.version_string
+                .should == "MessageTrain version #{MessageTrain::VERSION}"
   end
 end

data/spec/models/group_spec.rb

@@ -1,17 +1,16 @@
 require 'rails_helper'
 
 RSpec.describe Group do
+  include_context 'loaded site'
+
   describe 'Model' do
     # MessageTrain Gem, and Rolify Gem by extension
     it { should have_many(:roles) }
-    
     # MessageTrain Gem
     it { should have_many(:receipts) }
   end
 
   describe 'Scopes and Methods from Message Train' do
-    include_context 'loaded site'
-
     describe '#slug_part' do
       subject { membered_group.slug_part }
       it { should eq 'membered-group' }
@@ -75,7 +74,9 @@ RSpec.describe Group do
 
     describe '#boxes_for_participant' do
       context 'when participant is a valid sender' do
-        subject { membered_group.boxes_for_participant(second_user).collect { |x| x.division } }
+        subject do
+          membered_group.boxes_for_participant(second_user).collect(&:division)
+        end
         it { should_not include :in }
         it { should include :sent }
         it { should include :drafts }
@@ -84,7 +85,9 @@ RSpec.describe Group do
         it { should_not include :ignored }
       end
       context 'when participant is a valid recipient' do
-        subject { membered_group.boxes_for_participant(first_user).collect { |x| x.division } }
+        subject do
+          membered_group.boxes_for_participant(first_user).collect(&:division)
+        end
         it { should include :in }
         it { should_not include :sent }
         it { should_not include :drafts }
@@ -100,7 +103,8 @@ RSpec.describe Group do
         its(:first) { should be_a MessageTrain::Conversation }
         it { should_not include unread_conversation }
         it { should include membered_group_conversation }
-        it { should_not include membered_group_draft } # Because received_through not set on sender receipts
+        # Because received_through not set on sender receipts
+        it { should_not include membered_group_draft }
       end
       context 'when participant is a valid recipient' do
         subject { membered_group.all_conversations(first_user) }
@@ -117,7 +121,8 @@ RSpec.describe Group do
         its(:first) { should be_a MessageTrain::Message }
         it { should_not include unread_message }
         it { should include membered_group_message }
-        it { should_not include membered_group_draft.messages.first } # Because received_through not set on sender receipts
+        # Because received_through not set on sender receipts
+        it { should_not include membered_group_draft.messages.first }
       end
       context 'when participant is a valid recipient' do
         subject { membered_group.all_messages(first_user) }
@@ -127,7 +132,5 @@ RSpec.describe Group do
         it { should_not include membered_group_draft.messages.first }
       end
     end
-
   end
-
 end

data/spec/models/message_train/attachment_spec.rb

@@ -8,36 +8,39 @@ module MessageTrain
       it { should belong_to :message }
       it { should have_attached_file :attachment }
       it { should validate_attachment_presence :attachment }
-      it { should validate_attachment_content_type(:attachment).allowing(
-                                                       'application/pdf',
-                                                       'application/vnd.ms-excel',
-                                                       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                                                       'application/msword',
-                                                       'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                                                       'application/rtf',
-                                                       'text/plain',
-                                                       'image/bmp',
-                                                       'image/gif',
-                                                       'image/jpeg',
-                                                       'image/pjpeg',
-                                                       'image/png',
-                                                       'image/x-png',
-                                                       'application/bmp',
-                                                       'application/gif',
-                                                       'application/jpeg',
-                                                       'application/pjpeg',
-                                                       'application/png',
-                                                       'application/x-png',
-                                                       'x-application/bmp',
-                                                       'x-application/gif',
-                                                       'x-application/jpeg',
-                                                       'x-application/pjpeg',
-                                                       'x-application/png',
-                                                       'x-application/x-png'
-                                                  ).rejecting(
-                                                       'image/tiff',
-                                                       'image/svg'
-                                                  ) }
+      it do
+        should validate_attachment_content_type(:attachment).allowing(
+          'application/pdf',
+          'application/vnd.ms-excel',
+          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+          'application/msword',
+          'application/vnd.openxmlformats-officedocument.wordprocessingml.'\
+            'document',
+          'application/rtf',
+          'text/plain',
+          'image/bmp',
+          'image/gif',
+          'image/jpeg',
+          'image/pjpeg',
+          'image/png',
+          'image/x-png',
+          'application/bmp',
+          'application/gif',
+          'application/jpeg',
+          'application/pjpeg',
+          'application/png',
+          'application/x-png',
+          'x-application/bmp',
+          'x-application/gif',
+          'x-application/jpeg',
+          'x-application/pjpeg',
+          'x-application/png',
+          'x-application/x-png'
+        ).rejecting(
+          'image/tiff',
+          'image/svg'
+        )
+      end
     end
     describe 'Scopes and Methods' do
       describe '#image?' do