diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /spec/views/profiles | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
download | gitlab-ce-6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde.tar.gz |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'spec/views/profiles')
-rw-r--r-- | spec/views/profiles/keys/_form.html.haml_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/profiles/preferences/show.html.haml_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/profiles/show.html.haml_spec.rb | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/spec/views/profiles/keys/_form.html.haml_spec.rb b/spec/views/profiles/keys/_form.html.haml_spec.rb index c807512a11a..3c61afb21c5 100644 --- a/spec/views/profiles/keys/_form.html.haml_spec.rb +++ b/spec/views/profiles/keys/_form.html.haml_spec.rb @@ -33,9 +33,9 @@ RSpec.describe 'profiles/keys/_form.html.haml' do end it 'has the expires at field', :aggregate_failures do - expect(rendered).to have_field('Expiration date', type: 'date') + expect(rendered).to have_field('Expiration date', type: 'text') expect(page.find_field('Expiration date')['min']).to eq(l(1.day.from_now, format: "%Y-%m-%d")) - expect(rendered).to have_text('Key becomes invalid on this date') + expect(rendered).to have_text( s_('Profiles|Optional but recommended. If set, key becomes invalid on the specified date.')) end it 'has the validation warning', :aggregate_failures do diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb index 2fe941b9f14..4e4499c3252 100644 --- a/spec/views/profiles/preferences/show.html.haml_spec.rb +++ b/spec/views/profiles/preferences/show.html.haml_spec.rb @@ -54,8 +54,8 @@ RSpec.describe 'profiles/preferences/show' do end it 'has helpful homepage setup guidance' do - expect(rendered).to have_field('Homepage content') - expect(rendered).to have_content('Choose what content you want to see on your homepage.') + expect(rendered).to have_field('Dashboard') + expect(rendered).to have_content('Choose what content you want to see by default on your dashboard.') end end diff --git a/spec/views/profiles/show.html.haml_spec.rb b/spec/views/profiles/show.html.haml_spec.rb index daa1d20e6b1..5751d47ee97 100644 --- a/spec/views/profiles/show.html.haml_spec.rb +++ b/spec/views/profiles/show.html.haml_spec.rb @@ -17,6 +17,11 @@ RSpec.describe 'profiles/show' do expect(rendered).to have_field('user_name', with: user.name) expect(rendered).to have_field('user_id', with: user.id) + + expectd_link = help_page_path('user/profile/index', anchor: 'change-the-email-displayed-on-your-commits') + expected_link_html = "<a href=\"#{expectd_link}\" target=\"_blank\" " \ + "rel=\"noopener noreferrer\">#{_('Learn more.')}</a>" + expect(rendered.include?(expected_link_html)).to eq(true) end end end |