Update protected branches feature spec to include group-based access levels.

spec/features/protected_branches/access_control_ee_spec.rb

@@ -3,15 +3,22 @@ RSpec.shared_examples "protected branches > access control > EE" do
     # Need to set a default for the `git_operation` access level that _isn't_ being tested
     other_git_operation = git_operation == 'merge' ? 'push' : 'merge'
 
-    it "allows creating protected branches that roles and users can #{git_operation} to" do
-      users = create_list(:user, 5)
+    let(:users) { create_list(:user, 5) }
+    let(:groups) { create_list(:group, 5) }
+
+    before do
       users.each { |user| project.team << [user, :developer] }
+      groups.each { |group| project.project_group_links.create(group: group, group_access: Gitlab::Access::DEVELOPER) }
+    end
+
+    it "allows creating protected branches that roles, users, and groups can #{git_operation} to" do
       roles = access_level_class.human_access_levels
 
       visit namespace_project_protected_branches_path(project.namespace, project)
 
       set_protected_branch_name('master')
       set_allowed_to(git_operation, users.map(&:name))
+      set_allowed_to(git_operation, groups.map(&:name))
       set_allowed_to(git_operation, roles.values)
       set_allowed_to(other_git_operation)
 
@@ -21,11 +28,10 @@ RSpec.shared_examples "protected branches > access control > EE" do
       expect(ProtectedBranch.count).to eq(1)
       roles.each { |(access_type_id, _)| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:access_level)).to include(access_type_id) }
       users.each { |user| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:user_id)).to include(user.id) }
+      groups.each { |group| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:group_id)).to include(group.id) }
     end
 
-    it "allows updating protected branches that roles and users can #{git_operation} to" do
-      users = create_list(:user, 5)
-      users.each { |user| project.team << [user, :developer] }
+    it "allows updating protected branches so that roles and users can #{git_operation} to it" do
       roles = access_level_class.human_access_levels
 
       visit namespace_project_protected_branches_path(project.namespace, project)
@@ -36,7 +42,9 @@ RSpec.shared_examples "protected branches > access control > EE" do
       click_on "Protect"
 
       within(".js-protected-branch-edit-form") do
+
         set_allowed_to(git_operation, users.map(&:name))
+        set_allowed_to(git_operation, groups.map(&:name))
         set_allowed_to(git_operation, roles.values)
       end
 
@@ -45,6 +53,32 @@ RSpec.shared_examples "protected branches > access control > EE" do
       expect(ProtectedBranch.count).to eq(1)
       roles.each { |(access_type_id, _)| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:access_level)).to include(access_type_id) }
       users.each { |user| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:user_id)).to include(user.id) }
+      groups.each { |group| expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym).map(&:group_id)).to include(group.id) }
+    end
+
+    it "allows updating protected branches so that roles and users cannot #{git_operation} to it" do
+      roles = access_level_class.human_access_levels
+
+      visit namespace_project_protected_branches_path(project.namespace, project)
+      set_protected_branch_name('master')
+
+      users.each { |user| set_allowed_to(git_operation, user.name) }
+      roles.each { |(_, access_type_name)| set_allowed_to(git_operation, access_type_name) }
+      groups.each { |group| set_allowed_to(git_operation, group.name) }
+      set_allowed_to(other_git_operation)
+
+      click_on "Protect"
+
+      within(".js-protected-branch-edit-form") do
+        users.each { |user| set_allowed_to(git_operation, user.name) }
+        groups.each { |group| set_allowed_to(git_operation, group.name) }
+        roles.each { |(_, access_type_name)| set_allowed_to(git_operation, access_type_name) }
+      end
+
+      wait_for_ajax
+
+      expect(ProtectedBranch.count).to eq(1)
+      expect(ProtectedBranch.last.send("#{git_operation}_access_levels".to_sym)).to be_empty
     end
 
     it "prepends selected users that can #{git_operation} to" do