message_train 0.6.17 → 0.7.1

data/spec/controllers/message_train/boxes_controller_spec.rb

@@ -29,7 +29,7 @@ describe MessageTrain::BoxesController do
 
   describe 'GET #show' do
     before do
-      get :show, division: 'in'
+      get :show, params: { division: 'in' }
     end
     it_should_behave_like 'a successful page', which_renders: 'show'
 
@@ -50,9 +50,11 @@ describe MessageTrain::BoxesController do
       before do
         put(
           :update,
-          division: 'in',
-          mark_to_set: 'read',
-          objects: invalid_params
+          params: {
+            division: 'in',
+            mark_to_set: 'read',
+            objects: invalid_params
+          }
         )
       end
       it_should_behave_like 'a 404 Not Found error'
@@ -61,9 +63,11 @@ describe MessageTrain::BoxesController do
       before do
         put(
           :update,
-          division: 'in',
-          mark_to_set: 'read',
-          objects: disallowed_params
+          params: {
+            division: 'in',
+            mark_to_set: 'read',
+            objects: disallowed_params
+          }
         )
       end
       it_should_behave_like(
@@ -73,15 +77,23 @@ describe MessageTrain::BoxesController do
     end
     describe 'without params' do
       before do
-        put :update, division: 'in'
+        put :update, params: { division: 'in' }
       end
       it_should_behave_like 'a page with an alert message', 'Nothing to do'
     end
     describe 'with valid params' do
       before do
-        put :update, division: 'in', mark_to_set: 'read', objects: valid_params
+        put(
+          :update,
+          params: {
+            division: 'in',
+            mark_to_set: 'read',
+            objects: valid_params
+          }
+        )
       end
       it_should_behave_like 'a page with a notice message', 'Update successful'
+      it_should_behave_like 'a response without error'
     end
   end
 
@@ -90,16 +102,18 @@ describe MessageTrain::BoxesController do
       before do
         delete(
           :destroy,
-          division: 'in',
-          mark_to_set: 'ignore',
-          objects: invalid_params
+          params: {
+            division: 'in',
+            mark_to_set: 'ignore',
+            objects: invalid_params
+          }
         )
       end
       it_should_behave_like 'a 404 Not Found error'
     end
     describe 'without params' do
       before do
-        delete :destroy, division: 'in'
+        delete :destroy, params: { division: 'in' }
       end
       it_should_behave_like 'a page with an alert message', 'Nothing to do'
     end
@@ -108,9 +122,11 @@ describe MessageTrain::BoxesController do
         before do
           delete(
             :destroy,
-            division: 'in',
-            mark_to_set: 'ignore',
-            objects: valid_params
+            params: {
+              division: 'in',
+              mark_to_set: 'ignore',
+              objects: valid_params
+            }
           )
         end
         it_should_behave_like(
@@ -122,9 +138,11 @@ describe MessageTrain::BoxesController do
         before do
           delete(
             :destroy,
-            division: 'in',
-            mark_to_set: 'unignore',
-            objects: valid_params
+            params: {
+              division: 'in',
+              mark_to_set: 'unignore',
+              objects: valid_params
+            }
           )
         end
         it_should_behave_like(

data/spec/controllers/message_train/concerns_spec.rb

@@ -9,7 +9,13 @@ describe MessageTrain::BoxesController do
     describe 'when neither sending nor receiving is allowed' do
       before do
         login_user third_user
-        get :show, division: 'in', collective_id: 'groups:first-group'
+        get(
+          :show,
+          params: {
+            division: 'in',
+            collective_id: 'groups:first-group'
+          }
+        )
       end
       it_should_behave_like(
         'a redirect with error',
@@ -21,7 +27,13 @@ describe MessageTrain::BoxesController do
     describe 'when only sending is allowed' do
       before do
         login_user first_user
-        get :show, division: 'in', collective_id: 'groups:first-group'
+        get(
+          :show,
+          params: {
+            division: 'in',
+            collective_id: 'groups:first-group'
+          }
+        )
       end
       it_should_behave_like(
         'a redirect with error',
@@ -33,7 +45,13 @@ describe MessageTrain::BoxesController do
     describe 'when only receiving is allowed' do
       before do
         login_user first_user
-        get :show, division: 'sent', collective_id: 'groups:membered-group'
+        get(
+          :show,
+          params: {
+            division: 'sent',
+            collective_id: 'groups:membered-group'
+          }
+        )
       end
       it_should_behave_like(
         'a redirect with error',

data/spec/controllers/message_train/conversations_controller_spec.rb

@@ -18,7 +18,7 @@ describe MessageTrain::ConversationsController do
 
   describe 'GET #show' do
     before do
-      get :show, box_division: 'in', id: unread_conversation.id
+      get :show, params: { box_division: 'in', id: unread_conversation.id }
     end
     it_should_behave_like 'a successful page', which_renders: 'show'
 
@@ -43,17 +43,19 @@ describe MessageTrain::ConversationsController do
       before do
         put(
           :update,
-          box_division: 'in',
-          id: unread_conversation.id,
-          mark_to_set: 'read',
-          objects: invalid_params
+          params: {
+            box_division: 'in',
+            id: unread_conversation.id,
+            mark_to_set: 'read',
+            objects: invalid_params
+          }
         )
       end
       it_should_behave_like 'a 404 Not Found error'
     end
     describe 'without params' do
       before do
-        put :update, box_division: 'in', id: unread_conversation.id
+        put :update, params: { box_division: 'in', id: unread_conversation.id }
       end
       it_should_behave_like 'a page with an alert message', 'Nothing to do'
     end
@@ -61,10 +63,12 @@ describe MessageTrain::ConversationsController do
       before do
         put(
           :update,
-          box_division: 'in',
-          id: unread_conversation.id,
-          mark_to_set: 'read',
-          objects: valid_params
+          params: {
+            box_division: 'in',
+            id: unread_conversation.id,
+            mark_to_set: 'read',
+            objects: valid_params
+          }
         )
       end
       it_should_behave_like 'a page with a notice message', 'Update successful'
@@ -74,13 +78,28 @@ describe MessageTrain::ConversationsController do
   describe 'DELETE #destroy' do
     describe 'with invalid params' do
       before do
-        delete :destroy, box_division: 'in', id: 999, mark_to_set: 'ignore'
+        delete(
+          :destroy,
+          params:
+            {
+              box_division: 'in',
+              id: 999,
+              mark_to_set: 'ignore'
+            }
+        )
       end
       it_should_behave_like 'a 404 Not Found error'
     end
     describe 'without params' do
       before do
-        delete :destroy, box_division: 'in', id: unread_conversation.id
+        delete(
+          :destroy,
+          params:
+            {
+              box_division: 'in',
+              id: unread_conversation.id
+            }
+        )
       end
       it_should_behave_like 'a page with an alert message', 'Nothing to do'
     end
@@ -89,9 +108,11 @@ describe MessageTrain::ConversationsController do
         before do
           delete(
             :destroy,
-            box_division: 'in',
-            id: unread_conversation.id,
-            mark_to_set: 'ignore'
+            params: {
+              box_division: 'in',
+              id: unread_conversation.id,
+              mark_to_set: 'ignore'
+            }
           )
         end
         it_should_behave_like(
@@ -103,9 +124,11 @@ describe MessageTrain::ConversationsController do
         before do
           delete(
             :destroy,
-            box_division: 'in',
-            id: unread_conversation.id,
-            mark_to_set: 'unignore'
+            params: {
+              box_division: 'in',
+              id: unread_conversation.id,
+              mark_to_set: 'unignore'
+            }
           )
         end
         it_should_behave_like(

data/spec/controllers/message_train/messages_controller_spec.rb

@@ -21,7 +21,7 @@ describe MessageTrain::MessagesController do
   end
 
   let(:invalid_attributes) do
-    { subject: nil }
+    { subject: '' }
   end
 
   before do
@@ -30,7 +30,14 @@ describe MessageTrain::MessagesController do
 
   describe 'GET #show' do
     before do
-      get :show, box_division: 'in', id: unread_message.id, format: :json
+      get(
+        :show,
+        params: {
+          box_division: 'in',
+          id: unread_message.id
+        },
+        format: :json
+      )
     end
     it_should_behave_like 'a successful page', which_renders: 'show'
 
@@ -49,8 +56,10 @@ describe MessageTrain::MessagesController do
     before do
       get(
         :new,
-        box_division: 'in',
-        conversation_id: unread_message.message_train_conversation_id
+        params: {
+          box_division: 'in',
+          conversation_id: unread_message.message_train_conversation_id
+        }
       )
     end
     it_should_behave_like 'a successful page', which_renders: 'new'
@@ -70,20 +79,36 @@ describe MessageTrain::MessagesController do
   describe 'GET #edit' do
     describe 'as someone other than the owner' do
       before do
-        get :edit, box_division: 'in', id: someone_elses_message.id
+        get(
+          :edit,
+          params: {
+            box_division: 'in',
+            id: someone_elses_message.id
+          }
+        )
       end
       it_should_behave_like 'a 404 Not Found error'
     end
     describe 'as the owner' do
       describe 'when message is a not a draft' do
         before do
-          get :edit, box_division: 'in', id: unread_message.id
+          get(
+            :edit, params: {
+              box_division: 'in',
+              id: unread_message.id
+            }
+          )
         end
         it_should_behave_like 'a 404 Not Found error'
       end
       describe 'when message is a draft' do
         before do
-          get :edit, box_division: 'in', id: draft_message.id
+          get(
+            :edit, params: {
+              box_division: 'in',
+              id: draft_message.id
+            }
+          )
         end
         it_should_behave_like 'a successful page', which_renders: 'edit'
 
@@ -99,7 +124,13 @@ describe MessageTrain::MessagesController do
     describe 'with valid attributes' do
       describe 'when draft' do
         before do
-          post :create, box_division: 'in', message: draft_attributes
+          post(
+            :create,
+            params: {
+              box_division: 'in',
+              message: draft_attributes
+            }
+          )
         end
         it_should_behave_like 'a redirect to', '/box/drafts'
         it_should_behave_like 'a response without error'
@@ -111,7 +142,13 @@ describe MessageTrain::MessagesController do
       end
       describe 'when not draft' do
         before do
-          post :create, box_division: 'in', message: valid_attributes
+          post(
+            :create,
+            params: {
+              box_division: 'in',
+              message: valid_attributes
+            }
+          )
         end
         it_should_behave_like 'a redirect to', '/box/sent'
         it_should_behave_like 'a response without error'
@@ -125,34 +162,62 @@ describe MessageTrain::MessagesController do
     describe 'with valid attributes, counting' do
       it 'results in a new conversation' do
         expect do
-          post(:create, box_division: 'in', message: valid_attributes)
+          post(
+            :create,
+            params: {
+              box_division: 'in', message: valid_attributes
+            }
+          )
         end.to change { MessageTrain::Conversation.count }.by(1)
       end
       it 'results in a new message' do
         expect do
-          post(:create, box_division: 'in', message: valid_attributes)
+          post(
+            :create,
+            params: {
+              box_division: 'in', message: valid_attributes
+            }
+          )
         end.to change { MessageTrain::Message.count }.by(1)
       end
       it 'results in new receipts' do
         expect do
-          post(:create, box_division: 'in', message: valid_attributes)
+          post(
+            :create,
+            params: {
+              box_division: 'in', message: valid_attributes
+            }
+          )
         end.to change { MessageTrain::Receipt.count }.by(3)
       end
       it 'results in email notifications' do
         expect do
-          post(:create, box_division: 'in', message: valid_attributes)
+          post(
+            :create,
+            params: {
+              box_division: 'in', message: valid_attributes
+            }
+          )
         end.to change { ActionMailer::Base.deliveries.count }.by(2)
       end
     end
     describe 'with invalid params' do
       before do
-        post :create, box_division: 'in', message: invalid_attributes
+        post(
+          :create,
+          params: {
+            box_division: 'in',
+            message: invalid_attributes
+          }
+        )
       end
       it_should_behave_like 'a successful page', which_renders: 'new'
 
       context 'loads the given message into @message' do
         subject { assigns(:message) }
-        it { should be_a_new(MessageTrain::Message).with(invalid_attributes) }
+        it do
+          should be_a_new(MessageTrain::Message).with(invalid_attributes)
+        end
       end
 
       context "sets the flash with the message's errors" do
@@ -164,7 +229,13 @@ describe MessageTrain::MessagesController do
     describe 'with invalid params, counting' do
       it 'does not result in a new message' do
         expect do
-          post :create, box_division: 'in', message: invalid_attributes
+          post(
+            :create,
+            params: {
+              box_division: 'in',
+              message: invalid_attributes
+            }
+          )
         end.to_not change { MessageTrain::Message.count }
       end
     end
@@ -175,9 +246,11 @@ describe MessageTrain::MessagesController do
       before do
         put(
           :update,
-          box_division: 'in',
-          id: someone_elses_message.id,
-          message: valid_attributes
+          params: {
+            box_division: 'in',
+            id: someone_elses_message.id,
+            message: valid_attributes
+          }
         )
       end
       it_should_behave_like 'a 404 Not Found error'
@@ -187,9 +260,11 @@ describe MessageTrain::MessagesController do
         before do
           put(
             :update,
-            box_division: 'in',
-            id: draft_message.id,
-            message: invalid_attributes
+            params: {
+              box_division: 'in',
+              id: draft_message.id,
+              message: invalid_attributes
+            }
           )
         end
         it_should_behave_like 'a successful page', which_renders: 'edit'
@@ -211,9 +286,11 @@ describe MessageTrain::MessagesController do
           before do
             put(
               :update,
-              box_division: 'in',
-              id: sent_message.id,
-              message: valid_attributes
+              params: {
+                box_division: 'in',
+                id: sent_message.id,
+                message: valid_attributes
+              }
             )
           end
           it_should_behave_like 'a 404 Not Found error'
@@ -223,9 +300,11 @@ describe MessageTrain::MessagesController do
             before do
               put(
                 :update,
-                box_division: 'in',
-                id: draft_message.id,
-                message: valid_attributes
+                params: {
+                  box_division: 'in',
+                  id: draft_message.id,
+                  message: valid_attributes
+                }
               )
             end
             it_should_behave_like 'a redirect to', '/box/sent'
@@ -257,9 +336,11 @@ describe MessageTrain::MessagesController do
             before do
               put(
                 :update,
-                box_division: 'in',
-                id: draft_message.id,
-                message: edited_draft_message
+                params: {
+                  box_division: 'in',
+                  id: draft_message.id,
+                  message: edited_draft_message
+                }
               )
             end
             it_should_behave_like(