diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 00:10:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-27 00:10:02 +0300 |
commit | d56bdb10940e35a3d945d44c48ce36087ec1cef1 (patch) | |
tree | a8de406da381dfb547033aa3585e282d3c8ffeaf | |
parent | 7fa2ee772f7cfbaf605336dfcfb4a05021ff7491 (diff) |
Add latest changes from gitlab-org/gitlab@master
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb index 0966032ff37..ed8ea84fbf8 100644 --- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb +++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb @@ -66,7 +66,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do admin.update!(time_display_relative: false) visit admin_user_impersonation_tokens_path(user_id: user.username) - expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %d')) + expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %-d')) end end diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb index 8025db9f86d..8f44299b18f 100644 --- a/spec/features/profiles/personal_access_tokens_spec.rb +++ b/spec/features/profiles/personal_access_tokens_spec.rb @@ -94,7 +94,7 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do it 'shows absolute times for expires_at' do visit profile_personal_access_tokens_path - expect(active_personal_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d')) + expect(active_personal_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %-d')) end end end diff --git a/spec/features/projects/settings/access_tokens_spec.rb b/spec/features/projects/settings/access_tokens_spec.rb index deeab084c5f..4941b936c0c 100644 --- a/spec/features/projects/settings/access_tokens_spec.rb +++ b/spec/features/projects/settings/access_tokens_spec.rb @@ -165,7 +165,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do it 'shows absolute times for expires_at' do visit project_settings_access_tokens_path(project) - expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d')) + expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %-d')) end end end diff --git a/spec/support/shared_examples/features/deploy_token_shared_examples.rb b/spec/support/shared_examples/features/deploy_token_shared_examples.rb index e70f9b52c09..25dfe089f51 100644 --- a/spec/support/shared_examples/features/deploy_token_shared_examples.rb +++ b/spec/support/shared_examples/features/deploy_token_shared_examples.rb @@ -41,7 +41,7 @@ RSpec.shared_examples 'a deploy token in settings' do visit page_path within('.deploy-tokens') do - expect(page).to have_content(deploy_token.expires_at.strftime('%b %d')) + expect(page).to have_content(deploy_token.expires_at.strftime('%b %-d')) end end end |