Commit 8b50eede authored by Phil Hughes's avatar Phil Hughes

Merge branch '10951-1-style-lint-projects_scss' into 'master'

Fixed `scss/at-extend-no-missing-placeholder` style-lint error for projects.scss

See merge request gitlab-org/gitlab-ee!14707
parents e3a9b2c9 e1ae3ff7
......@@ -5,7 +5,7 @@ import ProtectedEnvironmentEdit from './protected_environment_edit';
export default class ProtectedEnvironmentEditList {
constructor() {
this.$wrap = $('.protected-environments-list');
this.$wrap = $('.protected-branches-list');
this.initEditForm();
}
......
......@@ -5,10 +5,6 @@
}
}
.protected-environments-list {
@extend .protected-branches-list;
}
.project-mirror-settings {
.fingerprint-verified {
color: $green-500;
......
.protected-environments-list.js-protected-environments-list
.protected-branches-list.js-protected-environments-list
- if @protected_environments.empty?
%p.settings-message.text-center
= s_('ProtectedEnvironment|There are currently no protected environments, protect an environment with the form above.')
......
......@@ -44,7 +44,7 @@ describe 'Protected Environments' do
end
it 'allows seeing a list of protected environments' do
within('.protected-environments-list') do
within('.protected-branches-list') do
expect(page).to have_content('production')
expect(page).to have_content('removed environment')
end
......@@ -60,31 +60,31 @@ describe 'Protected Environments' do
wait_for_requests
within('.protected-environments-list') do
within('.protected-branches-list') do
expect(page).to have_content('staging')
end
end
it 'allows updating access to a protected environment', :js, :quarantine do
within('.protected-environments-list tr', text: 'production') do
within('.protected-branches-list tr', text: 'production') do
set_allowed_to_deploy('Developers + Maintainers')
end
visit project_settings_ci_cd_path(project)
within('.protected-environments-list') do
within('.protected-branches-list') do
expect(page).to have_content('1 role, 1 user')
end
end
it 'allows unprotecting an environment', :js do
within('.protected-environments-list tr', text: 'production') do
within('.protected-branches-list tr', text: 'production') do
accept_alert { click_on('Unprotect') }
end
wait_for_requests
within('.protected-environments-list') do
within('.protected-branches-list') do
expect(page).not_to have_content('production')
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment