diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
commit | 167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (patch) | |
tree | dd0ce964cf0db395b0b143a079c58bb4aabae591 /spec/features/issues | |
parent | 411cc77938f99b495e0fe802705d275a28e939ef (diff) | |
download | gitlab-ce-167894d0e7c98aae1c6d4f5a060ad6d58ea3f382.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/issues')
-rw-r--r-- | spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb | 2 |
2 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 7d3df711555..a3742af31de 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 @@ -11,7 +11,7 @@ describe 'Resolving all open threads in a merge request from an issue', :js do def resolve_all_discussions_link_selector text = "Resolve all threads in new issue" url = new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) - %Q{a[data-original-title="#{text}"][href="#{url}"]} + %Q{a[title="#{text}"][href="#{url}"]} end describe 'as a user with access to the project' do 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 8f4083533b3..1c17b39c03a 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 @@ -11,7 +11,7 @@ describe 'Resolve an open thread in a merge request by creating an issue', :js d def resolve_discussion_selector 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}\"]" + "a[title=\"#{title}\"][href=\"#{url}\"]" end describe 'As a user with access to the project' do |