From f14507e586a7f75f0fb71a1d8468b7361be860d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 3 Feb 2020 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/projects/settings/operations_settings_spec.rb | 2 +- spec/features/projects/settings/registry_settings_spec.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/features/projects/settings') diff --git a/spec/features/projects/settings/operations_settings_spec.rb b/spec/features/projects/settings/operations_settings_spec.rb index 9bbeb0eb260..72e2865dd6a 100644 --- a/spec/features/projects/settings/operations_settings_spec.rb +++ b/spec/features/projects/settings/operations_settings_spec.rb @@ -61,7 +61,7 @@ describe 'Projects > Settings > For a forked project', :js do within('div#project-dropdown') do click_button('Select project') - click_button('Sentry | Internal') + click_button('Sentry | internal') end click_button('Save changes') diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb index 1a1940f6efb..4c5bc290402 100644 --- a/spec/features/projects/settings/registry_settings_spec.rb +++ b/spec/features/projects/settings/registry_settings_spec.rb @@ -26,11 +26,11 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy' it 'saves expiration policy submit the form' do within '#js-registry-policies' do within '.card-body' do - find('#expiration-policy-toggle button:not(.is-disabled)').click - select('7 days until tags are automatically removed', from: 'expiration-policy-interval') - select('Every day', from: 'expiration-policy-schedule') - select('50 tags per image name', from: 'expiration-policy-latest') - fill_in('expiration-policy-name-matching', with: '*-production') + find('.gl-toggle-wrapper button:not(.is-disabled)').click + select('7 days until tags are automatically removed', from: 'Expiration interval:') + select('Every day', from: 'Expiration schedule:') + select('50 tags per image name', from: 'Number of tags to retain:') + fill_in('Docker tags with names matching this regex pattern will expire:', with: '*-production') end submit_button = find('.card-footer .btn.btn-success') expect(submit_button).not_to be_disabled -- cgit v1.2.3