Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
7fa2ee772f
commit
d56bdb1094
|
@ -66,7 +66,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
|
||||||
admin.update!(time_display_relative: false)
|
admin.update!(time_display_relative: false)
|
||||||
visit admin_user_impersonation_tokens_path(user_id: user.username)
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do
|
||||||
it 'shows absolute times for expires_at' do
|
it 'shows absolute times for expires_at' do
|
||||||
visit profile_personal_access_tokens_path
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -165,7 +165,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
|
||||||
it 'shows absolute times for expires_at' do
|
it 'shows absolute times for expires_at' do
|
||||||
visit project_settings_access_tokens_path(project)
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -41,7 +41,7 @@ RSpec.shared_examples 'a deploy token in settings' do
|
||||||
visit page_path
|
visit page_path
|
||||||
|
|
||||||
within('.deploy-tokens') do
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue