Skip to content
Snippets Groups Projects
Verified Commit d635f8bb authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett
Browse files

Improve discussion_line_code set and update notes_controller_spec

parent 3176eb83
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -107,8 +107,9 @@ module NotesActions
 
diff_discussion_html: diff_discussion_html(discussion),
discussion_html: discussion_html(discussion),
discussion_line_code: discussion.line_code,
)
attrs[:discussion_line_code] = discussion.line_code if discussion.is_a?(DiffDiscussion)
end
end
else
Loading
Loading
Loading
Loading
@@ -59,6 +59,7 @@ describe Projects::NotesController do
expect(note_json[:id]).to eq(note.id)
expect(note_json[:discussion_html]).not_to be_nil
expect(note_json[:diff_discussion_html]).to be_nil
expect(note_json[:discussion_line_code]).to be_nil
end
end
 
Loading
Loading
@@ -74,6 +75,7 @@ describe Projects::NotesController do
expect(note_json[:id]).to eq(note.id)
expect(note_json[:discussion_html]).not_to be_nil
expect(note_json[:diff_discussion_html]).not_to be_nil
expect(note_json[:discussion_line_code]).not_to be_nil
end
end
 
Loading
Loading
@@ -92,6 +94,7 @@ describe Projects::NotesController do
expect(note_json[:id]).to eq(note.id)
expect(note_json[:discussion_html]).not_to be_nil
expect(note_json[:diff_discussion_html]).to be_nil
expect(note_json[:discussion_line_code]).to be_nil
end
end
 
Loading
Loading
@@ -104,6 +107,7 @@ describe Projects::NotesController do
expect(note_json[:id]).to eq(note.id)
expect(note_json[:discussion_html]).to be_nil
expect(note_json[:diff_discussion_html]).to be_nil
expect(note_json[:discussion_line_code]).to be_nil
end
end
end
Loading
Loading
@@ -120,6 +124,7 @@ describe Projects::NotesController do
expect(note_json[:html]).not_to be_nil
expect(note_json[:discussion_html]).to be_nil
expect(note_json[:diff_discussion_html]).to be_nil
expect(note_json[:discussion_line_code]).to be_nil
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment