1 files changed, 114 insertions, 58 deletions
diff --git a/spec/controllers/projects/settings/repository_controller_spec.rb b/spec/controllers/projects/settings/repository_controller_spec.rb
index 22287fea82c..ea50ff6caa0 100644
--- a/spec/controllers/projects/settings/repository_controller_spec.rb
+++ b/spec/controllers/projects/settings/repository_controller_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe Projects::Settings::RepositoryController do
   let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
+  let(:base_params) { { namespace_id: project.namespace, project_id: project } }
 
   before do
     project.add_maintainer(user)
@@ -13,7 +14,7 @@ RSpec.describe Projects::Settings::RepositoryController do
 
   describe 'GET show' do
     it 'renders show with 200 status code' do
-      get :show, params: { namespace_id: project.namespace, project_id: project }
+      get :show, params: base_params
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(response).to render_template(:show)
@@ -29,7 +30,7 @@ RSpec.describe Projects::Settings::RepositoryController do
         .with(project, user, anything)
         .and_return(status: :success)
 
-      put :cleanup, params: { namespace_id: project.namespace, project_id: project, project: { bfg_object_map: object_map } }
+      put :cleanup, params: base_params.merge({ project: { bfg_object_map: object_map } })
 
       expect(response).to redirect_to project_settings_repository_path(project)
     end
@@ -41,7 +42,7 @@ RSpec.describe Projects::Settings::RepositoryController do
           .with(project, user, anything)
           .and_return(status: :error, message: 'error message')
 
-        put :cleanup, params: { namespace_id: project.namespace, project_id: project, project: { bfg_object_map: object_map } }
+        put :cleanup, params: base_params.merge({ project: { bfg_object_map: object_map } })
 
         expect(controller).to set_flash[:alert].to('error message')
         expect(response).to redirect_to project_settings_repository_path(project)
@@ -50,83 +51,138 @@ RSpec.describe Projects::Settings::RepositoryController do
   end
 
   describe 'POST create_deploy_token' do
-    context 'when ajax_new_deploy_token feature flag is disabled for the project' do
-      before do
-        stub_feature_flags(ajax_new_deploy_token: false)
+    let(:good_deploy_token_params) do
+      {
+        name: 'name',
+        expires_at: 1.day.from_now.to_s,
+        username: 'deployer',
+        read_repository: '1',
+        deploy_token_type: DeployToken.deploy_token_types[:project_type]
+      }
+    end
+
+    let(:request_params) { base_params.merge({ deploy_token: deploy_token_params }) }
+
+    subject { post :create_deploy_token, params: request_params, format: :json }
+
+    context('a good request') do
+      let(:deploy_token_params) { good_deploy_token_params }
+      let(:expected_response) do
+        {
+          'id' => be_a(Integer),
+          'name' => deploy_token_params[:name],
+          'username' => deploy_token_params[:username],
+          'expires_at' => Time.zone.parse(deploy_token_params[:expires_at]),
+          'token' => be_a(String),
+          'expired' => false,
+          'revoked' => false,
+          'scopes' => deploy_token_params.inject([]) do |scopes, kv|
+            key, value = kv
+            key.to_s.start_with?('read_') && value.to_i != 0 ? scopes << key.to_s : scopes
+          end
+        }
       end
 
-      it_behaves_like 'a created deploy token' do
-        let(:entity) { project }
-        let(:create_entity_params) { { namespace_id: project.namespace, project_id: project } }
-        let(:deploy_token_type) { DeployToken.deploy_token_types[:project_type] }
+      it 'creates the deploy token' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(response).to match_response_schema('public_api/v4/deploy_token')
+        expect(json_response).to match(expected_response)
       end
     end
 
-    context 'when ajax_new_deploy_token feature flag is enabled for the project' do
-      let(:good_deploy_token_params) do
-        {
-          name: 'name',
-          expires_at: 1.day.from_now.to_s,
-          username: 'deployer',
-          read_repository: '1',
-          deploy_token_type: DeployToken.deploy_token_types[:project_type]
-        }
+    context('a bad request') do
+      let(:deploy_token_params) { good_deploy_token_params.except(:read_repository) }
+      let(:expected_response) { { 'message' => "Scopes can't be blank" } }
+
+      it 'does not create the deploy token' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response).to match(expected_response)
       end
+    end
 
-      let(:request_params) do
-        {
-          namespace_id: project.namespace.to_param,
-          project_id: project.to_param,
-          deploy_token: deploy_token_params
-        }
+    context('an invalid request') do
+      let(:deploy_token_params) { good_deploy_token_params.except(:name) }
+
+      it 'raises a validation error' do
+        expect { subject }.to raise_error(ActiveRecord::StatementInvalid)
       end
+    end
+  end
 
-      subject { post :create_deploy_token, params: request_params, format: :json }
-
-      context('a good request') do
-        let(:deploy_token_params) { good_deploy_token_params }
-        let(:expected_response) do
-          {
-            'id' => be_a(Integer),
-            'name' => deploy_token_params[:name],
-            'username' => deploy_token_params[:username],
-            'expires_at' => Time.zone.parse(deploy_token_params[:expires_at]),
-            'token' => be_a(String),
-            'expired' => false,
-            'revoked' => false,
-            'scopes' => deploy_token_params.inject([]) do |scopes, kv|
-              key, value = kv
-              key.to_s.start_with?('read_') && value.to_i != 0 ? scopes << key.to_s : scopes
-            end
-          }
+  describe 'PUT update' do
+    let(:project) { create(:project, :repository) }
+
+    context 'when updating default branch' do
+      let!(:previous_default_branch) { project.default_branch }
+
+      let(:new_default_branch) { 'feature' }
+      let(:request_params) { base_params.merge({ project: project_params_attributes }) }
+
+      subject { put :update, params: request_params }
+
+      context('with a good request') do
+        let(:project_params_attributes) { { default_branch: new_default_branch } }
+
+        it "updates default branch and redirect to project_settings_repository_path" do
+          expect do
+            subject
+          end.to change {
+            Project.find(project.id).default_branch # refind to reset the default branch cache
+          }.from(previous_default_branch).to(new_default_branch)
+
+          expect(response).to redirect_to project_settings_repository_path(project)
+          expect(controller).to set_flash[:notice].to("Project settings were successfully updated.")
         end
+      end
 
-        it 'creates the deploy token' do
-          subject
+      context('with a bad input') do
+        let(:project_params_attributes) { { default_branch: 'non_existent_branch' } }
 
-          expect(response).to have_gitlab_http_status(:created)
-          expect(response).to match_response_schema('public_api/v4/deploy_token')
-          expect(json_response).to match(expected_response)
+        it "does not update default branch and shows an alert" do
+          expect do
+            subject
+          end.not_to change {
+            Project.find(project.id).default_branch # refind to reset the default branch cache
+          }
+
+          expect(response).to redirect_to project_settings_repository_path(project)
+          expect(controller).to set_flash[:alert].to("Could not set the default branch")
         end
       end
+    end
+
+    context 'when updating branch names template from issues' do
+      let(:branch_name_template) { 'feat/GL-%{id}-%{title}' }
 
-      context('a bad request') do
-        let(:deploy_token_params) { good_deploy_token_params.except(:read_repository) }
-        let(:expected_response) { { 'message' => "Scopes can't be blank" } }
+      let(:request_params) { base_params.merge({ project: project_params_attributes }) }
 
-        it 'does not create the deploy token' do
+      subject { put :update, params: request_params }
+
+      context('with a good request') do
+        let(:project_params_attributes) { { issue_branch_template: branch_name_template } }
+
+        it "updates issue_branch_template and redirect to project_settings_repository_path" do
           subject
 
-          expect(response).to have_gitlab_http_status(:bad_request)
-          expect(json_response).to match(expected_response)
+          expect(response).to redirect_to project_settings_repository_path(project)
+          expect(controller).to set_flash[:notice].to("Project settings were successfully updated.")
+          expect(project.reload.issue_branch_template).to eq(branch_name_template)
         end
       end
 
-      context('an invalid request') do
-        let(:deploy_token_params) { good_deploy_token_params.except(:name) }
+      context('with a bad input') do
+        let(:project_params_attributes) { { issue_branch_template: 'a' * 260 } }
+
+        it "updates issue_branch_template and redirect to project_settings_repository_path" do
+          subject
 
-        it 'raises a validation error' do
-          expect { subject }.to raise_error(ActiveRecord::StatementInvalid)
+          expect(response).to redirect_to project_settings_repository_path(project)
+          expect(controller).to set_flash[:alert].to("Project setting issue branch template is too long (maximum is 255 characters)")
+          expect(project.reload.issue_branch_template).to eq(nil)
         end
       end
     end