Conversations: render validation errors with 422 on disallowed participants for create/update; update request specs

Author: rsmithlal

app/controllers/better_together/conversations_controller.rb

@@ -42,9 +42,9 @@ def create # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
               'form_errors',
               partial: 'layouts/better_together/errors',
               locals: { object: @conversation }
-            )
+            ), status: :unprocessable_entity
           end
-          format.html { render :new }
+          format.html { render :new, status: :unprocessable_entity }
         end
       elsif @conversation.save
         @conversation.participants << helpers.current_person
@@ -82,9 +82,9 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
                 'form_errors',
                 partial: 'layouts/better_together/errors',
                 locals: { object: @conversation }
-              )
+              ), status: :unprocessable_entity
             end
-            format.html { redirect_to conversations_path, alert: t('better_together.conversations.errors.no_permitted_participants') }
+            format.html { render :show, status: :unprocessable_entity }
           end
         elsif @conversation.update(filtered_params)
           @messages = @conversation.messages.with_all_rich_text.includes(sender: [:string_translations])

spec/requests/better_together/conversations_request_spec.rb

@@ -57,7 +57,7 @@
 
       before { login(regular_user.email, 'password12345') }
 
-      it 'filters out non-permitted participant_ids on create' do
+      it 'creates conversation with permitted participants (opted-in) and excludes non-permitted' do
         post better_together.conversations_path(locale: I18n.default_locale), params: {
           conversation: {
             title: 'Hello',
@@ -81,7 +81,7 @@
             participant_ids: [non_opted_person.id]
           }
         }
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_http_status(:unprocessable_entity)
         expect(BetterTogether::Conversation.count).to eq(before_count)
         expect(response.body).to include(I18n.t('better_together.conversations.errors.no_permitted_participants'))
       end
@@ -120,8 +120,7 @@
             participant_ids: [non_opted_person.id]
           }
         }
-        expect(response).to have_http_status(:found)
-        follow_redirect!
+        expect(response).to have_http_status(:unprocessable_entity)
         expect(response.body).to include(I18n.t('better_together.conversations.errors.no_permitted_participants'))
       end
     end