Add latest changes from gitlab-org/gitlab@master

1 files changed, 51 insertions, 66 deletions

diff --git a/spec/controllers/groups/settings/repository_controller_spec.rb b/spec/controllers/groups/settings/repository_controller_spec.rb
index cbf55218b94..73a205069f5 100644
--- a/spec/controllers/groups/settings/repository_controller_spec.rb
+++ b/spec/controllers/groups/settings/repository_controller_spec.rb
@@ -13,88 +13,73 @@ RSpec.describe Groups::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)
-        entity.add_owner(user)
-      end
+    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[:group_type]
+      }
+    end
 
-      it_behaves_like 'a created deploy token' do
-        let(:entity) { group }
-        let(:create_entity_params) { { group_id: group } }
-        let(:deploy_token_type) { DeployToken.deploy_token_types[:group_type] }
-      end
+    let(:request_params) do
+      {
+        group_id: group.to_param,
+        deploy_token: deploy_token_params
+      }
     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[:group_type]
-        }
-      end
+    before do
+      group.add_owner(user)
+    end
+
+    subject { post :create_deploy_token, params: request_params, format: :json }
 
-      let(:request_params) do
+    context('a good request') do
+      let(:deploy_token_params) { good_deploy_token_params }
+      let(:expected_response) do
         {
-          group_id: group.to_param,
-          deploy_token: deploy_token_params
+          '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
 
-      before do
-        group.add_owner(user)
-      end
+      it 'creates the deploy token' do
+        subject
 
-      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 '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
+        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('a bad request') do
-        let(:deploy_token_params) { good_deploy_token_params.except(:read_repository) }
-        let(:expected_response) { { 'message' => "Scopes can't be blank" } }
+    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
+      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
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response).to match(expected_response)
       end
+    end
 
-      context('an invalid request') do
-        let(:deploy_token_params) { good_deploy_token_params.except(:name) }
+    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
+      it 'raises a validation error' do
+        expect { subject }.to raise_error(ActiveRecord::StatementInvalid)
       end
     end
   end