Strip leading & trailing whitespaces in CI/CD secret variable's environment scope

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/models/ci/variable.rb

@@ -4,7 +4,6 @@ module Ci
     include HasVariable
     include Presentable
     prepend EE::Ci::Variable
-    include Presentable
 
     belongs_to :project
 

changelogs/unreleased-ee/ee-40561-environment-scope-value-is-not-trimmed.yml

+---
+title: Strip leading & trailing whitespaces in CI/CD secret variable's environment
+  scope
+merge_request: 3563
+author:
+type: fixed

ee/app/models/ee/ci/variable.rb

@@ -11,6 +11,10 @@ module EE
                     message: ::Gitlab::Regex.environment_scope_regex_message }
         )
       end
+
+      def environment_scope=(new_environment_scope)
+        super(new_environment_scope.to_s.strip)
+      end
     end
   end
 end

spec/ee/spec/models/ee/ci/variable_spec.rb

@@ -11,4 +11,22 @@ describe Ci::Variable do
     is_expected.to validate_uniqueness_of(:key)
       .scoped_to(:project_id, :environment_scope)
   end
+
+  describe '#environment_scope=' do
+    context 'when the new environment_scope is nil' do
+      it 'strips leading and trailing whitespaces' do
+        subject.environment_scope = nil
+
+        expect(subject.environment_scope).to eq('')
+      end
+    end
+
+    context 'when the new environment_scope has leadind and trailing whitespaces' do
+      it 'strips leading and trailing whitespaces' do
+        subject.environment_scope = ' * '
+
+        expect(subject.environment_scope).to eq('*')
+      end
+    end
+  end
 end