diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-06-20 08:18:27 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-06-20 08:31:21 +0300 |
| commit | f7ad9e5abbfd0916a4f93e22d97cbdac17c46986 (patch) | |
| tree | 9ab2f5fec18cad9f67b6eacb63a9e9baf566d731 /spec/javascripts/fixtures/merge_requests.rb | |
| parent | 1c64fa08aeab7e56a4bef7da24840b12eb03b9ac (diff) | |
Fix MR "Changes" diff note up arrow to edit last note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868
While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.
I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
Diffstat (limited to 'spec/javascripts/fixtures/merge_requests.rb')
| -rw-r--r-- | spec/javascripts/fixtures/merge_requests.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb index a746a776548..0715f4d5f6b 100644 --- a/spec/javascripts/fixtures/merge_requests.rb +++ b/spec/javascripts/fixtures/merge_requests.rb @@ -55,13 +55,20 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont render_merge_request(example.description, merge_request) end + it 'merge_requests/changes_tab_with_comments.json' do |example| + create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request) + create(:note_on_merge_request, author: admin, project: project, noteable: merge_request) + render_merge_request(example.description, merge_request, action: :diffs, format: :json) + end + private - def render_merge_request(fixture_file_name, merge_request) - get :show, + def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html) + get action, namespace_id: project.namespace.to_param, project_id: project, - id: merge_request.to_param + id: merge_request.to_param, + format: format expect(response).to be_success store_frontend_fixture(response, fixture_file_name) |