Commit 6d7ba96c authored by Benjamin Neff's avatar Benjamin Neff

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
parent 634c13f9
...@@ -483,7 +483,9 @@ describe ConversationsController, :type => :controller do ...@@ -483,7 +483,9 @@ describe ConversationsController, :type => :controller do
it "returns html of conversation" do it "returns html of conversation" do
get :raw, params: {conversation_id: conversation.id} 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 end
it "returns 404 when requesting non-existant conversation" do it "returns 404 when requesting non-existant conversation" do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment