From 6d7ba96c4f403cef61f8ca8bbb81c09e8819d179 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Aug 2017 17:46:43 +0200 Subject: [PATCH] Remove locals option from render_template assertion The locals option is only supported in ActionView::TestCase, so it is ignored anyway (even worse, it disabled the complete assertion). I added some more assertions to ensure the template is rendered with the correct conversation. closes #7588 --- spec/controllers/conversations_controller_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb index dd6b64677..49def945c 100644 --- a/spec/controllers/conversations_controller_spec.rb +++ b/spec/controllers/conversations_controller_spec.rb @@ -483,7 +483,9 @@ describe ConversationsController, :type => :controller do it "returns html of conversation" do get :raw, params: {conversation_id: conversation.id} - expect(response).to render_template(partial: "show", locals: {conversation: conversation}) + expect(response).to render_template(partial: "conversations/_show") + expect(response.body).to include conversation.subject + expect(response.body).to include conversation.messages.first.text end it "returns 404 when requesting non-existant conversation" do -- GitLab