summaryrefslogtreecommitdiff
path: root/spec/javascripts/fixtures
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-03 16:09:59 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-03 16:09:59 -0500
commitb623807682022a54344d8213d6f1c902be6ade37 (patch)
tree478ee3a25d67cb452aac09cfd42967fcfc7c22b9 /spec/javascripts/fixtures
parent28060caa0ade7566a38e3ed17f2db8bf9116dc1b (diff)
parent81002745184df28fc9d969afc524986279c653bb (diff)
downloadgitlab-ce-b623807682022a54344d8213d6f1c902be6ade37.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'spec/javascripts/fixtures')
-rw-r--r--spec/javascripts/fixtures/merge_requests.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index 767db7e1868..4bc2205e642 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -59,6 +59,11 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
render_merge_request(example.description, merge_request)
end
+ it 'merge_requests/merge_request_with_comment.html.raw' do |example|
+ create(:note_on_merge_request, author: admin, project: project, noteable: merge_request, note: '- [ ] Task List Item')
+ render_merge_request(example.description, merge_request)
+ end
+
private
def render_merge_request(fixture_file_name, merge_request)