diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/profiles | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/profiles')
-rw-r--r-- | spec/features/profiles/personal_access_tokens_spec.rb | 11 | ||||
-rw-r--r-- | spec/features/profiles/user_edit_profile_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/profiles/user_search_settings_spec.rb | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb index c85657c89d5..379c25d6002 100644 --- a/spec/features/profiles/personal_access_tokens_spec.rb +++ b/spec/features/profiles/personal_access_tokens_spec.rb @@ -22,6 +22,10 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do find("#feed_token").value end + def feed_token_description + "Your feed token authenticates you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar. It is visible in those feed URLs." + end + def disallow_personal_access_token_saves! allow(PersonalAccessTokens::CreateService).to receive(:new).and_return(pat_create_service) @@ -123,8 +127,9 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do allow(Gitlab::CurrentSettings).to receive(:disable_feed_token).and_return(false) visit profile_personal_access_tokens_path - expect(page).to have_content("Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs.") expect(feed_token).to eq(user.feed_token) + + expect(page).to have_content(feed_token_description) end end @@ -133,8 +138,8 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do allow(Gitlab::CurrentSettings).to receive(:disable_feed_token).and_return(true) visit profile_personal_access_tokens_path - expect(page).not_to have_content("Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs.") - expect(page).not_to have_css("#feed_token") + expect(page).to have_no_content(feed_token_description) + expect(page).to have_no_css("#feed_token") end end end diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb index dddca15ae24..d941988d12f 100644 --- a/spec/features/profiles/user_edit_profile_spec.rb +++ b/spec/features/profiles/user_edit_profile_spec.rb @@ -8,6 +8,8 @@ RSpec.describe 'User edit profile' do let(:user) { create(:user) } before do + stub_feature_flags(improved_emoji_picker: false) + sign_in(user) visit(profile_path) end diff --git a/spec/features/profiles/user_search_settings_spec.rb b/spec/features/profiles/user_search_settings_spec.rb index 64a8556e349..0b05e6c9489 100644 --- a/spec/features/profiles/user_search_settings_spec.rb +++ b/spec/features/profiles/user_search_settings_spec.rb @@ -14,7 +14,7 @@ RSpec.describe 'User searches their settings', :js do visit profile_path end - it_behaves_like 'can search settings', 'Public Avatar', 'Main settings' + it_behaves_like 'can search settings', 'Public avatar', 'Main settings' end context 'in preferences page' do |