Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 0 deletions

diff --git a/spec/factories/plan_limits.rb b/spec/factories/plan_limits.rb
new file mode 100644
index 00000000000..4aea09618d0
--- /dev/null
+++ b/spec/factories/plan_limits.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :plan_limits do
+    plan
+
+    trait :default_plan do
+      plan factory: :default_plan
+    end
+  end
+end
diff --git a/spec/factories/plans.rb b/spec/factories/plans.rb
new file mode 100644
index 00000000000..81506edcf16
--- /dev/null
+++ b/spec/factories/plans.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :plan do
+    Plan.all_plans.each do |plan|
+      factory :"#{plan}_plan" do
+        name { plan }
+        title { name.titleize }
+        initialize_with { Plan.find_or_create_by(name: plan) }
+      end
+    end
+  end
+end