message_train 0.7.5 → 1.0.0

data/spec/features/messages_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 RSpec.feature 'Messages' do
   include_context 'loaded site'
 
-  it_behaves_like 'an authenticated section', '/box/in/messages/new'
+  it_behaves_like 'an authenticated section', '/messages/box/in/messages/new'
 
   describe 'When logged in' do
     before do
@@ -11,10 +11,10 @@ RSpec.feature 'Messages' do
     describe 'Drafting', js: true do
       describe 'at /box/in/messages' do
         before do
-          visit '/box/in/messages/new/'
+          visit '/messages/box/in/messages/new/'
           fill_in_autocomplete 'Recipients', with: 'x'
           fill_in 'Subject', with: 'This is a draft.'
-          fill_in_ckeditor 'Body', with: 'This is the body.'
+          fill_in 'Body', with: 'This is the body.'
           submit_via_button 'Send'
           wait_until { page.has_css? '.alert' }
         end
@@ -28,28 +28,28 @@ RSpec.feature 'Messages' do
     describe 'Composing', js: true do
       describe 'at /box/in/messages' do
         before do
-          visit '/box/in/messages/new/'
+          visit '/messages/box/in/messages/new/'
           fill_in_autocomplete 'Recipients', with: 'sec'
           fill_in 'Subject', with: 'This is the subject.'
-          fill_in_ckeditor 'Body', with: 'This is the body.'
-          click_link 'add-attachment'
-          click_link 'add-attachment'
-          click_link 'add-attachment'
-          within '#attachments .nested-fields:nth-child(1)' do
+          fill_in 'Body', with: 'This is the body.'
+          click_button 'add-attachment'
+          click_button 'add-attachment'
+          click_button 'add-attachment'
+          within '#attachments .message-train-attachment-fields:nth-child(1)' do
             attach_file 'Attachment', File.absolute_path(
               './spec/dummy/app/assets/files/message_train/attachments/'\
                 'example.pdf'
             )
           end
-          within '#attachments .nested-fields:nth-child(2)' do
+          within '#attachments .message-train-attachment-fields:nth-child(2)' do
             attach_file 'Attachment', File.absolute_path(
               './spec/dummy/app/assets/files/message_train/attachments/'\
                 'Bambisj.jpg'
             )
           end
-          within '#attachments .nested-fields:nth-child(3)' do
+          within '#attachments .message-train-attachment-fields:nth-child(3)' do
             accept_confirm do
-              find('.remove_fields').click
+              find('button').click
             end
           end
           submit_via_button 'Send'
@@ -65,19 +65,19 @@ RSpec.feature 'Messages' do
     describe 'Editing a Draft', js: true do
       describe 'at /box/in/messages' do
         before do
-          visit "/box/in/conversations/#{draft_conversation.id}"
+          visit "/messages/box/in/conversations/#{draft_conversation.id}"
           fill_in_autocomplete 'Recipients', with: 'sec'
           fill_in 'Subject', with: 'This is the subject.'
-          fill_in_ckeditor 'Body', with: 'This is the body.'
+          fill_in 'Body', with: 'This is the body.'
           submit_via_button 'Send'
           wait_until { page.has_css?('.alert') }
         end
-        it_behaves_like(
-          'a bootstrap page with an alert',
-          'info',
-          'Message sent.'
-        )
-        it_behaves_like 'a bootstrap page without an alert', 'warning'
+        it 'shows a sent alert and no draft-saved alert' do
+          expect(page).to have_selector(
+            '#alert_area .alert.info', text: 'Message sent.'
+          )
+          expect(page).not_to have_selector('#alert_area .alert.warning')
+        end
       end
     end
   end

data/spec/features/unsubscribes_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 RSpec.feature 'Unsubscribes' do
   include_context 'loaded site'
 
-  it_behaves_like 'an authenticated section', '/unsubscribes'
+  it_behaves_like 'an authenticated section', '/messages/unsubscribes'
 
   describe 'When logged in' do
     before do
@@ -11,7 +11,7 @@ RSpec.feature 'Unsubscribes' do
     describe 'Index' do
       describe 'at /unsubscribes' do
         before do
-          visit '/unsubscribes'
+          visit '/messages/unsubscribes'
         end
         it_behaves_like(
           'a bootstrap page',
@@ -27,7 +27,7 @@ RSpec.feature 'Unsubscribes' do
       describe 'at /unsubscribes' do
         describe 'with a specific item' do
           before do
-            visit '/unsubscribes'
+            visit '/messages/unsubscribes'
             find("#unsubscribe-group-#{membered_group.id}").click
           end
           it_behaves_like(
@@ -40,8 +40,8 @@ RSpec.feature 'Unsubscribes' do
         end
         describe 'with all button' do
           before do
-            visit '/unsubscribes'
-            click_link 'Disable All Notifications'
+            visit '/messages/unsubscribes'
+            click_button 'Disable All Notifications'
           end
           it_behaves_like(
             'a bootstrap page with an alert',
@@ -56,7 +56,7 @@ RSpec.feature 'Unsubscribes' do
     describe 'Removing an Unsubscribe' do
       describe 'at /unsubscribes' do
         before do
-          visit '/unsubscribes'
+          visit '/messages/unsubscribes'
           find("#remove-unsubscribe-#{unsubscribed_group.id}").click
         end
         it_behaves_like(
@@ -69,9 +69,9 @@ RSpec.feature 'Unsubscribes' do
       end
       describe 'with all button' do
         before do
-          visit '/unsubscribes'
-          click_link 'Disable All Notifications'
-          click_link 'Enable Some Notifications'
+          visit '/messages/unsubscribes'
+          click_button 'Disable All Notifications'
+          click_button 'Enable Some Notifications'
         end
         it_behaves_like(
           'a bootstrap page with an alert',

data/spec/helpers/message_train/application_helper_spec.rb

@@ -7,57 +7,55 @@ describe MessageTrain::ApplicationHelper do
   before do
     view.extend MessageTrain::BoxesHelper
     view.extend MessageTrain::CollectivesHelper
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
     login_user first_user
   end
 
   describe '#message_train_widget' do
     context 'when @collective is nil' do
       before do
-        helper.stub(:controller_name) { 'boxes' }
+        allow(helper).to receive(:controller_name) { 'boxes' }
         assign(:collective, nil)
         assign(:box_user, first_user)
-        helper.message_train_widget
       end
-      subject { helper.render_widgets }
-      it { should have_tag 'h3', text: /Messages/ }
-      it { should have_tag 'ul', with: { class: 'list-group' } }
-      it { should have_tag 'li', with: { class: 'list-group-item' }, count: 6 }
+      subject { helper.message_train_widget }
+      it { is_expected.to have_tag 'h3', text: /Messages/ }
+      it { is_expected.to have_tag 'ul', with: { class: 'message-train-list-group' } }
+      it { is_expected.to have_tag 'li', with: { class: 'message-train-list-group-item' }, count: 6 }
     end
     context 'when @collective is set' do
       before do
-        helper.stub(:controller_name) { 'boxes' }
+        allow(helper).to receive(:controller_name) { 'boxes' }
         assign(:collective, membered_group)
         assign(:box_user, first_user)
-        helper.message_train_widget
       end
-      subject { helper.render_widgets }
-      it { should have_tag 'h3', text: /Membered Group Messages/ }
-      it { should have_tag 'ul', with: { class: 'list-group' } }
-      it { should have_tag 'li', with: { class: 'list-group-item' }, count: 4 }
+      subject { helper.message_train_widget }
+      it { is_expected.to have_tag 'h3', text: /Membered Group Messages/ }
+      it { is_expected.to have_tag 'ul', with: { class: 'message-train-list-group' } }
+      it { is_expected.to have_tag 'li', with: { class: 'message-train-list-group-item' }, count: 4 }
     end
   end
 
   describe '#fuzzy_date' do
     context 'when less than a minute ago' do
       subject { helper.fuzzy_date(30.seconds.ago) }
-      it { should eq 'Just Now' }
+      it { is_expected.to eq 'Just Now' }
     end
     context 'when less than an day ago' do
       subject { helper.fuzzy_date(2.hours.ago) }
-      it { should eq 2.hours.ago.strftime('%l:%M %p') }
+      it { is_expected.to eq 2.hours.ago.strftime('%l:%M %p') }
     end
     context 'when less than a week ago' do
       subject { helper.fuzzy_date(2.days.ago) }
-      it { should eq 2.days.ago.strftime('%a %l:%M %p') }
+      it { is_expected.to eq 2.days.ago.strftime('%a %l:%M %p') }
     end
     context 'when less than a year ago' do
       subject { helper.fuzzy_date(2.months.ago) }
-      it { should eq 2.months.ago.strftime('%b %-d') }
+      it { is_expected.to eq 2.months.ago.strftime('%b %-d') }
     end
     context 'when more than a year ago' do
       subject { helper.fuzzy_date(2.years.ago) }
-      it { should eq 2.years.ago.strftime('%b %-d, %Y') }
+      it { is_expected.to eq 2.years.ago.strftime('%b %-d, %Y') }
     end
   end
 end

data/spec/helpers/message_train/attachment_helper_spec.rb

@@ -4,22 +4,18 @@ describe MessageTrain::AttachmentsHelper do
   include_context 'loaded site'
 
   before do
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
   end
 
   describe '#attachment_icon' do
     context 'when attachment is an image' do
       subject { helper.attachment_icon(image_attachment) }
-      it do
-        should have_tag(
-          :img,
-          with: { src: image_attachment.attachment.url(:thumb) }
-        )
-      end
+      it { is_expected.to have_tag(:img) }
     end
     context 'when attachment is a file' do
       subject { helper.attachment_icon(pdf_attachment) }
-      it { should have_tag :span, with: { class: 'glyphicon-save-file' } }
+      it { is_expected.to have_tag :span, with: { class: 'message-train-icon' } }
+      it { is_expected.to match(pdf_attachment.attachment.filename.to_s) }
     end
   end
 
@@ -27,16 +23,13 @@ describe MessageTrain::AttachmentsHelper do
     context 'when attachment is an image' do
       subject { helper.attachment_link(image_attachment) }
       it do
-        should have_tag(
+        is_expected.to 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'
+            'data-controller' => 'message-train--lightbox',
+            'data-lightbox-dialog-id' => 'attachment_preview'
           }
         )
       end
@@ -44,10 +37,7 @@ describe MessageTrain::AttachmentsHelper do
     context 'when attachment is a file' do
       subject { helper.attachment_link(pdf_attachment) }
       it do
-        should have_tag(
-          :a,
-          with: { href: pdf_attachment.attachment.url, class: 'thumbnail' }
-        )
+        is_expected.to have_tag(:a, with: { class: 'thumbnail' })
       end
     end
   end

data/spec/helpers/message_train/boxes_helper_spec.rb

@@ -5,32 +5,32 @@ describe MessageTrain::BoxesHelper do
   include ControllerMacros
 
   before do
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
     login_user first_user
   end
 
   context '#box_nav_item' do
     subject { helper.box_nav_item(first_user.box(:in)) }
     it { should have_tag 'li', text: /Inbox/ }
-    it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
+    it { should have_tag 'span', text: /[0-9]+/, with: { class: 'message-train-badge' } }
   end
 
   context '#box_list_item' do
     subject { helper.box_list_item(first_user.box(:in), class: 'foo') }
     it { should have_tag 'li', text: /Inbox/, with: { class: 'foo' } }
-    it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
+    it { should have_tag 'span', text: /[0-9]+/, with: { class: 'message-train-badge' } }
   end
 
   context '#boxes_widget' do
     subject { helper.boxes_widget(first_user) }
     it { should have_tag 'h3', text: /Messages/ }
-    it { should have_tag 'ul', with: { class: 'list-group' } }
-    it { should have_tag 'li', with: { class: 'list-group-item' }, count: 6 }
+    it { should have_tag 'ul', with: { class: 'message-train-list-group' } }
+    it { should have_tag 'li', with: { class: 'message-train-list-group-item' }, count: 6 }
   end
 
   describe '#boxes_dropdown_list' do
     subject { helper.boxes_dropdown_list(first_user) }
-    it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
+    it { should have_tag 'ul', with: { class: 'message-train-dropdown-menu' }, count: 1 }
     it { should have_tag 'li', text: /^Inbox/ }
     it { should have_tag 'li', text: /^Sent/ }
     it { should have_tag 'li', text: /^All/ }

data/spec/helpers/message_train/collectives_helper_spec.rb

@@ -5,15 +5,15 @@ describe MessageTrain::CollectivesHelper do
   include ControllerMacros
 
   before do
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
     login_user first_user
   end
 
   describe '#collective_boxes_widget' do
     subject { helper.collective_boxes_widget(membered_group, first_user) }
     it { should have_tag 'h3', text: /Membered Group Messages/ }
-    it { should have_tag 'ul', with: { class: 'list-group' } }
-    it { should have_tag 'li', with: { class: 'list-group-item' }, count: 4 }
+    it { should have_tag 'ul', with: { class: 'message-train-list-group' } }
+    it { should have_tag 'li', with: { class: 'message-train-list-group-item' }, count: 4 }
   end
 
   describe '#collective_nav_item' do
@@ -28,7 +28,7 @@ describe MessageTrain::CollectivesHelper 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' } }
+      it { should_not have_tag 'span', with: { class: 'message-train-badge' } }
     end
     context 'when there are unread messages' do
       subject do
@@ -38,7 +38,7 @@ describe MessageTrain::CollectivesHelper do
         )
       end
       it { should have_tag 'li', text: /^Membered Group/ }
-      it { should have_tag 'span', text: /[0-9]+/, with: { class: 'badge' } }
+      it { should have_tag 'span', text: /[0-9]+/, with: { class: 'message-train-badge' } }
     end
   end
 
@@ -48,14 +48,14 @@ describe MessageTrain::CollectivesHelper 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' } }
+      it { should have_tag 'span', text: /[0-9]+/, with: { class: 'message-train-badge' } }
     end
     context 'when user is a valid recipient and box is in' do
       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' } }
+      it { should have_tag 'span', text: /[0-9]+/, with: { class: 'message-train-badge' } }
     end
   end
 
@@ -63,20 +63,20 @@ describe MessageTrain::CollectivesHelper do
     describe 'passed a regular user' do
       subject { helper.collective_boxes_dropdown_list(first_user) }
       # Groups and Roles
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
+      it { should have_tag 'ul', with: { class: 'message-train-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) }
       # Groups and Roles
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
+      it { should have_tag 'ul', with: { class: 'message-train-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) }
       # Groups and Roles
-      it { should have_tag 'ul', with: { class: 'dropdown-menu' }, count: 1 }
+      it { should have_tag 'ul', with: { class: 'message-train-dropdown-menu' }, count: 1 }
       it { should have_tag 'li', text: /^Admin/ }
     end
   end