message_train 0.7.6 → 1.0.0

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

@@ -8,21 +8,21 @@ after :users, :groups do
   first_group = Group.find_by_slug('first-group')
   membered_group = Group.find_by_slug('membered-group')
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: first_user,
     recipients_to_save: { 'users' => second_user.slug },
     subject: 'Sent Conversation'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
     subject: 'Unread Conversation'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: first_user,
     recipients_to_save: {
@@ -35,28 +35,28 @@ after :users, :groups do
     subject: 'To Many Conversation'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
     subject: 'Ignored Conversation'
   ).conversation.participant_ignore(first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
     subject: 'Trashed Conversation'
   ).mark_trash_for(first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
     subject: 'Read Conversation'
   ).mark_read_for(first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
@@ -64,56 +64,56 @@ after :users, :groups do
     generate_attachment?: true
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug },
     subject: 'Deleted Conversation'
   ).mark_deleted_for(first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: first_user,
     recipients_to_save: { 'groups' => first_group.slug },
     subject: 'Group Announcement'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
     subject: 'Membered Group Announcement'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
     subject: 'Membered Group Trashed Conversation'
   ).mark(:trash, first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
     subject: 'Membered Group Read Conversation'
   ).mark(:read, first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
     subject: 'Membered Group Ignored Conversation'
   ).conversation.participant_ignore(first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
     subject: 'Membered Group Deleted Conversation'
   ).mark(:deleted, first_user)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: second_user,
     recipients_to_save: { 'groups' => membered_group.slug },
@@ -121,7 +121,7 @@ after :users, :groups do
     draft: true
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: first_user,
     recipients_to_save: { 'groups' => first_group.slug },
@@ -129,14 +129,14 @@ after :users, :groups do
     draft: true
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: superadmin_user,
     recipients_to_save: { 'roles' => 'admin' },
     subject: 'Role Conversation'
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     sender: superadmin_user,
     recipients_to_save: { 'roles' => 'admin' },
@@ -144,28 +144,28 @@ after :users, :groups do
     draft: true
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     subject: 'This should turn into a draft',
     sender: first_user,
     recipients_to_save: {}
   )
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :simple_message,
     subject: "Someone Else's Conversation",
     sender: User.order(:id).last,
     recipients_to_save: { 'users' => second_user.slug }
   )
 
-  long_message = FactoryGirl.create(
+  long_message = FactoryBot.create(
     :simple_message,
     subject: 'Long Conversation',
     sender: second_user,
     recipients_to_save: { 'users' => first_user.slug }
   )
 
-  FactoryGirl.create_list(
+  FactoryBot.create_list(
     :simple_message,
     11,
     conversation: long_message.conversation,

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

@@ -1,13 +1,13 @@
 after :users, :groups do
   User.find_each do |user|
     # Create some conversations that this user has received
-    FactoryGirl.create_list(
+    FactoryBot.create_list(
       :message_from_random_sender,
       [*5..10].sample,
       recipients_to_save: { 'users' => user.slug }
     )
 
     # Create some conversations that this user has sent
-    FactoryGirl.create_list(:message, [*5..10].sample, sender: user)
+    FactoryBot.create_list(:message, [*5..10].sample, sender: user)
   end
 end

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

@@ -4,7 +4,7 @@ after :users do
   fourth_user = User.friendly.find('fourth-user')
   unsubscribed_user = User.friendly.find('unsubscribed-user')
 
-  first_group = FactoryGirl.create(
+  first_group = FactoryBot.create(
     :group,
     title: 'First Group',
     owner: first_user
@@ -12,7 +12,7 @@ after :users do
   fourth_user.add_role(:member, first_group)
   unsubscribed_user.add_role(:member, first_group)
 
-  membered_group = FactoryGirl.create(
+  membered_group = FactoryBot.create(
     :group,
     title: 'Membered Group',
     owner: second_user
@@ -20,13 +20,13 @@ after :users do
   first_user.add_role(:member, membered_group)
   unsubscribed_user.add_role(:member, membered_group)
 
-  FactoryGirl.create(
+  FactoryBot.create(
     :group,
     title: 'Empty Group',
     owner: first_user
   )
 
-  unsubscribed_group = FactoryGirl.create(
+  unsubscribed_group = FactoryBot.create(
     :group,
     title: 'Unsubscribed Group',
     owner: second_user

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

@@ -1,13 +1,13 @@
 after 'test:conversations' do
-  FactoryGirl.create(
+  FactoryBot.create(
     :attachment,
-    attachment: File.open(
+    attachment: Rack::Test::UploadedFile.new(
       'spec/dummy/app/assets/files/message_train/attachments/image-sample.jpg'
     )
   )
-  FactoryGirl.create(
+  FactoryBot.create(
     :attachment,
-    attachment: File.open(
+    attachment: Rack::Test::UploadedFile.new(
       'spec/dummy/app/assets/files/message_train/attachments/pdf-sample.pdf'
     )
   )

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

@@ -2,12 +2,12 @@ after :users, :groups do
   first_user = User.friendly.find('first-user')
 
   # Create some conversations that first user has received
-  FactoryGirl.create_list(
+  FactoryBot.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)
+  FactoryBot.create_list(:message, 10, sender: first_user)
 end

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

@@ -1,46 +1,46 @@
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'First User',
   email: 'first.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Second User',
   email: 'second.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Third User',
   email: 'third.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Fourth User',
   email: 'fourth.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Unsubscribed User',
   email: 'unsubscribed.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Silent User',
   email: 'silent.user@example.com'
 )
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Superadmin User',
   email: 'superadmin.user@example.com'
 ).add_role(:superadmin)
 
-FactoryGirl.create(
+FactoryBot.create(
   :user,
   display_name: 'Admin User',
   email: 'admin.user@example.com'

data/spec/factories/attachment.rb

@@ -1,12 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :attachment, class: 'MessageTrain::Attachment' do
     message { MessageTrain::Message.order('RANDOM()').first }
     attachment do
-      File.open(
-        Dir[
-          Rails.root.join 'app/assets/files/message_train/attachments/*'
-        ].sample
-      )
+      path = Dir[
+        Rails.root.join 'app/assets/files/message_train/attachments/*'
+      ].sample
+      Rack::Test::UploadedFile.new(path)
     end
   end
 end

data/spec/factories/group.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :group do
     title { Faker::Lorem.sentence }
-    description { Faker::Lorem.paragraphs([*1..5].sample).join("\n\n") }
+    description { Faker::Lorem.paragraphs(number: [*1..5].sample).join("\n\n") }
     transient do
       owner { User.order('RANDOM()').first }
       # member_count 5

data/spec/factories/message.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :message, class: 'MessageTrain::Message' do
     sender do
       User
@@ -18,7 +18,7 @@ FactoryGirl.define do
       }
     end
     subject { Faker::Lorem.sentence }
-    body { "<p>#{Faker::Lorem.paragraphs([*1..5].sample).join('</p><p>')}</p>" }
+    body { Faker::Lorem.paragraphs(number: [*1..5].sample).join("\n\n") }
 
     transient do
       generate_attachment? { [*1..100].sample >= 80 }
@@ -31,7 +31,7 @@ FactoryGirl.define do
     # attributes
     after(:create) do |message, evaluator|
       if evaluator.generate_attachment?
-        FactoryGirl.create(:attachment, message: message)
+        FactoryBot.create(:attachment, message: message)
       end
       if message.recipients_to_save['users'].present?
         participants = (
@@ -45,7 +45,7 @@ FactoryGirl.define do
         if evaluator.generate_response? && participants.count > 1
           response_sender = User.friendly.find(participants.sample)
           response_recipients = participants - [response_sender.slug]
-          FactoryGirl.create(
+          FactoryBot.create(
             :message,
             sender: response_sender,
             recipients_to_save: { 'users' => response_recipients.join(', ') },
@@ -72,9 +72,9 @@ FactoryGirl.define do
     end
 
     factory :simple_message do
-      generate_ignore? false
-      generate_response? false
-      generate_attachment? false
+      generate_ignore? { false }
+      generate_response? { false }
+      generate_attachment? { false }
     end
   end
 end

data/spec/factories/user.rb

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

data/spec/features/boxes_spec.rb

@@ -2,10 +2,10 @@ require 'rails_helper'
 RSpec.feature 'Boxes' do
   include_context 'loaded site'
 
-  it_behaves_like 'an authenticated section', '/box'
+  it_behaves_like 'an authenticated section', '/messages/box'
   it_behaves_like(
     'an authenticated section',
-    '/collectives/groups:membered-group'
+    '/messages/collectives/groups:membered-group'
   )
 
   describe 'When logged in as first-user' do
@@ -16,7 +16,7 @@ RSpec.feature 'Boxes' do
       describe 'Showing' do
         describe 'at /box/in' do
           before do
-            visit '/box/in'
+            visit '/messages/box/in'
             click_link 'Last'
           end
           it_behaves_like(
@@ -30,7 +30,7 @@ RSpec.feature 'Boxes' do
             subject { page }
             it do
               should_not have_css(
-                'li.dropdown a.dropdown-toggle',
+                'details.message-train-dropdown-nav-item summary',
                 text: 'Roles'
               )
             end
@@ -47,8 +47,8 @@ RSpec.feature 'Boxes' do
             subject { page }
             it do
               should have_css(
-                "#message_train_conversation_#{attachment_conversation.id} "\
-                  '.glyphicon-paperclip'
+                "#message_train_conversation_#{attachment_conversation.id} " \
+                '.message-train-icon'
               )
             end
           end
@@ -68,7 +68,7 @@ RSpec.feature 'Boxes' do
         describe 'at /box/in' do
           describe 'using the buttons on each conversation' do
             before do
-              visit '/box/in'
+              visit '/messages/box/in'
               click_link 'Last'
               within "#message_train_conversation_#{unread_conversation.id}" do
                 accept_confirm do
@@ -76,6 +76,7 @@ RSpec.feature 'Boxes' do
                 end
               end
             end
+            after { undo_leaked_mark(:untrash) }
             it_behaves_like(
               'a bootstrap page with an alert',
               'info',
@@ -84,9 +85,8 @@ RSpec.feature 'Boxes' do
           end
           describe 'without checking anything' do
             before do
-              visit '/box/in'
-              click_button 'Mark'
-              click_link 'mark-read'
+              visit '/messages/box/in'
+              click_button 'mark-read'
             end
             it_behaves_like(
               'a bootstrap page with an alert',
@@ -97,12 +97,16 @@ RSpec.feature 'Boxes' do
           describe 'after checking a box' do
             describe 'Marking Read' do
               before do
-                visit '/box/in'
-                click_link 'Last'
-                check "objects_conversations_#{unread_conversation.id}"
-                click_button 'Mark'
-                click_link 'mark-read'
+                visit '/messages/box/in'
+                # Marking touches updated_at, which can move the
+                # conversation off the last page if an earlier example
+                # already marked it - only paginate there if needed.
+                checkbox = "objects_conversations_#{unread_conversation.id}"
+                click_link 'Last' unless page.has_field?(checkbox)
+                check checkbox
+                click_button 'mark-read'
               end
+              after { undo_leaked_mark(:unread) }
               it_behaves_like(
                 'a bootstrap page with an alert',
                 'info',
@@ -111,12 +115,13 @@ RSpec.feature 'Boxes' do
             end
             describe 'Marking Ignored' do
               before do
-                visit '/box/in'
-                click_link 'Last'
-                check "objects_conversations_#{unread_conversation.id}"
-                click_button 'Mark'
-                click_link 'mark-ignored'
+                visit '/messages/box/in'
+                checkbox = "objects_conversations_#{unread_conversation.id}"
+                click_link 'Last' unless page.has_field?(checkbox)
+                check checkbox
+                click_button 'mark-ignored'
               end
+              after { undo_leaked_mark(:unignore) }
               it_behaves_like(
                 'a bootstrap page with an alert',
                 'info',
@@ -132,7 +137,7 @@ RSpec.feature 'Boxes' do
       describe 'Showing' do
         describe 'at /collectives/groups:membered-group/box/in' do
           before do
-            visit '/collectives/groups:membered-group/box/in'
+            visit '/messages/collectives/groups:membered-group/box/in'
           end
           it_behaves_like(
             'a bootstrap page listing a collection of items',
@@ -147,9 +152,8 @@ RSpec.feature 'Boxes' do
         describe 'at /collectives/groups:membered-group/box/in' do
           describe 'without checking anything' do
             before do
-              visit '/collectives/groups:membered-group/box/in'
-              click_button 'Mark'
-              click_link 'mark-read'
+              visit '/messages/collectives/groups:membered-group/box/in'
+              click_button 'mark-read'
             end
             it_behaves_like(
               'a bootstrap page with an alert',
@@ -160,11 +164,11 @@ RSpec.feature 'Boxes' do
           describe 'after checking a box' do
             describe 'Marking Read' do
               before do
-                visit '/collectives/groups:membered-group/box/in'
+                visit '/messages/collectives/groups:membered-group/box/in'
                 check "objects_conversations_#{membered_group_conversation.id}"
-                click_button 'Mark'
-                click_link 'mark-read'
+                click_button 'mark-read'
               end
+              after { undo_leaked_mark(:unread, conversation: membered_group_conversation) }
               it_behaves_like(
                 'a bootstrap page with an alert',
                 'info',
@@ -173,11 +177,11 @@ RSpec.feature 'Boxes' do
             end
             describe 'Marking Ignored' do
               before do
-                visit '/collectives/groups:membered-group/box/in'
+                visit '/messages/collectives/groups:membered-group/box/in'
                 check "objects_conversations_#{membered_group_conversation.id}"
-                click_button 'Mark'
-                click_link 'mark-ignored'
+                click_button 'mark-ignored'
               end
+              after { undo_leaked_mark(:unignore, conversation: membered_group_conversation) }
               it_behaves_like(
                 'a bootstrap page with an alert',
                 'info',
@@ -198,12 +202,12 @@ RSpec.feature 'Boxes' do
     describe 'Showing' do
       describe 'at /box/in' do
         before do
-          visit '/box/in'
+          visit '/messages/box/in'
         end
 
         describe 'lists Roles dropdown' do
           subject { page }
-          it { should have_css('li.dropdown a.dropdown-toggle', text: 'Roles') }
+          it { should have_css('details.message-train-dropdown-nav-item summary', text: 'Roles') }
         end
       end
     end
@@ -216,12 +220,12 @@ RSpec.feature 'Boxes' do
     describe 'Showing' do
       describe 'at /box/in' do
         before do
-          visit '/box/in'
+          visit '/messages/box/in'
         end
 
         describe 'lists Roles dropdown' do
           subject { page }
-          it { should have_css('li.dropdown a.dropdown-toggle', text: 'Roles') }
+          it { should have_css('details.message-train-dropdown-nav-item summary', text: 'Roles') }
         end
       end
     end

data/spec/features/conversations_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 RSpec.feature 'Conversations' do
   include_context 'loaded site'
 
-  it_behaves_like 'an authenticated section', '/box/in/conversations/1'
+  it_behaves_like 'an authenticated section', '/messages/box/in/conversations/1'
 
   describe 'When logged in' do
     before do
@@ -11,7 +11,7 @@ RSpec.feature 'Conversations' do
     describe 'Showing' do
       describe 'at /box/in/conversations/:id' do
         before do
-          visit "/box/in/conversations/#{unread_conversation.id}"
+          visit "/messages/box/in/conversations/#{unread_conversation.id}"
         end
         it_behaves_like(
           'a bootstrap page showing an item',
@@ -31,9 +31,14 @@ RSpec.feature 'Conversations' do
       describe 'at /box/in/conversations/:id' do
         describe 'Marking Read' do
           before do
-            visit "/box/in/conversations/#{unread_conversation.id}"
-            click_link "mark_read_#{unread_message.id}"
+            visit "/messages/box/in/conversations/#{unread_conversation.id}"
+            # An earlier example may have already marked this message read;
+            # toggle it back to unread first so this test always exercises
+            # (and can assert on) the read-marking action itself.
+            click_button "mark_unread_#{unread_message.id}" if page.has_button?("mark_unread_#{unread_message.id}")
+            click_button "mark_read_#{unread_message.id}"
           end
+          after { undo_leaked_mark(:unread) }
           it_behaves_like(
             'a bootstrap page with an alert',
             'info',
@@ -42,11 +47,13 @@ RSpec.feature 'Conversations' do
         end
         describe 'Marking Ignored' do
           before do
-            visit "/box/in/conversations/#{unread_conversation.id}"
+            visit "/messages/box/in/conversations/#{unread_conversation.id}"
+            click_button 'Mark as Unignored' if page.has_button?('Mark as Unignored')
             accept_confirm do
-              click_link 'Mark as Ignored'
+              click_button 'Mark as Ignored'
             end
           end
+          after { undo_leaked_mark(:unignore) }
           it_behaves_like(
             'a bootstrap page with an alert',
             'info',