Remove ci_trigger_request_with_variables

3 files changed, 1 insertions, 9 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 25ec63de94a..c2b59239af9 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -107,7 +107,7 @@ FactoryGirl.define do
     end
 
     trait :triggered do
-      trigger_request factory: :ci_trigger_request_with_variables
+      trigger_request factory: :ci_trigger_request
     end
 
     after(:build) do |build, evaluator|
diff --git a/spec/factories/ci/pipeline_variable_variables.rb b/spec/factories/ci/pipeline_variables.rb
index 7c1a7faec08..7c1a7faec08 100644
--- a/spec/factories/ci/pipeline_variable_variables.rb
+++ b/spec/factories/ci/pipeline_variables.rb
diff --git a/spec/factories/ci/trigger_requests.rb b/spec/factories/ci/trigger_requests.rb
index 72dad8c418c..40b8848920e 100644
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
@@ -1,13 +1,5 @@
 FactoryGirl.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
-
-    # We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables.
-    # Ci::TriggerRequest doesn't save variables anymore, whereas old trigger requests still persist variables.
-    factory :ci_trigger_request_with_variables do
-      after(:create) do |trigger_request, evaluator|
-        trigger_request.update_attribute(:variables, { TRIGGER_KEY_1: 'TRIGGER_VALUE_1', TRIGGER_KEY_2: 'TRIGGER_VALUE_2' } )
-      end
-    end
   end
 end