summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-14 14:04:36 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-14 14:04:36 +0200
commit3c760560fa0ac47a1d755a81386095b4da05c9fc (patch)
tree80dedc4ac40c6d5a64c1cbcb5f2bdf33e1e5b225
parent2c00b42ec3cc72e027feacc1b5dd90338f781c1c (diff)
downloadgitlab-ce-3c760560fa0ac47a1d755a81386095b4da05c9fc.tar.gz
fixed remaining specs for !29553
-rw-r--r--spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb4
-rw-r--r--spec/support/features/resolving_discussions_in_issues_shared_examples.rb2
2 files changed, 3 insertions, 3 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
diff --git a/spec/support/features/resolving_discussions_in_issues_shared_examples.rb b/spec/support/features/resolving_discussions_in_issues_shared_examples.rb
index 38e5fb155a4..8d0e03134d0 100644
--- a/spec/support/features/resolving_discussions_in_issues_shared_examples.rb
+++ b/spec/support/features/resolving_discussions_in_issues_shared_examples.rb
@@ -1,4 +1,4 @@
-shared_examples 'creating an issue for a discussion' do
+shared_examples 'creating an issue for a thread' do
it 'shows an issue with the title filled in' do
title_field = page.find_field('issue[title]')