message_train 0.5.2 → 0.5.3

data/spec/dummy/db/seeds/test/conversations.seeds.rb

@@ -2,8 +2,12 @@ after :users, :groups do
   first_user = User.friendly.find('first-user')
 
   # Create some conversations that first user has received
-  FactoryGirl.create_list(:message_from_random_sender, 10, recipients_to_save: { 'users' => first_user.slug })
+  FactoryGirl.create_list(
+    :message_from_random_sender,
+    10,
+    recipients_to_save: { 'users' => first_user.slug }
+  )
 
   # Create some conversations that first user has sent
   FactoryGirl.create_list(:message, 10, sender: first_user)
-end
+end

data/spec/dummy/db/seeds/unsubscribes.seeds.rb

@@ -9,4 +9,4 @@ after :groups do
   unsubscribed_user.unsubscribe_from(membered_group)
   unsubscribed_user.unsubscribe_from(unsubscribed_user)
   first_user.unsubscribe_from(unsubscribed_group)
-end
+end

data/spec/dummy/db/seeds/users.seeds.rb

@@ -1,42 +1,47 @@
-first_user = FactoryGirl.create(
-    :user,
-    display_name: 'First User',
-    email: 'first.user@example.com'
-)
-second_user = FactoryGirl.create(
-    :user,
-    display_name: 'Second User',
-    email: 'second.user@example.com'
-)
-third_user = FactoryGirl.create(
-    :user,
-    display_name: 'Third User',
-    email: 'third.user@example.com'
-)
-fourth_user = FactoryGirl.create(
-    :user,
-    display_name: 'Fourth User',
-    email: 'fourth.user@example.com'
-)
-unsubscribed_user = FactoryGirl.create(
-    :user,
-    display_name: 'Unsubscribed User',
-    email: 'unsubscribed.user@example.com'
-)
-silent_user = FactoryGirl.create(
-    :user,
-    display_name: 'Silent User',
-    email: 'silent.user@example.com'
-)
-superadmin_user = FactoryGirl.create(
-    :user,
-    display_name: 'Superadmin User',
-    email: 'superadmin.user@example.com'
-)
-superadmin_user.add_role(:superadmin)
-admin_user = FactoryGirl.create(
-    :user,
-    display_name: 'Admin User',
-    email: 'admin.user@example.com'
-)
-admin_user.add_role(:admin)
+FactoryGirl.create(
+  :user,
+  display_name: 'First User',
+  email: 'first.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Second User',
+  email: 'second.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Third User',
+  email: 'third.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Fourth User',
+  email: 'fourth.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Unsubscribed User',
+  email: 'unsubscribed.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Silent User',
+  email: 'silent.user@example.com'
+)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Superadmin User',
+  email: 'superadmin.user@example.com'
+).add_role(:superadmin)
+
+FactoryGirl.create(
+  :user,
+  display_name: 'Admin User',
+  email: 'admin.user@example.com'
+).add_role(:admin)

data/spec/factories/attachment.rb

@@ -1,6 +1,10 @@
 FactoryGirl.define do
   factory :attachment, class: 'MessageTrain::Attachment' do
     message { MessageTrain::Message.order('RANDOM()').first }
-    attachment { File.open(Dir['spec/dummy/app/assets/files/message_train/attachments/*'].sample) }
+    attachment do
+      File.open(
+        Dir['spec/dummy/app/assets/files/message_train/attachments/*'].sample
+      )
+    end
   end
-end
+end

data/spec/factories/group.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraphs([*1..5].sample).join("\n\n") }
     transient do
-      owner { User.order("RANDOM()").first }
+      owner { User.order('RANDOM()').first }
       # member_count 5
     end
     # the after(:create) yields two values; the user instance itself and the
@@ -12,9 +12,6 @@ FactoryGirl.define do
     # to create and we make sure the user is associated properly to the post
     after(:create) do |group, evaluator|
       evaluator.owner.add_role(:owner, group)
-      # User.where('id != ?', evaluator.owner.id).order("RANDOM()").limit(evaluator.member_count).find_each do |user|
-      #   user.add_role(:member, group)
-      # end
     end
   end
 end

data/spec/factories/message.rb

@@ -1,21 +1,22 @@
 FactoryGirl.define do
   factory :message, class: 'MessageTrain::Message' do
-    sender {
+    sender do
       User
-         .order('RANDOM()')
-         .first
-    }
-    recipients_to_save { { 'users' =>
-       User
-         .where
-         .not(id: sender.id)
-         .where
-         .not(slug: 'silent-user')
-         .order('RANDOM()')
-         .limit([*1..5].sample)
-         .collect { |x| x.slug }
-         .join(', ')
-    } }
+        .order('RANDOM()')
+        .first
+    end
+    recipients_to_save do
+      {
+        'users' => User.where
+                       .not(id: sender.id)
+                       .where
+                       .not(slug: 'silent-user')
+                       .order('RANDOM()')
+                       .limit([*1..5].sample)
+                       .collect(&:slug)
+                       .join(', ')
+      }
+    end
     subject { Faker::Lorem.sentence }
     body { "<p>#{Faker::Lorem.paragraphs([*1..5].sample).join('</p><p>')}</p>" }
 
@@ -34,11 +35,13 @@ FactoryGirl.define do
         FactoryGirl.create(:attachment, message: message)
       end
       if message.recipients_to_save['users'].present?
-        participants = (message.recipients_to_save['users'].split(',') + [message.sender.slug]).collect{ |x| x.strip }
+        participants = (
+          message.recipients_to_save['users'].split(',') + [message.sender.slug]
+        ).collect(&:strip)
         if evaluator.generate_ignore?
           ignorer = User.friendly.find(participants.sample)
-          participants = participants - [ignorer.slug]
-          message.conversation.set_ignored(ignorer)
+          participants -= [ignorer.slug]
+          message.conversation.participant_ignore(ignorer)
         end
         if evaluator.generate_response? && participants.count > 1
           response_sender = User.friendly.find(participants.sample)
@@ -54,16 +57,19 @@ FactoryGirl.define do
     end
 
     factory :message_from_random_sender do
-      sender {
-        recipient_user_ids = recipients_to_save['users'].split(',').collect{ |x| User.friendly.find(x.strip).id }
+      sender do
+        recipient_user_ids = (
+          recipients_to_save['users'].split(',')
+            .collect { |x| User.friendly.find(x.strip).id }
+        )
         User
           .where
-          .not(id: recipient_user_ids )
+          .not(id: recipient_user_ids)
           .where
           .not(slug: 'silent-user')
           .order('RANDOM()')
           .first
-      }
+      end
     end
 
     factory :simple_message do
@@ -72,4 +78,4 @@ FactoryGirl.define do
       generate_attachment? false
     end
   end
-end
+end

data/spec/factories/user.rb

@@ -1,8 +1,10 @@
 FactoryGirl.define do
   factory :user do
     display_name { Faker::Name.name }
-    email { "#{display_name.gsub(' ', '.').downcase}.#{rand(1000).to_s}@example.com" }
-    password "password"
-    password_confirmation "password"
+    sequence :email do |n|
+      "#{display_name.tr(' ', '.').downcase}#{n}@example.com"
+    end
+    password 'password'
+    password_confirmation 'password'
   end
-end
+end

data/spec/features/boxes_spec.rb

@@ -3,40 +3,59 @@ RSpec.feature 'Boxes' do
   include_context 'loaded site'
 
   it_behaves_like 'an authenticated section', '/box'
-  it_behaves_like 'an authenticated section', '/collectives/groups:membered-group'
+  it_behaves_like(
+    'an authenticated section',
+    '/collectives/groups:membered-group'
+  )
 
   describe 'When logged in as first-user' do
     before do
       login_as first_user
     end
     describe 'Without a collective' do
-
       describe 'Showing' do
         describe 'at /box/in' do
           before do
             visit '/box/in'
             click_link 'Last'
           end
-          it_behaves_like 'a bootstrap page listing a collection of items', MessageTrain::Conversation, plural_title: 'Inbox', minimum: 1
+          it_behaves_like(
+            'a bootstrap page listing a collection of items',
+            MessageTrain::Conversation,
+            plural_title: 'Inbox',
+            minimum: 1
+          )
 
           describe 'does not list Roles dropdown' do
             subject { page }
-            it { should_not have_css('li.dropdown a.dropdown-toggle', text: 'Roles') }
+            it do
+              should_not have_css(
+                'li.dropdown a.dropdown-toggle',
+                text: 'Roles'
+              )
+            end
           end
 
           describe 'shows the attachment icon on the correct conversation' do
             before do
-              if page.has_no_css?("#message_train_conversation_#{attachment_conversation.id.to_s}")
+              if page.has_no_css?(
+                "#message_train_conversation_#{attachment_conversation.id}"
+              )
                 click_link 'Prev'
               end
             end
             subject { page }
-            it { should have_css("#message_train_conversation_#{attachment_conversation.id.to_s} .glyphicon-paperclip")}
+            it do
+              should have_css(
+                "#message_train_conversation_#{attachment_conversation.id} "\
+                  '.glyphicon-paperclip'
+              )
+            end
           end
 
           describe 'shows a link to compose' do
             before do
-              within ".content" do
+              within '.content' do
                 find('.compose').click
               end
             end
@@ -51,14 +70,20 @@ RSpec.feature 'Boxes' do
             before do
               visit '/box/in'
               click_link 'Last'
-              find("#message_train_conversation_#{unread_conversation.id.to_s}").hover
-              within "#message_train_conversation_#{unread_conversation.id.to_s}" do
+              find(
+                "#message_train_conversation_#{unread_conversation.id}"
+              ).hover
+              within "#message_train_conversation_#{unread_conversation.id}" do
                 accept_confirm do
                   find('.trash-toggle').click
                 end
               end
             end
-            it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+            it_behaves_like(
+              'a bootstrap page with an alert',
+              'info',
+              'Update successful'
+            )
           end
           describe 'without checking anything' do
             before do
@@ -66,43 +91,58 @@ RSpec.feature 'Boxes' do
               click_button 'Mark'
               click_link 'mark-read'
             end
-            it_behaves_like 'a bootstrap page with an alert', 'warning', 'Nothing to do'
+            it_behaves_like(
+              'a bootstrap page with an alert',
+              'warning',
+              'Nothing to do'
+            )
           end
           describe 'after checking a box' do
             describe 'Marking Read' do
               before do
                 visit '/box/in'
                 click_link 'Last'
-                check "objects_conversations_#{unread_conversation.id.to_s}"
+                check "objects_conversations_#{unread_conversation.id}"
                 click_button 'Mark'
                 click_link 'mark-read'
               end
-              it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+              it_behaves_like(
+                'a bootstrap page with an alert',
+                'info',
+                'Update successful'
+              )
             end
             describe 'Marking Ignored' do
               before do
                 visit '/box/in'
                 click_link 'Last'
-                check "objects_conversations_#{unread_conversation.id.to_s}"
+                check "objects_conversations_#{unread_conversation.id}"
                 click_button 'Mark'
                 click_link 'mark-ignored'
               end
-              it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+              it_behaves_like(
+                'a bootstrap page with an alert',
+                'info',
+                'Update successful'
+              )
             end
           end
         end
-
       end
     end
 
     describe 'Within a collective' do
-
       describe 'Showing' do
         describe 'at /collectives/groups:membered-group/box/in' do
           before do
             visit '/collectives/groups:membered-group/box/in'
           end
-          it_behaves_like 'a bootstrap page listing a collection of items', MessageTrain::Conversation, plural_title: 'Inbox', minimum: 1
+          it_behaves_like(
+            'a bootstrap page listing a collection of items',
+            MessageTrain::Conversation,
+            plural_title: 'Inbox',
+            minimum: 1
+          )
         end
       end
 
@@ -114,33 +154,45 @@ RSpec.feature 'Boxes' do
               click_button 'Mark'
               click_link 'mark-read'
             end
-            it_behaves_like 'a bootstrap page with an alert', 'warning', 'Nothing to do'
+            it_behaves_like(
+              'a bootstrap page with an alert',
+              'warning',
+              'Nothing to do'
+            )
           end
           describe 'after checking a box' do
             describe 'Marking Read' do
               before do
                 visit '/collectives/groups:membered-group/box/in'
-                check "objects_conversations_#{membered_group_conversation.id.to_s}"
+                check "objects_conversations_#{membered_group_conversation.id}"
                 click_button 'Mark'
                 click_link 'mark-read'
               end
-              it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+              it_behaves_like(
+                'a bootstrap page with an alert',
+                'info',
+                'Update successful'
+              )
             end
             describe 'Marking Ignored' do
               before do
                 visit '/collectives/groups:membered-group/box/in'
-                check "objects_conversations_#{membered_group_conversation.id.to_s}"
+                check "objects_conversations_#{membered_group_conversation.id}"
                 click_button 'Mark'
                 click_link 'mark-ignored'
               end
-              it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+              it_behaves_like(
+                'a bootstrap page with an alert',
+                'info',
+                'Update successful'
+              )
             end
           end
         end
-
       end
     end
   end
+
   describe 'When logged in as admin-user' do
     before do
       login_as admin_user

data/spec/features/conversations_spec.rb

@@ -11,9 +11,13 @@ RSpec.feature 'Conversations' do
     describe 'Showing' do
       describe 'at /box/in/conversations/:id' do
         before do
-          visit '/box/in/conversations/' + unread_conversation.id.to_s
+          visit "/box/in/conversations/#{unread_conversation.id}"
         end
-        it_behaves_like 'a bootstrap page showing an item', MessageTrain::Conversation, 'Unread Conversation'
+        it_behaves_like(
+          'a bootstrap page showing an item',
+          MessageTrain::Conversation,
+          'Unread Conversation'
+        )
 
         describe 'shows a reply link' do
           before do
@@ -27,19 +31,27 @@ RSpec.feature 'Conversations' do
       describe 'at /box/in/conversations/:id' do
         describe 'Marking Read' do
           before do
-            visit '/box/in/conversations/' + unread_conversation.id.to_s
-            click_link "mark_read_#{unread_message.id.to_s}"
+            visit "/box/in/conversations/#{unread_conversation.id}"
+            click_link "mark_read_#{unread_message.id}"
           end
-          it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+          it_behaves_like(
+            'a bootstrap page with an alert',
+            'info',
+            'Update successful'
+          )
         end
         describe 'Marking Ignored' do
           before do
-            visit '/box/in/conversations/' + unread_conversation.id.to_s
+            visit "/box/in/conversations/#{unread_conversation.id}"
             accept_confirm do
               click_link 'Mark as Ignored'
             end
           end
-          it_behaves_like 'a bootstrap page with an alert', 'info', 'Update successful'
+          it_behaves_like(
+            'a bootstrap page with an alert',
+            'info',
+            'Update successful'
+          )
         end
       end
     end

data/spec/features/messages_spec.rb

@@ -17,7 +17,11 @@ RSpec.feature 'Messages' do
           fill_in_ckeditor 'Body', with: 'This is the body.'
           submit_via_button 'Send'
         end
-        it_behaves_like 'a bootstrap page with an alert', 'warning', 'Message saved as draft.'
+        it_behaves_like(
+          'a bootstrap page with an alert',
+          'warning',
+          'Message saved as draft.'
+        )
       end
     end
     describe 'Composing', js: true do
@@ -31,10 +35,16 @@ RSpec.feature 'Messages' do
           click_link 'add-attachment'
           click_link 'add-attachment'
           within '#attachments .nested-fields:nth-child(1)' do
-            attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/example.pdf')
+            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
-            attach_file 'Attachment', File.absolute_path('./spec/dummy/app/assets/files/message_train/attachments/Bambisj.jpg')
+            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
             accept_confirm do
@@ -43,7 +53,11 @@ RSpec.feature 'Messages' do
           end
           submit_via_button 'Send'
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
+        it_behaves_like(
+          'a bootstrap page with an alert',
+          'info',
+          'Message sent.'
+        )
       end
     end
     describe 'Editing a Draft', js: true do
@@ -54,8 +68,13 @@ RSpec.feature 'Messages' do
           fill_in 'Subject', with: 'This is the subject.'
           fill_in_ckeditor '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 with an alert',
+          'info',
+          'Message sent.'
+        )
         it_behaves_like 'a bootstrap page without an alert', 'warning'
       end
     end

data/spec/features/unsubscribes_spec.rb

@@ -13,10 +13,13 @@ RSpec.feature 'Unsubscribes' do
         before do
           visit '/unsubscribes'
         end
-        it_behaves_like 'a bootstrap page', title: 'Manage Your Email Notifications'
-        context "displays a list of #subscriptions in .subscription" do
+        it_behaves_like(
+          'a bootstrap page',
+          title: 'Manage Your Email Notifications'
+        )
+        context 'displays a list of #subscriptions in .subscription' do
           subject { page }
-          it { should have_css("#subscriptions .subscription", minimum: 3) }
+          it { should have_css('#subscriptions .subscription', minimum: 3) }
         end
       end
     end
@@ -25,16 +28,28 @@ RSpec.feature 'Unsubscribes' do
         describe 'with a specific item' do
           before do
             visit '/unsubscribes'
-            find("#unsubscribe-group-#{membered_group.id.to_s}").click
+            find("#unsubscribe-group-#{membered_group.id}").click
           end
-          it_behaves_like 'a bootstrap page with an alert', 'info', 'You are now unsubscribed from Membered Group, which means that you will not be notified by email of any messages received by that Group.'
+          it_behaves_like(
+            'a bootstrap page with an alert',
+            'info',
+            'You are now unsubscribed from Membered Group, which means that '\
+              'you will not be notified by email of any messages received by '\
+              'that Group.'
+          )
         end
         describe 'with all button' do
           before do
             visit '/unsubscribes'
             click_link 'Disable All Notifications'
           end
-          it_behaves_like 'a bootstrap page with an alert', 'info', 'You have unsubscribed from all messages, which means that you will not be notified by email of any messages received in any of your boxes.'
+          it_behaves_like(
+            'a bootstrap page with an alert',
+            'info',
+            'You have unsubscribed from all messages, which means that you '\
+              'will not be notified by email of any messages received in any '\
+              'of your boxes.'
+          )
         end
       end
     end
@@ -42,9 +57,15 @@ RSpec.feature 'Unsubscribes' do
       describe 'at /unsubscribes' do
         before do
           visit '/unsubscribes'
-          find("#remove-unsubscribe-#{unsubscribed_group.id.to_s}").click
+          find("#remove-unsubscribe-#{unsubscribed_group.id}").click
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'You are no longer unsubscribed from Unsubscribed Group, which means that you will now be notified by email of any messages received in that Group.'
+        it_behaves_like(
+          'a bootstrap page with an alert',
+          'info',
+          'You are no longer unsubscribed from Unsubscribed Group, which '\
+            'means that you will now be notified by email of any messages '\
+            'received in that Group.'
+        )
       end
       describe 'with all button' do
         before do
@@ -52,7 +73,13 @@ RSpec.feature 'Unsubscribes' do
           click_link 'Disable All Notifications'
           click_link 'Enable Some Notifications'
         end
-        it_behaves_like 'a bootstrap page with an alert', 'info', 'You are no longer unsubscribed from all messages, which means that you will now be notified by email of any messages received in boxes you are subscribed to.'
+        it_behaves_like(
+          'a bootstrap page with an alert',
+          'info',
+          'You are no longer unsubscribed from all messages, which means that '\
+            'you will now be notified by email of any messages received in '\
+            'boxes you are subscribed to.'
+        )
       end
     end
   end

data/spec/helpers/message_train/application_helper_spec.rb

@@ -59,4 +59,4 @@ describe MessageTrain::ApplicationHelper do
       it { should eq 2.years.ago.strftime('%b %-d, %Y') }
     end
   end
-end
+end