message_train 0.6.17 → 0.7.1

data/spec/factories/attachment.rb

@@ -3,7 +3,9 @@ FactoryGirl.define do
     message { MessageTrain::Message.order('RANDOM()').first }
     attachment do
       File.open(
-        Dir['spec/dummy/app/assets/files/message_train/attachments/*'].sample
+        Dir[
+          Rails.root.join 'app/assets/files/message_train/attachments/*'
+        ].sample
       )
     end
   end

data/spec/factories/message.rb

@@ -26,10 +26,9 @@ FactoryGirl.define do
       generate_ignore? { [*1..100].sample >= 80 }
     end
 
-    # the after(:create) yields two values; the user instance itself and the
+    # the after(:create) yields two values; the message instance itself and the
     # evaluator, which stores all values from the factory, including transient
-    # attributes; `create_list`'s second argument is the number of records
-    # to create and we make sure the user is associated properly to the post
+    # attributes
     after(:create) do |message, evaluator|
       if evaluator.generate_attachment?
         FactoryGirl.create(:attachment, message: message)

data/spec/features/boxes_spec.rb

@@ -70,9 +70,6 @@ RSpec.feature 'Boxes' do
             before do
               visit '/box/in'
               click_link 'Last'
-              find(
-                "#message_train_conversation_#{unread_conversation.id}"
-              ).hover
               within "#message_train_conversation_#{unread_conversation.id}" do
                 accept_confirm do
                   find('.trash-toggle').click

data/spec/helpers/message_train/application_helper_spec.rb

@@ -3,10 +3,11 @@ require 'rails_helper'
 describe MessageTrain::ApplicationHelper do
   include_context 'loaded site'
   include ControllerMacros
-  helper MessageTrain::BoxesHelper
-  helper MessageTrain::CollectivesHelper
 
   before do
+    view.extend MessageTrain::BoxesHelper
+    view.extend MessageTrain::CollectivesHelper
+    view.extend BootstrapLeatherHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/attachment_helper_spec.rb

@@ -3,6 +3,10 @@ require 'rails_helper'
 describe MessageTrain::AttachmentsHelper do
   include_context 'loaded site'
 
+  before do
+    view.extend BootstrapLeatherHelper
+  end
+
   describe '#attachment_icon' do
     context 'when attachment is an image' do
       subject { helper.attachment_icon(image_attachment) }

data/spec/helpers/message_train/boxes_helper_spec.rb

@@ -5,6 +5,7 @@ describe MessageTrain::BoxesHelper do
   include ControllerMacros
 
   before do
+    view.extend BootstrapLeatherHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/collectives_helper_spec.rb

@@ -5,6 +5,7 @@ describe MessageTrain::CollectivesHelper do
   include ControllerMacros
 
   before do
+    view.extend BootstrapLeatherHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/conversations_helper_spec.rb

@@ -3,9 +3,10 @@ require 'rails_helper'
 describe MessageTrain::ConversationsHelper do
   include_context 'loaded site'
   include ControllerMacros
-  helper MessageTrain::BoxesHelper
 
   before do
+    view.extend MessageTrain::BoxesHelper
+    view.extend BootstrapLeatherHelper
     login_user first_user
     assign(:box_user, first_user)
   end
@@ -17,7 +18,7 @@ describe MessageTrain::ConversationsHelper do
     end
     context 'when there is more than one sender' do
       subject { helper.conversation_senders(long_conversation) }
-      it { should eq 'First User and Second User' }
+      it { should eq 'Second User and First User' }
     end
   end
 

data/spec/helpers/message_train/messages_helper_spec.rb

@@ -3,9 +3,10 @@ require 'rails_helper'
 describe MessageTrain::MessagesHelper do
   include_context 'loaded site'
   include ControllerMacros
-  helper MessageTrain::BoxesHelper
 
   before do
+    view.extend MessageTrain::BoxesHelper
+    view.extend BootstrapLeatherHelper
     login_user first_user
     assign(:box_user, first_user)
   end

data/spec/models/group_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Group do
   end
 
   describe 'Scopes and Methods from Message Train' do
-    describe '#slug_part' do
-      subject { membered_group.slug_part }
+    describe '#message_train_slug' do
+      subject { membered_group.message_train_slug }
       it { should eq 'membered-group' }
     end
 
@@ -68,8 +68,10 @@ RSpec.describe Group do
 
     describe '#conversations' do
       subject { membered_group.conversations(:in, first_user) }
-      its(:first) { should be_a MessageTrain::Conversation }
-      its(:count) { should eq 4 }
+      it { should include membered_group_read_conversation }
+      it { should include membered_group_conversation }
+      it { should_not include membered_group_deleted_conversation }
+      it { should_not include membered_group_draft }
     end
 
     describe '#boxes_for_participant' do

data/spec/models/message_train/box_spec.rb

@@ -89,26 +89,6 @@ module MessageTrain
         it { should eq unread_message }
       end
 
-      describe '#new_message' do
-        context 'when conversation is set' do
-          let(:expected_recipients) { { 'users' => 'second-user' } }
-          subject do
-            user_in_box.new_message(
-              message_train_conversation_id: unread_conversation.id
-            )
-          end
-          it { should be_a_new MessageTrain::Message }
-          its(:subject) { should eq 'Re: Unread Conversation' }
-          its(:recipients_to_save) { should eq expected_recipients }
-        end
-        context 'when conversation is not set' do
-          subject { user_in_box.new_message }
-          it { should be_a_new MessageTrain::Message }
-          its(:subject) { should eq nil }
-          its(:recipients_to_save) { should be_empty }
-        end
-      end
-
       describe '#send_message' do
         describe 'to a singular recipient' do
           let(:message) do
@@ -243,74 +223,6 @@ module MessageTrain
         end
       end
 
-      describe '#ignore' do
-        context 'when not present' do
-          it 'raises an ActiveRecord::RecordNotFound error' do
-            expect do
-              last_user.box.ignore(99_999_999)
-            end.to raise_error(
-              ActiveRecord::RecordNotFound,
-              /Couldn't find MessageTrain::Conversation with 'id'=99999999/
-            )
-          end
-        end
-        context 'when bad type' do
-          before do
-            last_user.box.ignore(first_user)
-          end
-          subject { last_user.box.errors.all.first[:message] }
-          it { should match(/Cannot ignore User/) }
-        end
-        context 'when not authorized' do
-          before do
-            last_user.box.ignore(read_conversation)
-          end
-          subject { last_user.box.errors.all.first[:message] }
-          it { should match(/Access to Conversation ([0-9]+) denied/) }
-        end
-        context 'when authorized' do
-          before do
-            user_in_box.ignore(read_conversation)
-          end
-          subject { read_conversation.participant_ignored?(first_user) }
-          it { should be true }
-        end
-      end
-
-      describe '#unignore' do
-        context 'when not present' do
-          it 'raises an ActiveRecord::RecordNotFound error' do
-            expect do
-              last_user.box.unignore(99_999_999)
-            end.to raise_error(
-              ActiveRecord::RecordNotFound,
-              /Couldn't find MessageTrain::Conversation with 'id'=99999999/
-            )
-          end
-        end
-        context 'when bad type' do
-          before do
-            last_user.box.unignore(first_user)
-          end
-          subject { last_user.box.errors.all.first[:message] }
-          it { should match(/Cannot unignore User/) }
-        end
-        context 'when not authorized' do
-          before do
-            last_user.box.unignore(read_conversation)
-          end
-          subject { last_user.box.errors.all.first[:message] }
-          it { should match(/Access to Conversation ([0-9]+) denied/) }
-        end
-        context 'when authorized' do
-          before do
-            user_in_box.unignore(ignored_conversation)
-          end
-          subject { ignored_conversation.participant_ignored?(first_user) }
-          it { should be false }
-        end
-      end
-
       describe '#title' do
         context 'with division set to :in' do
           subject { user_in_box.title }

data/spec/models/message_train/ignore_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 module MessageTrain
   RSpec.describe Ignore do
+    let(:user_in_box) { first_user.box(:in) }
     describe 'Model' do
       it { should belong_to :conversation }
       it { should belong_to :participant }
@@ -20,6 +21,70 @@ module MessageTrain
         subject { MessageTrain::Ignore.conversations }
         it { should include ignored_conversation }
       end
+      describe '.ignore' do
+        context 'when not present' do
+          it 'raises an ActiveRecord::RecordNotFound error' do
+            expect { MessageTrain::Ignore.ignore(99_999_999, last_user.box) }
+              .to raise_error(
+                ActiveRecord::RecordNotFound,
+                /Couldn't find MessageTrain::Conversation with 'id'=99999999/
+              )
+          end
+        end
+        context 'when bad type' do
+          before do
+            MessageTrain::Ignore.ignore(first_user, last_user.box)
+          end
+          subject { last_user.box.errors.all.first[:message] }
+          it { should match(/Cannot ignore User/) }
+        end
+        context 'when not authorized' do
+          before do
+            MessageTrain::Ignore.ignore(read_conversation, last_user.box)
+          end
+          subject { last_user.box.errors.all.first[:message] }
+          it { should match(/Access to Conversation ([0-9]+) denied/) }
+        end
+        context 'when authorized' do
+          before do
+            MessageTrain::Ignore.ignore(read_conversation, user_in_box)
+          end
+          subject { read_conversation.participant_ignored?(first_user) }
+          it { should be true }
+        end
+      end
+      describe '.unignore' do
+        context 'when not present' do
+          it 'raises an ActiveRecord::RecordNotFound error' do
+            expect { MessageTrain::Ignore.unignore(99_999_999, last_user.box) }
+              .to raise_error(
+                ActiveRecord::RecordNotFound,
+                /Couldn't find MessageTrain::Conversation with 'id'=99999999/
+              )
+          end
+        end
+        context 'when bad type' do
+          before do
+            MessageTrain::Ignore.unignore(first_user, last_user.box)
+          end
+          subject { last_user.box.errors.all.first[:message] }
+          it { should match(/Cannot unignore User/) }
+        end
+        context 'when not authorized' do
+          before do
+            MessageTrain::Ignore.unignore(read_conversation, last_user.box)
+          end
+          subject { last_user.box.errors.all.first[:message] }
+          it { should match(/Access to Conversation ([0-9]+) denied/) }
+        end
+        context 'when authorized' do
+          before do
+            MessageTrain::Ignore.unignore(ignored_conversation, user_in_box)
+          end
+          subject { ignored_conversation.participant_ignored?(first_user) }
+          it { should be false }
+        end
+      end
     end
   end
 end

data/spec/models/message_train/message_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 module MessageTrain
   RSpec.describe Message do
     include_context 'loaded site'
+    let(:user_in_box) { first_user.box(:in) }
     describe 'Model' do
       # Relationships
       it { should belong_to :conversation }
@@ -31,7 +32,7 @@ module MessageTrain
       end
       context 'generates error when recipient_to_save does not exist' do
         let(:message) do
-          first_user.box(:in).send_message(
+          user_in_box.send_message(
             subject: 'Message with missing recipient',
             recipients_to_save: { 'users' => 'missing-user' },
             body: 'Foo.'
@@ -48,7 +49,7 @@ module MessageTrain
         it { should_not include draft_conversation }
       end
       context '.drafts' do
-        subject { MessageTrain::Message.drafts.first.conversation }
+        subject { MessageTrain::Message.drafts.last.conversation }
         it { should eq draft_conversation }
       end
       context '.by' do
@@ -57,7 +58,7 @@ module MessageTrain
         it { should include draft_message }
       end
       context '.drafts_by' do
-        subject { MessageTrain::Message.drafts_by(first_user).first }
+        subject { MessageTrain::Message.drafts_by(first_user).last }
         it { should eq draft_message }
       end
       context '.find_by_subject' do
@@ -72,11 +73,11 @@ module MessageTrain
         end
       end
       context '.with_receipts_by' do
-        subject { MessageTrain::Message.with_receipts_by(first_user).last }
+        subject { MessageTrain::Message.with_receipts_by(first_user).first }
         it { should eq sent_message }
       end
       context '.with_receipts_to' do
-        subject { MessageTrain::Message.with_receipts_to(first_user).last }
+        subject { MessageTrain::Message.with_receipts_to(first_user).first }
         it { should eq unread_message }
       end
       context '.with_trashed_to and #is_trashed_to?' do

data/spec/models/message_train/receipt_spec.rb

@@ -43,10 +43,9 @@ module MessageTrain
       end
       describe '.trashed_to' do
         subject do
-          MessageTrain::Receipt.trashed_to(first_user)
-                               .first.message.conversation
+          MessageTrain::Receipt.trashed_to(first_user).conversations
         end
-        its(:subject) { should eq 'Membered Group Trashed Conversation' }
+        it { should include membered_group_trashed_conversation }
       end
       describe '.untrashed_to' do
         subject do
@@ -56,16 +55,15 @@ module MessageTrain
       end
       describe '.read_to' do
         subject do
-          MessageTrain::Receipt.read_to(first_user).first.message.conversation
+          MessageTrain::Receipt.read_to(first_user).conversations
         end
-        its(:subject) { should eq 'Membered Group Read Conversation' }
+        it { should include membered_group_read_conversation }
       end
       describe '.deleted_to' do
         subject do
-          MessageTrain::Receipt.deleted_to(first_user)
-                               .first.message.conversation
+          MessageTrain::Receipt.deleted_to(first_user).conversations
         end
-        its(:subject) { should eq 'Membered Group Deleted Conversation' }
+        it { should include membered_group_deleted_conversation }
       end
       describe '.undeleted_to' do
         subject { MessageTrain::Receipt.undeleted_to(first_user).first }

data/spec/models/role_spec.rb

@@ -9,8 +9,8 @@ RSpec.describe Role do
   describe 'Scopes and Methods from Message Train' do
     include_context 'loaded site'
 
-    describe '#slug_part' do
-      subject { superadmin_role.slug_part }
+    describe '#message_train_slug' do
+      subject { superadmin_role.message_train_slug }
       it { should eq 'superadmin' }
     end
 

data/spec/models/user_spec.rb

@@ -14,25 +14,11 @@ RSpec.describe User do
 
   describe 'Scopes and Methods' do
     describe '#box' do
-      describe 'with valid number of arguments' do
-        subject { first_user.box }
-        it { should be_a MessageTrain::Box }
-        its(:division) { should be :in }
-        its(:parent) { should be first_user }
-        its(:participant) { should be first_user }
-      end
-      describe 'with invalid number of arguments' do
-        it 'should raise' do
-          expect do
-            first_user.box(:in, first_user, 'extra argument')
-          end.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..2, got 3)'
-            )
-          )
-        end
-      end
+      subject { first_user.box }
+      it { should be_a MessageTrain::Box }
+      its(:division) { should be :in }
+      its(:parent) { should be first_user }
+      its(:participant) { should be first_user }
     end
 
     describe '#collective_boxes' do
@@ -50,18 +36,6 @@ RSpec.describe User do
         it { should include membered_group }
         it { should include first_group }
       end
-      describe 'with 3 arguments' do
-        it 'should raise' do
-          expect do
-            first_user.collective_boxes(:in, first_user, 'extra argument')
-          end.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..2, got 3)'
-            )
-          )
-        end
-      end
     end
 
     describe '#all_boxes' do
@@ -79,18 +53,6 @@ RSpec.describe User do
           its(:count) { should be 6 }
         end
       end
-      describe 'with 2 arguments' do
-        it 'should raise' do
-          expect do
-            first_user.all_boxes(first_user, 'extra argument')
-          end.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..1, got 2)'
-            )
-          )
-        end
-      end
     end
 
     describe '#conversations' do
@@ -120,18 +82,6 @@ RSpec.describe User do
         end
         it { should be true }
       end
-      describe 'with 23 arguments' do
-        it 'should raise' do
-          expect do
-            first_user.conversations(:in, first_user, 'extra argument')
-          end.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..2, got 3)'
-            )
-          )
-        end
-      end
       context 'with impossible division' do
         subject { first_user.conversations(:impossible).nil? }
         it { should be true }
@@ -139,42 +89,30 @@ RSpec.describe User do
     end
 
     describe '#all_conversations' do
+      let(:required_conversations) do
+        [
+          sent_conversation,
+          unread_conversation,
+          read_conversation,
+          ignored_conversation,
+          trashed_conversation,
+          deleted_conversation
+        ]
+      end
       describe 'with no arguments' do
         context 'returns all conversations with any receipt' do
           subject { first_user.all_conversations }
-          it { should include sent_conversation }
-          it { should include unread_conversation }
-          it { should include read_conversation }
-          it { should include ignored_conversation }
-          it { should include trashed_conversation }
-          it { should include deleted_conversation }
+          it { should include(*required_conversations) }
           it { should_not include someone_elses_conversation }
         end
       end
       describe 'with 1 argument' do
         context 'returns all conversations with any receipt' do
           subject { first_user.all_conversations(first_user) }
-          it { should include sent_conversation }
-          it { should include unread_conversation }
-          it { should include read_conversation }
-          it { should include ignored_conversation }
-          it { should include trashed_conversation }
-          it { should include deleted_conversation }
+          it { should include(*required_conversations) }
           it { should_not include someone_elses_conversation }
         end
       end
-      describe 'with 2 arguments' do
-        it 'should raise' do
-          expect do
-            first_user.all_conversations(first_user, 'extra argument')
-          end.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..1, got 2)'
-            )
-          )
-        end
-      end
       context 'when empty' do
         subject { silent_user.all_conversations }
         it { should eq [] }
@@ -182,40 +120,30 @@ RSpec.describe User do
     end
 
     describe '#all_messages' do
+      let(:required_messages) do
+        [
+          sent_message,
+          unread_message,
+          read_message,
+          ignored_message,
+          trashed_message,
+          deleted_message
+        ]
+      end
       describe 'with no arguments' do
         context 'returns all messages with any receipt' do
           subject { first_user.all_messages }
-          it { should include sent_message }
-          it { should include unread_message }
-          it { should include read_message }
-          it { should include ignored_message }
-          it { should include trashed_message }
-          it { should include deleted_message }
+          it { should include(*required_messages) }
           it { should_not include someone_elses_message }
         end
       end
       describe 'with 1 argument' do
         context 'returns all messages with any receipt' do
           subject { first_user.all_messages(first_user) }
-          it { should include sent_message }
-          it { should include unread_message }
-          it { should include read_message }
-          it { should include ignored_message }
-          it { should include trashed_message }
-          it { should include deleted_message }
+          it { should include(*required_messages) }
           it { should_not include someone_elses_message }
         end
       end
-      describe 'with 2 arguments' do
-        it 'should raise' do
-          expect { first_user.all_messages(first_user, 'extra argument') }.to(
-            raise_error(
-              RuntimeError,
-              'Wrong number of arguments for User (expected 0..1, got 2)'
-            )
-          )
-        end
-      end
       context 'when empty' do
         subject { silent_user.all_messages }
         it { should eq [] }