Commit 9e783bc0 authored by James Edwards-Jones's avatar James Edwards-Jones

Protected tag EE merge spec fixes

parent 31ca2b3a
...@@ -61,11 +61,9 @@ RSpec.shared_examples "protected branches > access control > EE" do ...@@ -61,11 +61,9 @@ RSpec.shared_examples "protected branches > access control > EE" do
click_on "Protect" click_on "Protect"
within(".js-protected-branch-edit-form") do users.each { |user| set_allowed_to(git_operation, user.name, form: ".js-protected-branch-edit-form") }
users.each { |user| set_allowed_to(git_operation, user.name) } groups.each { |group| set_allowed_to(git_operation, group.name, form: ".js-protected-branch-edit-form") }
groups.each { |group| set_allowed_to(git_operation, group.name) } roles.each { |(_, access_type_name)| set_allowed_to(git_operation, access_type_name, form: ".js-protected-branch-edit-form") }
roles.each { |(_, access_type_name)| set_allowed_to(git_operation, access_type_name) }
end
wait_for_ajax wait_for_ajax
...@@ -128,9 +126,8 @@ RSpec.shared_examples "protected branches > access control > EE" do ...@@ -128,9 +126,8 @@ RSpec.shared_examples "protected branches > access control > EE" do
end end
expect(ProtectedBranch.last.push_access_levels.map(&:access_level)).not_to include(0) expect(ProtectedBranch.last.push_access_levels.map(&:access_level)).not_to include(0)
within(".js-protected-branch-edit-form") do set_allowed_to('push', 'No one', form: '.js-protected-branch-edit-form')
set_allowed_to('push', 'No one')
end
wait_for_ajax wait_for_ajax
roles.each do |(access_type_id, _)| roles.each do |(access_type_id, _)|
......
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