summaryrefslogtreecommitdiff
path: root/spec/features/issues
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 15:23:24 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:29:03 +0200
commit4cb99ffa2803c8e94544cefe80ab47b032df2226 (patch)
tree5df4d11db1609c11f33324a7f9018d8f45195ae7 /spec/features/issues
parent9c4ea1a3a3993a6a108ab2655cbf1e49b0fd588c (diff)
downloadgitlab-ce-4cb99ffa2803c8e94544cefe80ab47b032df2226.tar.gz
updated tests for change in !29553
Diffstat (limited to 'spec/features/issues')
-rw-r--r--spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index b20730bdb22..cb92b9f8396 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -7,7 +7,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
def resolve_discussion_selector
- title = 'Resolve this discussion in a new issue'
+ title = 'Resolve this thread in a new issue'
url = new_project_issue_path(project, discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid)
"a[data-original-title=\"#{title}\"][href=\"#{url}\"]"
end
@@ -32,7 +32,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
context 'resolving the discussion' do
before do
- click_button 'Resolve discussion'
+ click_button 'Resolve thread'
end
it 'hides the link for creating a new issue' do
@@ -41,7 +41,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
it 'shows the link for creating a new issue when unresolving a discussion' do
page.within '.diff-content' do
- click_button 'Unresolve discussion'
+ click_button 'Unresolve thread'
end
expect(page).to have_css resolve_discussion_selector