From 0bd2e9ea8c801e5b6cd570837fcd112f6f78b180 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 2 Feb 2017 12:55:32 +0000
Subject: [PATCH] Add status traits to user factory.

---
 test/factories/user.rb   | 20 ++++++++++++++++++++
 test/models/user_test.rb | 20 ++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 6376659ab..9ec4e2030 100644
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -9,6 +9,26 @@ FactoryGirl.define do
       home_lon { rand(-180.0...180.0) }
     end
 
+    trait :pending do
+      status "pending"
+    end
+
+    trait :active do
+      status "active"
+    end
+
+    trait :confirmed do
+      status "confirmed"
+    end
+
+    trait :suspended do
+      status "suspended"
+    end
+
+    trait :deleted do
+      status "deleted"
+    end
+
     factory :moderator_user do
       after(:create) do |user, _evaluator|
         create(:user_role, :role => "moderator", :user => user)
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 6632702e5..356f469c0 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -207,19 +207,19 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible?
-    assert_equal true, users(:inactive_user).visible?
-    assert_equal true, users(:normal_user).visible?
-    assert_equal true, users(:confirmed_user).visible?
-    assert_equal false, users(:suspended_user).visible?
-    assert_equal false, users(:deleted_user).visible?
+    assert_equal true, build(:user, :pending).visible?
+    assert_equal true, build(:user, :active).visible?
+    assert_equal true, build(:user, :confirmed).visible?
+    assert_equal false, build(:user, :suspended).visible?
+    assert_equal false, build(:user, :deleted).visible?
   end
 
   def test_active?
-    assert_equal false, users(:inactive_user).active?
-    assert_equal true, users(:normal_user).active?
-    assert_equal true, users(:confirmed_user).active?
-    assert_equal false, users(:suspended_user).active?
-    assert_equal false, users(:deleted_user).active?
+    assert_equal false, build(:user, :pending).active?
+    assert_equal true, build(:user, :active).active?
+    assert_equal true, build(:user, :confirmed).active?
+    assert_equal false, build(:user, :suspended).active?
+    assert_equal false, build(:user, :deleted).active?
   end
 
   def test_moderator?
-- 
2.43.2