Add latest changes from gitlab-org/gitlab@master

3 files changed, 97 insertions, 143 deletions

diff --git a/spec/requests/api/ci/variables_spec.rb b/spec/requests/api/ci/variables_spec.rb
index b27b9054432..cafb841995d 100644
--- a/spec/requests/api/ci/variables_spec.rb
+++ b/spec/requests/api/ci/variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::Ci::Variables, feature_category: :pipeline_authoring do
+RSpec.describe API::Ci::Variables do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let!(:project) { create(:project, creator_id: user.id) }
@@ -114,92 +114,73 @@ RSpec.describe API::Ci::Variables, feature_category: :pipeline_authoring do
 
   describe 'POST /projects/:id/variables' do
     context 'authorized user with proper permissions' do
-      context 'when the project is below the plan limit for variables' do
-        it 'creates variable' do
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true, raw: true }
-          end.to change { project.variables.count }.by(1)
-
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq('TEST_VARIABLE_2')
-          expect(json_response['value']).to eq('PROTECTED_VALUE_2')
-          expect(json_response['protected']).to be_truthy
-          expect(json_response['masked']).to be_truthy
-          expect(json_response['raw']).to be_truthy
-          expect(json_response['variable_type']).to eq('env_var')
-        end
-
-        it 'masks the new value when logging' do
-          masked_params = { 'key' => 'VAR_KEY', 'value' => '[FILTERED]', 'protected' => 'true', 'masked' => 'true' }
-
-          expect(::API::API::LOGGER).to receive(:info).with(include(params: include(masked_params)))
-
-          post api("/projects/#{project.id}/variables", user),
-            params: { key: 'VAR_KEY', value: 'SENSITIVE', protected: true, masked: true }
-        end
+      it 'creates variable' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true, raw: true }
+        end.to change { project.variables.count }.by(1)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('PROTECTED_VALUE_2')
+        expect(json_response['protected']).to be_truthy
+        expect(json_response['masked']).to be_truthy
+        expect(json_response['raw']).to be_truthy
+        expect(json_response['variable_type']).to eq('env_var')
+      end
 
-        it 'creates variable with optional attributes' do
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { variable_type: 'file', key: 'TEST_VARIABLE_2', value: 'VALUE_2' }
-          end.to change { project.variables.count }.by(1)
-
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq('TEST_VARIABLE_2')
-          expect(json_response['value']).to eq('VALUE_2')
-          expect(json_response['protected']).to be_falsey
-          expect(json_response['masked']).to be_falsey
-          expect(json_response['raw']).to be_falsey
-          expect(json_response['variable_type']).to eq('file')
-        end
+      it 'masks the new value when logging' do
+        masked_params = { 'key' => 'VAR_KEY', 'value' => '[FILTERED]', 'protected' => 'true', 'masked' => 'true' }
 
-        it 'does not allow to duplicate variable key' do
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2' }
-          end.to change { project.variables.count }.by(0)
+        expect(::API::API::LOGGER).to receive(:info).with(include(params: include(masked_params)))
 
-          expect(response).to have_gitlab_http_status(:bad_request)
-        end
+        post api("/projects/#{project.id}/variables", user),
+          params: { key: 'VAR_KEY', value: 'SENSITIVE', protected: true, masked: true }
+      end
 
-        it 'creates variable with a specific environment scope' do
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'VALUE_2', environment_scope: 'review/*' }
-          end.to change { project.variables.reload.count }.by(1)
+      it 'creates variable with optional attributes' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), params: { variable_type: 'file', key: 'TEST_VARIABLE_2', value: 'VALUE_2' }
+        end.to change { project.variables.count }.by(1)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('VALUE_2')
+        expect(json_response['protected']).to be_falsey
+        expect(json_response['masked']).to be_falsey
+        expect(json_response['raw']).to be_falsey
+        expect(json_response['variable_type']).to eq('file')
+      end
 
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq('TEST_VARIABLE_2')
-          expect(json_response['value']).to eq('VALUE_2')
-          expect(json_response['environment_scope']).to eq('review/*')
-        end
+      it 'does not allow to duplicate variable key' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2' }
+        end.to change { project.variables.count }.by(0)
 
-        it 'allows duplicated variable key given different environment scopes' do
-          variable = create(:ci_variable, project: project)
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
 
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2', environment_scope: 'review/*' }
-          end.to change { project.variables.reload.count }.by(1)
+      it 'creates variable with a specific environment scope' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'VALUE_2', environment_scope: 'review/*' }
+        end.to change { project.variables.reload.count }.by(1)
 
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq(variable.key)
-          expect(json_response['value']).to eq('VALUE_2')
-          expect(json_response['environment_scope']).to eq('review/*')
-        end
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('VALUE_2')
+        expect(json_response['environment_scope']).to eq('review/*')
       end
 
-      context 'when the project is at the plan limit for variables' do
-        it 'returns a variable limit error' do
-          create(:plan_limits, :default_plan, project_ci_variables: 1)
-
-          expect(project.variables.count).to be(1)
+      it 'allows duplicated variable key given different environment scopes' do
+        variable = create(:ci_variable, project: project)
 
-          expect do
-            post api("/projects/#{project.id}/variables", user), params: { key: 'TOO_MANY_VARS', value: 'too many' }
-          end.not_to change { project.variables.count }
+        expect do
+          post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2', environment_scope: 'review/*' }
+        end.to change { project.variables.reload.count }.by(1)
 
-          expect(response).to have_gitlab_http_status(:bad_request)
-          expect(json_response['message']['base']).to contain_exactly(
-            'Maximum number of project ci variables (1) exceeded'
-          )
-        end
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq(variable.key)
+        expect(json_response['value']).to eq('VALUE_2')
+        expect(json_response['environment_scope']).to eq('review/*')
       end
     end
 
diff --git a/spec/requests/api/graphql/mutations/timelogs/create_spec.rb b/spec/requests/api/graphql/mutations/timelogs/create_spec.rb
index eea04b89783..9b89d053901 100644
--- a/spec/requests/api/graphql/mutations/timelogs/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/timelogs/create_spec.rb
@@ -11,14 +11,6 @@ RSpec.describe 'Create a timelog' do
 
   let(:current_user) { nil }
   let(:users_container) { project }
-  let(:mutation) do
-    graphql_mutation(:timelogCreate, {
-      'time_spent' => time_spent,
-      'spent_at' => '2022-07-08',
-      'summary' => 'Test summary',
-      'issuable_id' => issuable.to_global_id.to_s
-    })
-  end
 
   let(:mutation_response) { graphql_mutation_response(:timelog_create) }
 
diff --git a/spec/requests/api/group_variables_spec.rb b/spec/requests/api/group_variables_spec.rb
index b1213dfd66a..a07a8ae4292 100644
--- a/spec/requests/api/group_variables_spec.rb
+++ b/spec/requests/api/group_variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::GroupVariables, feature_category: :pipeline_authoring do
+RSpec.describe API::GroupVariables do
   let_it_be(:group) { create(:group) }
   let_it_be(:user) { create(:user) }
   let_it_be(:variable) { create(:ci_group_variable, group: group) }
@@ -88,70 +88,51 @@ RSpec.describe API::GroupVariables, feature_category: :pipeline_authoring do
     context 'authorized user with proper permissions' do
       let(:access_level) { :owner }
 
-      context 'when the group is below the plan limit for variables' do
-        it 'creates variable' do
-          expect do
-            post api("/groups/#{group.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true, raw: true }
-          end.to change { group.variables.count }.by(1)
-
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq('TEST_VARIABLE_2')
-          expect(json_response['value']).to eq('PROTECTED_VALUE_2')
-          expect(json_response['protected']).to be_truthy
-          expect(json_response['masked']).to be_truthy
-          expect(json_response['variable_type']).to eq('env_var')
-          expect(json_response['environment_scope']).to eq('*')
-          expect(json_response['raw']).to be_truthy
-        end
-
-        it 'masks the new value when logging' do
-          masked_params = { 'key' => 'VAR_KEY', 'value' => '[FILTERED]', 'protected' => 'true', 'masked' => 'true' }
-
-          expect(::API::API::LOGGER).to receive(:info).with(include(params: include(masked_params)))
-
-          post api("/groups/#{group.id}/variables", user),
-            params: { key: 'VAR_KEY', value: 'SENSITIVE', protected: true, masked: true }
-        end
-
-        it 'creates variable with optional attributes' do
-          expect do
-            post api("/groups/#{group.id}/variables", user), params: { variable_type: 'file', key: 'TEST_VARIABLE_2', value: 'VALUE_2' }
-          end.to change { group.variables.count }.by(1)
-
-          expect(response).to have_gitlab_http_status(:created)
-          expect(json_response['key']).to eq('TEST_VARIABLE_2')
-          expect(json_response['value']).to eq('VALUE_2')
-          expect(json_response['protected']).to be_falsey
-          expect(json_response['masked']).to be_falsey
-          expect(json_response['raw']).to be_falsey
-          expect(json_response['variable_type']).to eq('file')
-          expect(json_response['environment_scope']).to eq('*')
-        end
-
-        it 'does not allow to duplicate variable key' do
-          expect do
-            post api("/groups/#{group.id}/variables", user), params: { key: variable.key, value: 'VALUE_2' }
-          end.to change { group.variables.count }.by(0)
-
-          expect(response).to have_gitlab_http_status(:bad_request)
-        end
+      it 'creates variable' do
+        expect do
+          post api("/groups/#{group.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true, raw: true }
+        end.to change { group.variables.count }.by(1)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('PROTECTED_VALUE_2')
+        expect(json_response['protected']).to be_truthy
+        expect(json_response['masked']).to be_truthy
+        expect(json_response['variable_type']).to eq('env_var')
+        expect(json_response['environment_scope']).to eq('*')
+        expect(json_response['raw']).to be_truthy
       end
 
-      context 'when the group is at the plan limit for variables' do
-        it 'returns a variable limit error' do
-          create(:plan_limits, :default_plan, group_ci_variables: 1)
+      it 'masks the new value when logging' do
+        masked_params = { 'key' => 'VAR_KEY', 'value' => '[FILTERED]', 'protected' => 'true', 'masked' => 'true' }
+
+        expect(::API::API::LOGGER).to receive(:info).with(include(params: include(masked_params)))
+
+        post api("/groups/#{group.id}/variables", user),
+          params: { key: 'VAR_KEY', value: 'SENSITIVE', protected: true, masked: true }
+      end
 
-          expect(group.variables.count).to be(1)
+      it 'creates variable with optional attributes' do
+        expect do
+          post api("/groups/#{group.id}/variables", user), params: { variable_type: 'file', key: 'TEST_VARIABLE_2', value: 'VALUE_2' }
+        end.to change { group.variables.count }.by(1)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('VALUE_2')
+        expect(json_response['protected']).to be_falsey
+        expect(json_response['masked']).to be_falsey
+        expect(json_response['raw']).to be_falsey
+        expect(json_response['variable_type']).to eq('file')
+        expect(json_response['environment_scope']).to eq('*')
+      end
 
-          expect do
-            post api("/groups/#{group.id}/variables", user), params: { key: 'TOO_MANY_VARS', value: 'too many' }
-          end.not_to change { group.variables.count }
+      it 'does not allow to duplicate variable key' do
+        expect do
+          post api("/groups/#{group.id}/variables", user), params: { key: variable.key, value: 'VALUE_2' }
+        end.to change { group.variables.count }.by(0)
 
-          expect(response).to have_gitlab_http_status(:bad_request)
-          expect(json_response['message']['base']).to contain_exactly(
-            'Maximum number of group ci variables (1) exceeded'
-          )
-        end
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
     end