1 files changed, 62 insertions, 43 deletions
diff --git a/spec/requests/api/group_variables_spec.rb b/spec/requests/api/group_variables_spec.rb
index 90b9606ec7b..e3d538d72ba 100644
--- a/spec/requests/api/group_variables_spec.rb
+++ b/spec/requests/api/group_variables_spec.rb
@@ -88,51 +88,70 @@ RSpec.describe API::GroupVariables, feature_category: :pipeline_authoring do
     context 'authorized user with proper permissions' do
       let(:access_level) { :owner }
 
-      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
+      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
       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)
+      context 'when the group is at the plan limit for variables' do
+        before do
+          create(:plan_limits, :default_plan, group_ci_variables: 1)
+        end
+
+        it 'returns a variable limit error' do
+          expect do
+            post api("/groups/#{group.id}/variables", user), params: { key: 'TOO_MANY_VARS', value: 'too many' }
+          end.not_to change { group.variables.count }
+
+          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
       end
     end