diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 09:11:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 09:11:27 +0000 |
| commit | 31522c5182bf14886900131c12d17d004ce28534 (patch) | |
| tree | 9878537b8db031e4525b1993c1d54f267b3d8fe0 /spec/features | |
| parent | ad3b511ba360c7fc09fe519396c6d15f09845d66 (diff) | |
| download | gitlab-ce-31522c5182bf14886900131c12d17d004ce28534.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/groups/navbar_spec.rb | 1 | ||||
| -rw-r--r-- | spec/features/users/email_verification_on_login_spec.rb | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb index b4faa3ce0dd..c2dde1ba3fd 100644 --- a/spec/features/groups/navbar_spec.rb +++ b/spec/features/groups/navbar_spec.rb @@ -14,6 +14,7 @@ RSpec.describe 'Group navbar' do before do insert_package_nav(_('Kubernetes')) + insert_after_nav_item(_('Analytics'), new_nav_item: settings_for_maintainer_nav_item) if Gitlab.ee? stub_config(dependency_proxy: { enabled: false }) stub_config(registry: { enabled: false }) diff --git a/spec/features/users/email_verification_on_login_spec.rb b/spec/features/users/email_verification_on_login_spec.rb index c8301c2fc91..55954d121e1 100644 --- a/spec/features/users/email_verification_on_login_spec.rb +++ b/spec/features/users/email_verification_on_login_spec.rb @@ -150,7 +150,7 @@ RSpec.describe 'Email Verification On Login', :clean_gitlab_redis_rate_limiting code = expect_instructions_email_and_extract_code # Wait for the code to expire before verifying - travel VerifiesWithEmail::TOKEN_VALID_FOR_MINUTES.minutes + 1.second + travel Users::EmailVerification::ValidateTokenService::TOKEN_VALID_FOR_MINUTES.minutes + 1.second verify_code(code) # Expect an error message @@ -268,7 +268,7 @@ RSpec.describe 'Email Verification On Login', :clean_gitlab_redis_rate_limiting verify_code(code) expect(page).to have_content('The code is incorrect. Enter it again, or resend a new code.') - travel VerifiesWithEmail::TOKEN_VALID_FOR_MINUTES.minutes + 1.second + travel Users::EmailVerification::ValidateTokenService::TOKEN_VALID_FOR_MINUTES.minutes + 1.second verify_code(new_code) expect(page).to have_content('The code has expired. Resend a new code and try again.') @@ -335,7 +335,7 @@ RSpec.describe 'Email Verification On Login', :clean_gitlab_redis_rate_limiting mail = find_email_for(user) expect(mail.to).to match_array([user.email]) expect(mail.subject).to eq('Verify your identity') - code = mail.body.parts.first.to_s[/\d{#{VerifiesWithEmail::TOKEN_LENGTH}}/o] + code = mail.body.parts.first.to_s[/\d{#{Users::EmailVerification::GenerateTokenService::TOKEN_LENGTH}}/o] reset_delivered_emails! code end |