Backports every CE related change from ee-44542 to CE

2 files changed, 66 insertions, 4 deletions

diff --git a/spec/factories/import_state.rb b/spec/factories/import_state.rb
new file mode 100644
index 00000000000..15d0a9d466a
--- /dev/null
+++ b/spec/factories/import_state.rb
@@ -0,0 +1,38 @@
+FactoryBot.define do
+  factory :import_state, class: ProjectImportState do
+    status :none
+    association :project, factory: :project
+
+    transient do
+      import_url { generate(:url) }
+    end
+
+    trait :repository do
+      association :project, factory: [:project, :repository]
+    end
+
+    trait :none do
+      status :none
+    end
+
+    trait :scheduled do
+      status :scheduled
+    end
+
+    trait :started do
+      status :started
+    end
+
+    trait :finished do
+      status :finished
+    end
+
+    trait :failed do
+      status :failed
+    end
+
+    after(:create) do |import_state, evaluator|
+      import_state.project.update_columns(import_url: evaluator.import_url)
+    end
+  end
+end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index aed5eab8044..a6128903546 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -69,19 +69,43 @@ FactoryBot.define do
     end
 
     trait :import_scheduled do
-      import_status :scheduled
+      transient do
+        status :scheduled
+      end
+
+      before(:create) do |project, evaluator|
+        project.create_import_state(status: evaluator.status)
+      end
     end
 
     trait :import_started do
-      import_status :started
+      transient do
+        status :started
+      end
+
+      before(:create) do |project, evaluator|
+        project.create_import_state(status: evaluator.status)
+      end
     end
 
     trait :import_finished do
-      import_status :finished
+      transient do
+        status :finished
+      end
+
+      before(:create) do |project, evaluator|
+        project.create_import_state(status: evaluator.status)
+      end
     end
 
     trait :import_failed do
-      import_status :failed
+      transient do
+        status :failed
+      end
+
+      before(:create) do |project, evaluator|
+        project.create_import_state(status: evaluator.status)
+      end
     end
 
     trait :archived do