summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-22 06:09:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-22 06:09:36 +0000
commitdc90a96501705c4ed40a903e1c463af4e260712f (patch)
tree5ebf5fd6686704b7569c33c8ad1ae735c1ab4cf6 /spec/features
parenta25809b2e5274fcd3251c79171cf1bb7d35f34b3 (diff)
downloadgitlab-ce-dc90a96501705c4ed40a903e1c463af4e260712f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/issues/user_sorts_issue_comments_spec.rb2
-rw-r--r--spec/features/user_opens_link_to_comment_spec.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/issues/user_sorts_issue_comments_spec.rb b/spec/features/issues/user_sorts_issue_comments_spec.rb
index 555f8827374..4b38ce329b8 100644
--- a/spec/features/issues/user_sorts_issue_comments_spec.rb
+++ b/spec/features/issues/user_sorts_issue_comments_spec.rb
@@ -16,7 +16,9 @@ RSpec.describe 'Comment sort direction' do
it 'saves sort order' do
# open dropdown, and select 'Newest first'
page.within('.issuable-details') do
+ find('#discussion-preferences-dropdown').click
click_button('Oldest first')
+ find('#discussion-preferences-dropdown').click
click_button('Newest first')
end
diff --git a/spec/features/user_opens_link_to_comment_spec.rb b/spec/features/user_opens_link_to_comment_spec.rb
index ae84f69f432..3fb1505ff5b 100644
--- a/spec/features/user_opens_link_to_comment_spec.rb
+++ b/spec/features/user_opens_link_to_comment_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe 'User opens link to comment', :js do
wait_for_requests
- expect(page.find('#discussion-filter-dropdown')).to have_content('Show all activity')
+ expect(find('#discussion-preferences-dropdown')).to have_content('Sort or filter')
expect(page).not_to have_content('Something went wrong while fetching comments')
# Auto-switching to show all notes shouldn't be persisted