message_train 0.7.6 → 1.0.0

data/spec/helpers/message_train/conversations_helper_spec.rb

@@ -6,7 +6,7 @@ describe MessageTrain::ConversationsHelper do
 
   before do
     view.extend MessageTrain::BoxesHelper
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
     login_user first_user
     assign(:box_user, first_user)
   end
@@ -120,17 +120,14 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_trashed_toggle(unread_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Trashed',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all trashed' do
         before do
@@ -139,16 +136,13 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_trashed_toggle(trashed_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Untrashed',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Untrashed'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -161,17 +155,14 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Trashed',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all trashed' do
         before do
@@ -184,16 +175,13 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Untrashed',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Untrashed'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end
@@ -207,16 +195,13 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_read_toggle(unread_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Read',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Read'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all read' do
         before do
@@ -225,16 +210,13 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_read_toggle(read_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unread',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unread'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -245,16 +227,13 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_read_toggle(membered_group_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Read',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Read'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all read' do
         before do
@@ -265,16 +244,13 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unread',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unread'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end
@@ -288,17 +264,14 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_ignored_toggle(unread_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Ignored',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'delete',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-volume-off' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all ignored' do
         before do
@@ -307,16 +280,13 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_ignored_toggle(ignored_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unignored',
-              'data-method' => 'delete',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unignored'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-volume-up' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -329,17 +299,14 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Ignored',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'delete',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-volume-off' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the conversation is all ignored' do
         before do
@@ -352,16 +319,13 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unignored',
-              'data-method' => 'delete',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unignored'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-volume-up' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end
@@ -375,17 +339,14 @@ describe MessageTrain::ConversationsHelper do
         subject { helper.conversation_deleted_toggle(unread_conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Deleted',
-              'data-confirm' => 'Delete forever? This cannot be undone.',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Delete forever? This cannot be undone.'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -398,17 +359,14 @@ describe MessageTrain::ConversationsHelper do
         end
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Deleted',
-              'data-confirm' => 'Delete forever? This cannot be undone.',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Delete forever? This cannot be undone.'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end

data/spec/helpers/message_train/messages_helper_spec.rb

@@ -6,7 +6,7 @@ describe MessageTrain::MessagesHelper do
 
   before do
     view.extend MessageTrain::BoxesHelper
-    view.extend BootstrapLeather::ApplicationHelper
+    view.extend MessageTrain::ApplicationHelper
     login_user first_user
     assign(:box_user, first_user)
   end
@@ -64,37 +64,33 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.message_trashed_toggle(unread_message) }
+        before { assign(:conversation, unread_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Trashed',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the message is trashed' do
         before do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_trashed_toggle(trashed_message) }
+        before { assign(:conversation, trashed_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Untrashed',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Untrashed'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -103,19 +99,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:in, first_user))
         end
         subject { helper.message_trashed_toggle(membered_group_message) }
+        before { assign(:conversation, membered_group_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Trashed',
-              'data-confirm' => 'Are you sure?',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Are you sure?'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-trash' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the message is trashed' do
         before do
@@ -124,18 +118,16 @@ describe MessageTrain::MessagesHelper do
         subject do
           helper.message_trashed_toggle(membered_group_trashed_message)
         end
+        before { assign(:conversation, membered_group_trashed_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Untrashed',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Untrashed'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-inbox' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end
@@ -147,36 +139,32 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:in))
         end
         subject { helper.message_read_toggle(unread_message) }
+        before { assign(:conversation, unread_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Read',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Read'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the message is read' do
         before do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_read_toggle(read_message) }
+        before { assign(:conversation, read_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unread',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unread'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -185,36 +173,32 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:in, first_user))
         end
         subject { helper.message_read_toggle(membered_group_message) }
+        before { assign(:conversation, membered_group_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Read',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Read'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-open' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
       context 'when the message is read' do
         before do
           assign(:box, membered_group.box(:trash, first_user))
         end
         subject { helper.message_read_toggle(membered_group_read_message) }
+        before { assign(:conversation, membered_group_read_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
-              'title' => 'Mark as Unread',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'title' => 'Mark as Unread'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-eye-close' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end
@@ -226,19 +210,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, first_user.box(:trash))
         end
         subject { helper.message_deleted_toggle(unread_message) }
+        before { assign(:conversation, unread_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Deleted',
-              'data-confirm' => 'Delete forever? This cannot be undone.',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Delete forever? This cannot be undone.'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
     describe 'in a collective box' do
@@ -247,19 +229,17 @@ describe MessageTrain::MessagesHelper do
           assign(:box, membered_group.box(:trash, first_user))
         end
         subject { helper.message_deleted_toggle(membered_group_message) }
+        before { assign(:conversation, membered_group_message.conversation) }
         it do
           should have_tag(
-            :a,
+            :button,
             with: {
-              'rel' => 'nofollow',
               'title' => 'Mark as Deleted',
-              'data-confirm' => 'Delete forever? This cannot be undone.',
-              'data-method' => 'put',
-              'data-remote' => 'true'
+              'data-turbo-confirm' => 'Delete forever? This cannot be undone.'
             }
           )
         end
-        it { should have_tag(:span, with: { class: 'glyphicon-remove' }) }
+        it { should have_tag(:span, with: { class: 'message-train-icon' }) }
       end
     end
   end

data/spec/models/message_train/attachment_spec.rb

@@ -5,52 +5,42 @@ module MessageTrain
     include_context 'loaded site'
 
     describe 'Model' do
-      it { should belong_to :message }
-      it { should have_attached_file :attachment }
-      it { should validate_attachment_presence :attachment }
-      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'
+      it { is_expected.to belong_to :message }
+
+      it 'has an attached file' do
+        expect(image_attachment.attachment).to be_attached
+      end
+
+      it 'is invalid without an attached file' do
+        attachment = build(:attachment, message: build(:message), attachment: nil)
+        expect(attachment).not_to be_valid
+        expect(attachment.errors[:attachment]).to be_present
+      end
+
+      it 'is valid for an allowed content type' do
+        expect(image_attachment).to be_valid
+      end
+
+      it 'is invalid for a disallowed content type' do
+        attachment = build(:attachment, message: build(:message))
+        attachment.attachment.attach(
+          io: StringIO.new('bogus'),
+          filename: 'bogus.svg',
+          content_type: 'image/svg'
         )
+        expect(attachment).not_to be_valid
+        expect(attachment.errors[:attachment]).to be_present
       end
     end
     describe 'Scopes and Methods' do
       describe '#image?' do
         context 'when it is an image' do
           subject { image_attachment.image? }
-          it { should eq true }
+          it { is_expected.to eq true }
         end
         context 'when it is not an image' do
           subject { pdf_attachment.image? }
-          it { should eq false }
+          it { is_expected.to eq false }
         end
       end
     end

data/spec/models/message_train/box_spec.rb

@@ -290,7 +290,7 @@ module MessageTrain
               should eq [
                 {
                   css_id: 'box',
-                  path: '/collectives/groups:first-group/box/in',
+                  path: '/messages/collectives/groups:first-group/box/in',
                   message: 'Cannot mark with Time'
                 }
               ]
@@ -512,7 +512,7 @@ module MessageTrain
                       {
                         css_id: 'message_train_message_'\
                           "#{membered_group_message.id}",
-                        path: '/collectives/groups:membered-group/box/in/'\
+                        path: '/messages/collectives/groups:membered-group/box/in/'\
                           "messages/#{membered_group_message.id}",
                         message: 'Access to Message '\
                           "#{membered_group_message.id} denied"

data/spec/models/message_train/conversation_spec.rb

@@ -53,6 +53,21 @@ module MessageTrain
         it { should_not include third_user }
       end
 
+      describe '#new_reply' do
+        subject(:reply) { sent_conversation.new_reply(box: first_user.box(:in)) }
+
+        it 'prefixes the subject with Re:' do
+          expect(reply.subject).to eq("Re: #{sent_conversation.subject}")
+        end
+
+        it 'quotes the previous message as a markdown blockquote' do
+          quoted = sent_conversation.messages.last.body.each_line.map do |line|
+            "> #{line.chomp}"
+          end.join("\n")
+          expect(reply.body).to eq("#{quoted}\n\n")
+        end
+      end
+
       describe '#participant_ignore and #participant_ignored?' do
         subject { ignored_conversation.participant_ignored?(first_user) }
         it { should be true }

data/spec/models/message_train/message_spec.rb

@@ -6,7 +6,11 @@ module MessageTrain
     let(:user_in_box) { first_user.box(:in) }
     describe 'Model' do
       # Relationships
-      it { should belong_to :conversation }
+      # `conversation` has no association-level `required`/presence
+      # validation because `create_conversation_if_blank` (a
+      # before_validation callback) always fills it in before validation
+      # runs, so it's never actually blank at that point.
+      it { should belong_to(:conversation).optional }
       it { should belong_to :sender }
       it { should have_many :attachments }
       it { should have_many :receipts }