Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-13 16:51:59 +0300
committerMichel Engelen <michel@nomorejs.net>2019-07-02 15:29:53 +0300
commit271016318f7e5eeb9c7e4a8bf1e6a674eb35ed74 (patch)
tree96f148bfe2eb8ef59fb41619e1c1df1959945cbf /spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
parentffd0531068c9d168f18b4a8e4a742403d4086b2e (diff)
updated tests for !29553
Diffstat (limited to 'spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb')
-rw-r--r--spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb4
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 f6dccb5e98a..bf81b2485ff 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 thread'
+ it_behaves_like 'creating an issue for a discussion'
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 thread'
+ it_behaves_like 'creating an issue for a discussion'
end
end
end