summaryrefslogtreecommitdiff
path: root/spec/features/user_opens_link_to_comment_spec.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-09 10:22:22 -0700
committerStan Hu <stanhu@gmail.com>2019-08-09 10:22:22 -0700
commit916f255bed04cc7ec68d2df26527b862f0ea73e8 (patch)
treebf0a2839600b927b42f9585b37b66fbce67f2cef /spec/features/user_opens_link_to_comment_spec.rb
parentf77ffdafad0a94c8a2af7070710fbfbe88994040 (diff)
parentfe214a217ca95c2c4a53c501f372367fecaf7f99 (diff)
downloadgitlab-ce-916f255bed04cc7ec68d2df26527b862f0ea73e8.tar.gz
Merge branch 'master' into sh-break-out-invited-group-members
Diffstat (limited to 'spec/features/user_opens_link_to_comment_spec.rb')
-rw-r--r--spec/features/user_opens_link_to_comment_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/features/user_opens_link_to_comment_spec.rb b/spec/features/user_opens_link_to_comment_spec.rb
index f1e07e55799..9533a4fe40d 100644
--- a/spec/features/user_opens_link_to_comment_spec.rb
+++ b/spec/features/user_opens_link_to_comment_spec.rb
@@ -18,8 +18,13 @@ describe 'User opens link to comment', :js do
visit Gitlab::UrlBuilder.build(note)
+ wait_for_requests
+
expect(page.find('#discussion-filter-dropdown')).to have_content('Show all activity')
expect(page).not_to have_content('Something went wrong while fetching comments')
+
+ # Auto-switching to show all notes shouldn't be persisted
+ expect(user.reload.notes_filter_for(note.noteable)).to eq(UserPreference::NOTES_FILTERS[:only_activity])
end
end