diff options
| author | Michel Engelen <michel.engelen@diva-e.com> | 2019-06-14 14:04:36 +0200 |
|---|---|---|
| committer | Michel Engelen <michel@nomorejs.net> | 2019-07-02 14:29:54 +0200 |
| commit | 6f7c27cee07de77a3b4de398ccba6b98cd2ebd5f (patch) | |
| tree | 30fa7b0a1dd38ffa29305366518de602acb95951 /spec/features | |
| parent | 385ef2abf7199cfdf1b29279f06c41ebb388920f (diff) | |
| download | gitlab-ce-6f7c27cee07de77a3b4de398ccba6b98cd2ebd5f.tar.gz | |
fixed remaining specs for !29553
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb index bf81b2485ff..f6dccb5e98a 100644 --- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb @@ -40,7 +40,7 @@ describe 'Resolving all open threads in a merge request from an issue', :js do find(resolve_all_discussions_link_selector).click end - it_behaves_like 'creating an issue for a discussion' + it_behaves_like 'creating an issue for a thread' end context 'for a project where all threads need to be resolved before merging' do @@ -79,7 +79,7 @@ describe 'Resolving all open threads in a merge request from an issue', :js do page.click_link 'Create an issue to resolve them later', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) end - it_behaves_like 'creating an issue for a discussion' + it_behaves_like 'creating an issue for a thread' end end end |