Commit 03e1645a authored by Michel Engelen's avatar Michel Engelen

updated tests for !29553

parent 603f1161
...@@ -40,7 +40,7 @@ describe 'Resolving all open threads in a merge request from an issue', :js do ...@@ -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 find(resolve_all_discussions_link_selector).click
end end
it_behaves_like 'creating an issue for a thread' it_behaves_like 'creating an issue for a discussion'
end end
context 'for a project where all threads need to be resolved before merging' do 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 ...@@ -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) 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 end
it_behaves_like 'creating an issue for a thread' it_behaves_like 'creating an issue for a discussion'
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment