Add latest changes from gitlab-org/gitlab@master

4 files changed, 18 insertions, 0 deletions

diff --git a/spec/factories/ci/group_variables.rb b/spec/factories/ci/group_variables.rb
index d3b891eb1e3..44c0d10b3c1 100644
--- a/spec/factories/ci/group_variables.rb
+++ b/spec/factories/ci/group_variables.rb
@@ -5,11 +5,16 @@ FactoryBot.define do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value { 'VARIABLE_VALUE' }
     masked { false }
+    variable_type { :env_var }
 
     trait(:protected) do
       add_attribute(:protected) { true }
     end
 
+    trait(:file) do
+      variable_type { :file }
+    end
+
     group factory: :group
   end
 end
diff --git a/spec/factories/ci/pipeline_schedule_variables.rb b/spec/factories/ci/pipeline_schedule_variables.rb
index d598ba1b1b9..dd8e6b9226d 100644
--- a/spec/factories/ci/pipeline_schedule_variables.rb
+++ b/spec/factories/ci/pipeline_schedule_variables.rb
@@ -7,5 +7,9 @@ FactoryBot.define do
     variable_type { 'env_var' }
 
     pipeline_schedule factory: :ci_pipeline_schedule
+
+    trait(:file) do
+      variable_type { :file }
+    end
   end
 end
diff --git a/spec/factories/ci/pipeline_variables.rb b/spec/factories/ci/pipeline_variables.rb
index 17aa9962e0b..c0935d341ad 100644
--- a/spec/factories/ci/pipeline_variables.rb
+++ b/spec/factories/ci/pipeline_variables.rb
@@ -4,7 +4,12 @@ FactoryBot.define do
   factory :ci_pipeline_variable, class: 'Ci::PipelineVariable' do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value { 'VARIABLE_VALUE' }
+    variable_type { :env_var }
 
     pipeline factory: :ci_empty_pipeline
+
+    trait(:file) do
+      variable_type { :file }
+    end
   end
 end
diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
index 1f9c12ecbce..7ae01d95f63 100644
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
@@ -11,6 +11,10 @@ FactoryBot.define do
       add_attribute(:protected) { true }
     end
 
+    trait(:file) do
+      variable_type { :file }
+    end
+
     project
   end
 end