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

spec/controllers/projects/avatars_controller_spec.rb

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

spec/controllers/projects/blame_controller_spec.rb

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

spec/controllers/projects/blob_controller_spec.rb

@@ -89,7 +89,7 @@ describe Projects::BlobController do
     end
     before do
-      project.team << [user, :master]
+      project.add_master(user)
       sign_in(user)
     end
@@ -147,7 +147,7 @@ describe Projects::BlobController do
       let(:developer) { create(:user) }
       before do
-        project.team << [developer, :developer]
+        project.add_developer(developer)
         sign_in(developer)
         get :edit, default_params
       end
@@ -161,7 +161,7 @@ describe Projects::BlobController do
       let(:master) { create(:user) }
       before do
-        project.team << [master, :master]
+        project.add_master(master)
         sign_in(master)
         get :edit, default_params
       end
@@ -190,7 +190,7 @@ describe Projects::BlobController do
     end
     before do
-      project.team << [user, :master]
+      project.add_master(user)
       sign_in(user)
     end

spec/controllers/projects/boards_controller_spec.rb

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

spec/controllers/projects/branches_controller_spec.rb

@@ -6,8 +6,8 @@ describe Projects::BranchesController do
   let(:developer) { create(:user) }
   before do
-    project.team << [user, :master]
-    project.team << [user, :developer]
+    project.add_master(user)
+    project.add_developer(user)
     allow(project).to receive(:branches).and_return(['master', 'foo/bar/baz'])
     allow(project).to receive(:tags).and_return(['v1.0.0', 'v2.0.0'])

spec/controllers/projects/commits_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::CommitsController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   describe "GET show" do

spec/controllers/projects/compare_controller_spec.rb

@@ -8,7 +8,7 @@ describe Projects::CompareController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   it 'compare shows some diffs' do

spec/controllers/projects/cycle_analytics_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::CycleAnalyticsController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   describe 'cycle analytics not set up flag' do

spec/controllers/projects/deploy_keys_controller_spec.rb

@@ -5,7 +5,7 @@ describe Projects::DeployKeysController do
   let(:user) { create(:user) }
   before do
-    project.team << [user, :master]
+    project.add_master(user)
     sign_in(user)
   end
@@ -48,7 +48,7 @@ describe Projects::DeployKeysController do
       end
       before do
-        project2.team << [user, :developer]
+        project2.add_developer(user)
       end
       it 'returns json in a correct format' do

spec/controllers/projects/deployments_controller_spec.rb

@@ -8,7 +8,7 @@ describe Projects::DeploymentsController do
   let(:environment) { create(:environment, name: 'production', project: project) }
   before do
-    project.team << [user, :master]
+    project.add_master(user)
     sign_in(user)
   end

spec/controllers/projects/discussions_controller_spec.rb

@@ -31,7 +31,7 @@ describe Projects::DiscussionsController do
     context "when the user is authorized to resolve the discussion" do
       before do
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       context "when the discussion is not resolvable" do
@@ -92,7 +92,7 @@ describe Projects::DiscussionsController do
     context "when the user is authorized to resolve the discussion" do
       before do
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       context "when the discussion is not resolvable" do

spec/controllers/projects/find_file_controller_spec.rb

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

spec/controllers/projects/forks_controller_spec.rb

@@ -51,7 +51,7 @@ describe Projects::ForksController do
         context 'when user is a member of the Project' do
           before do
-            forked_project.team << [project.creator, :developer]
+            forked_project.add_developer(project.creator)
           end
           it 'sees the project listed' do

spec/controllers/projects/graphs_controller_spec.rb

@@ -6,7 +6,7 @@ describe Projects::GraphsController do
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
   describe 'GET languages' do

spec/controllers/projects/group_links_controller_spec.rb

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

spec/controllers/projects/hooks_controller_spec.rb

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

spec/controllers/projects/imports_controller_spec.rb

@@ -9,7 +9,7 @@ describe Projects::ImportsController do
       before do
         sign_in(user)
-        project.team << [user, :master]
+        project.add_master(user)
       end
       it 'renders template' do
@@ -30,7 +30,7 @@ describe Projects::ImportsController do
       before do
         sign_in(user)
-        project.team << [user, :master]
+        project.add_master(user)
       end
       context 'when import is in progress' do

spec/controllers/projects/issues_controller_spec.rb

@@ -37,7 +37,7 @@ describe Projects::IssuesController do
     context 'internal issue tracker' do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       it_behaves_like "issuables list meta-data", :issue
@@ -69,7 +69,7 @@ describe Projects::IssuesController do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
         allow(Kaminari.config).to receive(:default_per_page).and_return(1)
       end
@@ -116,7 +116,7 @@ describe Projects::IssuesController do
     context 'internal issue tracker' do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       it 'builds a new issue' do
@@ -127,7 +127,7 @@ describe Projects::IssuesController do
       it 'fills in an issue for a merge request' do
         project_with_repository = create(:project, :repository)
-        project_with_repository.team << [user, :developer]
+        project_with_repository.add_developer(user)
         mr = create(:merge_request_with_diff_notes, source_project: project_with_repository)
         get :new, namespace_id: project_with_repository.namespace, project_id: project_with_repository, merge_request_to_resolve_discussions_of: mr.iid
@@ -153,7 +153,7 @@ describe Projects::IssuesController do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
         external = double
         allow(project).to receive(:external_issue_tracker).and_return(external)
@@ -329,7 +329,7 @@ describe Projects::IssuesController do
       it 'does not list confidential issues for project members with guest role' do
         sign_in(member)
-        project.team << [member, :guest]
+        project.add_guest(member)
         get_issues
@@ -354,7 +354,7 @@ describe Projects::IssuesController do
       it 'lists confidential issues for project members' do
         sign_in(member)
-        project.team << [member, :developer]
+        project.add_developer(member)
         get_issues
@@ -394,7 +394,7 @@ describe Projects::IssuesController do
       it 'returns 404 for project members with guest role' do
         sign_in(member)
-        project.team << [member, :guest]
+        project.add_guest(member)
         go(id: unescaped_parameter_value.to_param)
         expect(response).to have_gitlab_http_status :not_found
@@ -416,7 +416,7 @@ describe Projects::IssuesController do
       it "returns #{http_status[:success]} for project members" do
         sign_in(member)
-        project.team << [member, :developer]
+        project.add_developer(member)
         go(id: unescaped_parameter_value.to_param)
         expect(response).to have_gitlab_http_status http_status[:success]
@@ -450,7 +450,7 @@ describe Projects::IssuesController do
       before do
         sign_in(user)
-        project.team << [user, :developer]
+        project.add_developer(user)
       end
       it_behaves_like 'restricted action', success: 200
@@ -594,7 +594,7 @@ describe Projects::IssuesController do
         let(:deleted_user) { create(:user) }
         before do
-          project.team << [user, :developer]
+          project.add_developer(user)
           issue.update!(last_edited_by: deleted_user, last_edited_at: Time.now)
@@ -638,7 +638,7 @@ describe Projects::IssuesController do
     def post_new_issue(issue_attrs = {}, additional_params = {})
       sign_in(user)
       project = create(:project, :public)
-      project.team << [user, :developer]
+      project.add_developer(user)
       post :create, {
         namespace_id: project.namespace.to_param,
@@ -655,7 +655,7 @@ describe Projects::IssuesController do
       let(:project) { merge_request.source_project }
       before do
-        project.team << [user, :master]
+        project.add_master(user)
         sign_in user
       end
@@ -829,7 +829,7 @@ describe Projects::IssuesController do
       def post_spam
         admin = create(:admin)
         create(:user_agent_detail, subject: issue)
-        project.team << [admin, :master]
+        project.add_master(admin)
         sign_in(admin)
         post :mark_as_spam, {
           namespace_id: project.namespace,

spec/controllers/projects/jobs_controller_spec.rb

@@ -374,7 +374,7 @@ describe Projects::JobsController do
     let(:role) { :master }
     before do
-      project.team << [user, role]
+      project.add_role(user, role)
       sign_in(user)
       post_erase

spec/controllers/projects/labels_controller_spec.rb

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