message_train 0.5.2 → 0.5.3

data/spec/helpers/message_train/attachment_helper_spec.rb

@@ -6,7 +6,12 @@ describe MessageTrain::AttachmentsHelper do
   describe '#attachment_icon' do
     context 'when attachment is an image' do
       subject { helper.attachment_icon(image_attachment) }
-      it { should have_tag :img, with: { src: image_attachment.attachment.url(:thumb) } }
+      it do
+        should have_tag(
+          :img,
+          with: { src: image_attachment.attachment.url(:thumb) }
+        )
+      end
     end
     context 'when attachment is a file' do
       subject { helper.attachment_icon(pdf_attachment) }
@@ -17,19 +22,29 @@ describe MessageTrain::AttachmentsHelper do
   describe '#attachment_link' do
     context 'when attachment is an image' do
       subject { helper.attachment_link(image_attachment) }
-      it { should have_tag :a, with: {
-                                 href: '#',
-                                 class: 'thumbnail',
-                                 'data-toggle' => 'modal',
-                                 'data-target' => '#attachment_preview',
-                                 'data-src' => image_attachment.attachment.url(:large),
-                                 'data-original' => image_attachment.attachment.url(:original),
-                                 'data-text' => 'Click for Original'
-                             } }
+      it do
+        should have_tag(
+          :a,
+          with: {
+            href: '#',
+            class: 'thumbnail',
+            'data-toggle' => 'modal',
+            'data-target' => '#attachment_preview',
+            'data-src' => image_attachment.attachment.url(:large),
+            'data-original' => image_attachment.attachment.url(:original),
+            'data-text' => 'Click for Original'
+          }
+        )
+      end
     end
     context 'when attachment is a file' do
       subject { helper.attachment_link(pdf_attachment) }
-      it { should have_tag :a, with: { href: pdf_attachment.attachment.url, class: 'thumbnail' } }
+      it do
+        should have_tag(
+          :a,
+          with: { href: pdf_attachment.attachment.url, class: 'thumbnail' }
+        )
+      end
     end
   end
-end
+end

data/spec/helpers/message_train/boxes_helper_spec.rb

@@ -47,4 +47,4 @@ describe MessageTrain::BoxesHelper do
     subject { helper.box_participant_name(first_user) }
     it { should eq 'First User' }
   end
-end
+end

data/spec/helpers/message_train/collectives_helper_spec.rb

@@ -17,16 +17,25 @@ describe MessageTrain::CollectivesHelper do
 
   describe '#collective_nav_item' do
     context 'when user is not allowed' do
-      subject { helper.collective_nav_item(first_group.box(:in, third_user), third_user) }
+      subject do
+        helper.collective_nav_item(first_group.box(:in, third_user), third_user)
+      end
       it { should be nil }
     end
     context 'when no messages are unread' do
-      subject { helper.collective_nav_item(first_group.box(:in, first_user), first_user) }
+      subject do
+        helper.collective_nav_item(first_group.box(:in, first_user), first_user)
+      end
       it { should have_tag 'li', text: /^First Group/ }
       it { should_not have_tag 'span', with: { class: 'badge' } }
     end
     context 'when there are unread messages' do
-      subject { helper.collective_nav_item(membered_group.box(:in, first_user), first_user) }
+      subject do
+        helper.collective_nav_item(
+          membered_group.box(:in, first_user),
+          first_user
+        )
+      end
       it { should have_tag 'li', text: /^Membered Group/ }
       it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
     end
@@ -34,12 +43,16 @@ describe MessageTrain::CollectivesHelper do
 
   describe '#collective_list_item' do
     context 'when user is a valid sender and box is sent' do
-      subject { helper.collective_list_item(first_group.box(:sent, first_user)) }
+      subject do
+        helper.collective_list_item(first_group.box(:sent, first_user))
+      end
       it { should have_tag 'li', text: /^Sent/ }
       it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
     end
     context 'when user is a valid recipient and box is in' do
-      subject { helper.collective_list_item(membered_group.box(:in, first_user)) }
+      subject do
+        helper.collective_list_item(membered_group.box(:in, first_user))
+      end
       it { should have_tag 'li', text: /^Inbox/ }
       it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
     end
@@ -48,18 +61,21 @@ describe MessageTrain::CollectivesHelper do
   describe '#collective_boxes_dropdown_list' do
     describe 'passed a regular user' do
       subject { helper.collective_boxes_dropdown_list(first_user) }
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 } # Groups and Roles
+      # Groups and Roles
+      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
       it { should have_tag 'li', text: /^First Group/ }
       it { should have_tag 'li', text: /^Membered Group/ }
     end
     describe 'passed an admin user' do
       subject { helper.collective_boxes_dropdown_list(admin_user) }
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 } # Groups and Roles
+      # Groups and Roles
+      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
       it { should have_tag 'li', text: /^Admin/ }
     end
     describe 'passed a superadmin user' do
       subject { helper.collective_boxes_dropdown_list(superadmin_user) }
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 } # Groups and Roles
+      # Groups and Roles
+      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
       it { should have_tag 'li', text: /^Admin/ }
     end
   end
@@ -73,4 +89,4 @@ describe MessageTrain::CollectivesHelper do
     subject { helper.collective_name(first_group) }
     it { should eq 'First Group' }
   end
-end
+end

data/spec/helpers/message_train/conversations_helper_spec.rb

@@ -24,55 +24,88 @@ describe MessageTrain::ConversationsHelper do
   describe '#conversation_class' do
     context 'when it is unread' do
       context 'in the inbox' do
-        subject { helper.conversation_class(first_user.box(:in), unread_conversation) }
-        it { should match /unread/ }
+        subject do
+          helper.conversation_class(first_user.box(:in), unread_conversation)
+        end
+        it { should match(/unread/) }
       end
       context 'in the ignored box' do
-        subject { helper.conversation_class(first_user.box(:ignored), unread_conversation) }
-        it { should match /hide/ }
+        subject do
+          helper.conversation_class(
+            first_user.box(:ignored),
+            unread_conversation
+          )
+        end
+        it { should match(/hide/) }
       end
     end
     context 'when it is read' do
-      subject { helper.conversation_class(first_user.box(:in), read_conversation) }
-      it { should match /read/ }
-      it { should_not match /unread/ }
+      subject do
+        helper.conversation_class(first_user.box(:in), read_conversation)
+      end
+      it { should match(/read/) }
+      it { should_not match(/unread/) }
     end
     context 'when it is a draft' do
-      subject { helper.conversation_class(first_user.box(:in), draft_conversation) }
-      it { should match /draft/ }
+      subject do
+        helper.conversation_class(first_user.box(:in), draft_conversation)
+      end
+      it { should match(/draft/) }
     end
     context 'when it is deleted' do
-      subject { helper.conversation_class(first_user.box(:in), deleted_conversation) }
-      it { should match /hide/ }
+      subject do
+        helper.conversation_class(first_user.box(:in), deleted_conversation)
+      end
+      it { should match(/hide/) }
     end
     context 'when it is trashed' do
       context 'in the inbox' do
-        subject { helper.conversation_class(first_user.box(:in), trashed_conversation) }
-        it { should match /hide/ }
+        subject do
+          helper.conversation_class(first_user.box(:in), trashed_conversation)
+        end
+        it { should match(/hide/) }
       end
       context 'in the trash box' do
-        subject { helper.conversation_class(first_user.box(:trash), trashed_conversation) }
-        it { should_not match /hide/ }
+        subject do
+          helper.conversation_class(
+            first_user.box(:trash),
+            trashed_conversation
+          )
+        end
+        it { should_not match(/hide/) }
       end
     end
     context 'when it is not trashed' do
       context 'in the inbox' do
-        subject { helper.conversation_class(first_user.box(:in), unread_conversation) }
-        it { should_not match /hide/ }
+        subject do
+          helper.conversation_class(first_user.box(:in), unread_conversation)
+        end
+        it { should_not match(/hide/) }
       end
       context 'in the trash box' do
-        subject { helper.conversation_class(first_user.box(:trash), unread_conversation) }
-        it { should match /hide/ }
+        subject do
+          helper.conversation_class(first_user.box(:trash), unread_conversation)
+        end
+        it { should match(/hide/) }
       end
     end
     context 'when it is ignored' do
       context 'in the ignored box' do
-        subject { helper.conversation_class(first_user.box(:ignored), ignored_conversation) }
-        it { should_not match /hide/ }
+        subject do
+          helper.conversation_class(
+            first_user.box(:ignored), ignored_conversation
+          )
+        end
+        it { should_not match(/hide/) }
       end
       context 'in the trash box' do
-        subject { helper.conversation_class(first_user.box(:trash), ignored_conversation) }
-        it { should match /hide/ }
+        subject do
+          helper.conversation_class(
+            first_user.box(:trash),
+            ignored_conversation
+          )
+        end
+        it { should match(/hide/) }
       end
     end
   end
@@ -84,13 +117,18 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.conversation_trashed_toggle(unread_conversation) }
-        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 conversation is all trashed' do
@@ -98,12 +136,17 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.conversation_trashed_toggle(trashed_conversation) }
-        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
@@ -112,27 +155,43 @@ describe MessageTrain::ConversationsHelper do
         before do
           assign(:box, membered_group.box(:in, first_user))
         end
-        subject { helper.conversation_trashed_toggle(membered_group_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Trashed',
-                                   'data-confirm' => 'Are you sure?',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.conversation_trashed_toggle(membered_group_conversation)
+        end
+        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 conversation is all trashed' do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
-        subject { helper.conversation_trashed_toggle(membered_group_trashed_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Untrashed',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.conversation_trashed_toggle(
+            membered_group_trashed_conversation
+          )
+        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
@@ -145,12 +204,17 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.conversation_read_toggle(unread_conversation) }
-        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 conversation is all read' do
@@ -158,12 +222,17 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.conversation_read_toggle(read_conversation) }
-        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
@@ -173,25 +242,37 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, membered_group.box(:in, first_user))
         end
         subject { helper.conversation_read_toggle(membered_group_conversation) }
-        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 conversation is all read' do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
-        subject { helper.conversation_read_toggle(membered_group_read_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Unread',
-                                   'data-method' => 'put',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.conversation_read_toggle(membered_group_read_conversation)
+        end
+        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
@@ -204,13 +285,18 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.conversation_ignored_toggle(unread_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Ignored',
-                                   'data-confirm' => 'Are you sure?',
-                                   'data-method' => 'delete',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Ignored',
+              'data-confirm' => 'Are you sure?',
+              'data-method' => 'delete',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-volume-off' }) }
       end
       context 'when the conversation is all ignored' do
@@ -218,12 +304,17 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.conversation_ignored_toggle(ignored_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Unignored',
-                                   'data-method' => 'delete',
-                                   'data-remote' => 'true'
-                               }) }
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Unignored',
+              'data-method' => 'delete',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-volume-up' }) }
       end
     end
@@ -232,27 +323,43 @@ describe MessageTrain::ConversationsHelper do
         before do
           assign(:box, membered_group.box(:in, first_user))
         end
-        subject { helper.conversation_ignored_toggle(membered_group_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Ignored',
-                                   'data-confirm' => 'Are you sure?',
-                                   'data-method' => 'delete',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.conversation_ignored_toggle(membered_group_conversation)
+        end
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Ignored',
+              'data-confirm' => 'Are you sure?',
+              'data-method' => 'delete',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-volume-off' }) }
       end
       context 'when the conversation is all ignored' do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
-        subject { helper.conversation_ignored_toggle(membered_group_ignored_conversation) }
-        it { should have_tag(:a, with: {
-                                   'rel' => 'nofollow',
-                                   'title' => 'Mark as Unignored',
-                                   'data-method' => 'delete',
-                                   'data-remote' => 'true'
-                               }) }
+        subject do
+          helper.conversation_ignored_toggle(
+            membered_group_ignored_conversation
+          )
+        end
+        it do
+          should have_tag(
+            :a,
+            with: {
+              'rel' => 'nofollow',
+              'title' => 'Mark as Unignored',
+              'data-method' => 'delete',
+              'data-remote' => 'true'
+            }
+          )
+        end
         it { should have_tag(:span, with: { class: 'glyphicon-volume-up' }) }
       end
     end
@@ -265,13 +372,18 @@ describe MessageTrain::ConversationsHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.conversation_deleted_toggle(unread_conversation) }
-        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
@@ -280,16 +392,23 @@ describe MessageTrain::ConversationsHelper do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
-        subject { helper.conversation_deleted_toggle(membered_group_conversation) }
-        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'
-                               }) }
+        subject do
+          helper.conversation_deleted_toggle(membered_group_conversation)
+        end
+        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
   end
-end
+end