diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 20:51:18 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 20:51:18 +0900 |
| commit | 83c3c19ce5eb6a88cd9ed428fa0f8d68d5fa7167 (patch) | |
| tree | 7ce4872ebca1926b61a37f552a307b92276dc306 /spec/controllers | |
| parent | 6c712667abdc3a5a51dc0ac15a7cbe56b603badb (diff) | |
| parent | 377916ed72cf31ee31e463f395993d1ec0dc579b (diff) | |
| download | gitlab-ce-83c3c19ce5eb6a88cd9ed428fa0f8d68d5fa7167.tar.gz | |
Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-clusters-page-10-2-vermove-kubernetes-from-service-to-clusters-page-10-2-ver
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/notes_controller_spec.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 43afcc14957..5f5a789d5cc 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -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 @@ -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 @@ -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 @@ -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 context 'when user cannot read commit' do @@ -133,6 +137,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 |
