Replace '.team << [user, role]' with 'add_role(user)' in specs

spec/controllers/projects/mattermosts_controller_spec.rb

@@ -5,7 +5,7 @@ describe Projects::MattermostsController do
   let!(:user) { create(:user) }
   before do
-    project.team << [user, :master]
+    project.add_master(user)
     sign_in(user)
   end

spec/controllers/projects/merge_requests/creations_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::MergeRequests::CreationsController do
   let(:fork_project) { create(:forked_project_with_submodules) }
   before do
-    fork_project.team << [user, :master]
+    fork_project.add_master(user)
     sign_in(user)
   end
@@ -86,7 +86,7 @@ describe Projects::MergeRequests::CreationsController do
       let(:other_project) { create(:project, :repository) }
       before do
-        other_project.team << [user, :master]
+        other_project.add_master(user)
       end
       context 'when the path exists in the diff' do

spec/controllers/projects/merge_requests/diffs_controller_spec.rb

@@ -151,7 +151,7 @@ describe Projects::MergeRequests::DiffsController do
       let(:other_project) { create(:project) }
       before do
-        other_project.team << [user, :master]
+        other_project.add_master(user)
         diff_for_path(old_path: existing_path, new_path: existing_path, project_id: other_project)
       end

spec/controllers/projects/milestones_controller_spec.rb

@@ -11,7 +11,7 @@ describe Projects::MilestonesController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
     controller.instance_variable_set(:@project, project)
   end

spec/controllers/projects/notes_controller_spec.rb

@@ -32,7 +32,7 @@ describe Projects::NotesController do
     before do
       sign_in(user)
-      project.team << [user, :developer]
+      project.add_developer(user)
     end
     it 'passes last_fetched_at from headers to NotesFinder' do
@@ -351,7 +351,7 @@ describe Projects::NotesController do
     before do
       sign_in(note.author)
-      project.team << [note.author, :developer]
+      project.add_developer(note.author)
     end
     it "updates the note" do
@@ -372,7 +372,7 @@ describe Projects::NotesController do
     context 'user is the author of a note' do
       before do
         sign_in(note.author)
-        project.team << [note.author, :developer]
+        project.add_developer(note.author)
       end
       it "returns status 200 for html" do
@@ -389,7 +389,7 @@ describe Projects::NotesController do
     context 'user is not the author of a note' do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       it "returns status 404" do
@@ -403,7 +403,7 @@ describe Projects::NotesController do
   describe 'POST toggle_award_emoji' do
     before do
       sign_in(user)
-      project.team << [user, :developer]
+      project.add_developer(user)
     end
     it "toggles the award emoji" do
@@ -445,7 +445,7 @@ describe Projects::NotesController do
       context "when the user is authorized to resolve the note" do
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         context "when the note is not resolvable" do
@@ -506,7 +506,7 @@ describe Projects::NotesController do
       context "when the user is authorized to resolve the note" do
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         context "when the note is not resolvable" do

spec/controllers/projects/project_members_controller_spec.rb

@@ -21,7 +21,7 @@ describe Projects::ProjectMembersController do
     context 'when user does not have enough rights' do
       before do
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       it 'returns 404' do
@@ -37,7 +37,7 @@ describe Projects::ProjectMembersController do
     context 'when user has enough rights' do
       before do
-        project.team << [user, :master]
+        project.add_master(user)
       end
       it 'adds user to members' do
@@ -106,7 +106,7 @@ describe Projects::ProjectMembersController do
     context 'when member is found' do
       context 'when user does not have enough rights' do
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         it 'returns 404' do
@@ -121,7 +121,7 @@ describe Projects::ProjectMembersController do
       context 'when user has enough rights' do
         before do
-          project.team << [user, :master]
+          project.add_master(user)
         end
         it '[HTML] removes user from members' do
@@ -164,7 +164,7 @@ describe Projects::ProjectMembersController do
     context 'when member is found' do
       context 'and is not an owner' do
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         it 'removes user from members' do
@@ -181,7 +181,7 @@ describe Projects::ProjectMembersController do
         let(:project) { create(:project, namespace: user.namespace) }
         before do
-          project.team << [user, :master]
+          project.add_master(user)
         end
         it 'cannot remove himself from the project' do
@@ -248,7 +248,7 @@ describe Projects::ProjectMembersController do
     context 'when member is found' do
       context 'when user does not have enough rights' do
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         it 'returns 404' do
@@ -263,7 +263,7 @@ describe Projects::ProjectMembersController do
       context 'when user has enough rights' do
         before do
-          project.team << [user, :master]
+          project.add_master(user)
         end
         it 'adds user to members' do
@@ -285,8 +285,8 @@ describe Projects::ProjectMembersController do
     let(:member) { create(:user) }
     before do
-      project.team << [user, :master]
-      another_project.team << [member, :guest]
+      project.add_master(user)
+      another_project.add_guest(member)
       sign_in(user)
     end
@@ -300,7 +300,7 @@ describe Projects::ProjectMembersController do
     context 'when user can access source project members' do
       before do
-        another_project.team << [user, :guest]
+        another_project.add_guest(user)
       end
       include_context 'import applied'
@@ -332,7 +332,7 @@ describe Projects::ProjectMembersController do
     context 'when creating owner' do
       before do
-        project.team << [user, :master]
+        project.add_master(user)
         sign_in(user)
       end
@@ -348,7 +348,7 @@ describe Projects::ProjectMembersController do
     context 'when create master' do
       before do
-        project.team << [user, :master]
+        project.add_master(user)
         sign_in(user)
       end

spec/controllers/projects/refs_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::RefsController do
   before do
     sign_in(user)
-    project.team << [user, :developer]
+    project.add_developer(user)
   end
   describe 'GET #logs_tree' do

spec/controllers/projects/releases_controller_spec.rb

@@ -7,7 +7,7 @@ describe Projects::ReleasesController do
   let!(:tag)     { release.tag }
   before do
-    project.team << [user, :developer]
+    project.add_developer(user)
     sign_in(user)
   end

spec/controllers/projects/repositories_controller_spec.rb

@@ -17,7 +17,7 @@ describe Projects::RepositoriesController do
       let(:user) { create(:user) }
       before do
-        project.team << [user, :developer]
+        project.add_developer(user)
         sign_in(user)
       end

spec/controllers/projects/services_controller_spec.rb

@@ -9,7 +9,7 @@ describe Projects::ServicesController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   describe '#test' do

spec/controllers/projects/settings/ci_cd_controller_spec.rb

@@ -5,7 +5,7 @@ describe Projects::Settings::CiCdController do
   let(:user) { create(:user) }
   before do
-    project.team << [user, :master]
+    project.add_master(user)
     sign_in(user)
   end

spec/controllers/projects/settings/integrations_controller_spec.rb

@@ -5,7 +5,7 @@ describe Projects::Settings::IntegrationsController do
   let(:user) { create(:user) }
   before do
-    project.team << [user, :master]
+    project.add_master(user)
     sign_in(user)
   end

spec/controllers/projects/templates_controller_spec.rb

@@ -8,7 +8,7 @@ describe Projects::TemplatesController do
   let(:body) { JSON.parse(response.body) }
   before do
-    project.team << [user, :developer]
+    project.add_developer(user)
     sign_in(user)
   end

spec/controllers/projects/todos_controller_spec.rb

@@ -20,7 +20,7 @@ describe Projects::TodosController do
       context 'when authorized' do
         before do
           sign_in(user)
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         it 'creates todo for issue' do
@@ -88,7 +88,7 @@ describe Projects::TodosController do
       context 'when authorized' do
         before do
           sign_in(user)
-          project.team << [user, :developer]
+          project.add_developer(user)
         end
         it 'creates todo for merge request' do

spec/controllers/projects/tree_controller_spec.rb

@@ -7,7 +7,7 @@ describe Projects::TreeController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
     controller.instance_variable_set(:@project, project)
   end

spec/controllers/projects/variables_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::VariablesController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   describe 'POST #create' do

spec/controllers/projects_controller_spec.rb

@@ -102,7 +102,7 @@ describe ProjectsController do
         render_views
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
           project.project_feature.update_attribute(:repository_access_level, ProjectFeature::DISABLED)
         end
@@ -437,7 +437,7 @@ describe ProjectsController do
     before do
       sign_in(user)
-      project.team << [user, :developer]
+      project.add_developer(user)
       allow(Gitlab.config.incoming_email).to receive(:enabled).and_return(true)
     end
@@ -465,7 +465,7 @@ describe ProjectsController do
     before do
       sign_in(user)
-      project.team << [user, :developer]
+      project.add_developer(user)
       allow(Gitlab.config.incoming_email).to receive(:enabled).and_return(true)
     end

spec/controllers/uploads_controller_spec.rb

@@ -265,13 +265,13 @@ describe UploadsController do
           context "when the user has access to the project" do
             before do
-              project.team << [user, :master]
+              project.add_master(user)
             end
             context "when the user is blocked" do
               before do
                 user.block
-                project.team << [user, :master]
+                project.add_master(user)
               end
               it "redirects to the sign in page" do
@@ -465,13 +465,13 @@ describe UploadsController do
           context "when the user has access to the project" do
             before do
-              project.team << [user, :master]
+              project.add_master(user)
             end
             context "when the user is blocked" do
               before do
                 user.block
-                project.team << [user, :master]
+                project.add_master(user)
               end
               it "redirects to the sign in page" do

spec/controllers/users_controller_spec.rb

@@ -91,7 +91,7 @@ describe UsersController do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
         push_data = Gitlab::DataBuilder::Push.build_sample(project, user)
@@ -117,7 +117,7 @@ describe UsersController do
       allow_any_instance_of(User).to receive(:contributed_projects_ids).and_return([project.id])
       sign_in(user)
-      project.team << [user, :developer]
+      project.add_developer(user)
     end
     it 'assigns @calendar_date' do

spec/features/admin/admin_projects_spec.rb

@@ -88,7 +88,7 @@ describe "Admin::Projects"  do
   describe 'add admin himself to a project' do
     before do
-      project.team << [user, :master]
+      project.add_master(user)
     end
     it 'adds admin a to a project as developer', :js do
@@ -110,8 +110,8 @@ describe "Admin::Projects"  do
   describe 'admin remove himself from a project' do
     before do
-      project.team << [user, :master]
-      project.team << [current_user, :developer]
+      project.add_master(user)
+      project.add_developer(current_user)
     end
     it 'removes admin from the project' do