From a6b3c26bbee3ee116a33a757c9fb06d7046df7a5 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Fri, 14 Jun 2019 12:50:26 +0100
Subject: [PATCH] Extract users factories to separate file

---
 spec/factories.rb              | 28 ----------------------------
 spec/factories/user_factory.rb | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 spec/factories/user_factory.rb

diff --git a/spec/factories.rb b/spec/factories.rb
index a3ff0112ad..317d42d5f5 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -178,34 +178,6 @@ FactoryBot.modify do
     # Prevent inconsistent ordering in specs when all option types have the same (0) position
     sequence(:position)
   end
-
-  factory :user do
-    confirmation_sent_at '1970-01-01 00:00:00'
-    confirmed_at '1970-01-01 00:00:01'
-
-    before(:create) do |user, evaluator|
-      if evaluator.confirmation_sent_at
-        if evaluator.confirmed_at
-          user.skip_confirmation!
-        else
-          user.skip_confirmation_notification!
-        end
-      end
-    end
-
-    after(:create) do |user|
-      user.spree_roles.clear # Remove admin role
-    end
-  end
-
-  factory :admin_user do
-    confirmation_sent_at '1970-01-01 00:00:00'
-    confirmed_at '1970-01-01 00:00:01'
-
-    after(:create) do |user|
-      user.spree_roles << Spree::Role.find_or_create_by_name!('admin')
-    end
-  end
 end
 
 FactoryBot.modify do
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb
new file mode 100644
index 0000000000..9e902c202e
--- /dev/null
+++ b/spec/factories/user_factory.rb
@@ -0,0 +1,29 @@
+FactoryBot.modify do
+  factory :user do
+    confirmation_sent_at '1970-01-01 00:00:00'
+    confirmed_at '1970-01-01 00:00:01'
+
+    before(:create) do |user, evaluator|
+      if evaluator.confirmation_sent_at
+        if evaluator.confirmed_at
+          user.skip_confirmation!
+        else
+          user.skip_confirmation_notification!
+        end
+      end
+    end
+
+    after(:create) do |user|
+      user.spree_roles.clear # Remove admin role
+    end
+  end
+
+  factory :admin_user do
+    confirmation_sent_at '1970-01-01 00:00:00'
+    confirmed_at '1970-01-01 00:00:01'
+
+    after(:create) do |user|
+      user.spree_roles << Spree::Role.find_or_create_by_name!('admin')
+    end
+  end
+end