Create a simple user factory, and convert some basic tests.

[rails.git] / test / models / user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index d480849dd5c49336d44edbe4d8d56c6c39413bc8..6ecc8c7960b5ef5df660b46bd9268ced8b5e653f 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -52,20 +52,20 @@ class UserTest < ActiveSupport::TestCase
              輕觸搖晃的遊戲@ah.com も対応します@s.name)
 
     ok.each do |name|
              輕觸搖晃的遊戲@ah.com も対応します@s.name)
 
     ok.each do |name|

-      user = users(:normal_user)
+      user = build(:user)

       user.email = name
       assert user.valid?(:save), user.errors.full_messages.join(",")
     end
 
     bad.each do |name|
       user.email = name
       assert user.valid?(:save), user.errors.full_messages.join(",")
     end
 
     bad.each do |name|

-      user = users(:normal_user)
+      user = build(:user)

       user.email = name
       assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
     end
   end
 
   def test_display_name_length
       user.email = name
       assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
     end
   end
 
   def test_display_name_length

-    user = users(:normal_user)
+    user = build(:user)

     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"
     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"


@@ -93,13 +93,13 @@ class UserTest < ActiveSupport::TestCase
            "new", "terms", "save", "confirm", "confirm-email",
            "go_public", "reset-password", "forgot-password", "suspended"]
     ok.each do |display_name|
            "new", "terms", "save", "confirm", "confirm-email",
            "go_public", "reset-password", "forgot-password", "suspended"]
     ok.each do |display_name|

-      user = users(:normal_user)
+      user = build(:user)

       user.display_name = display_name
       assert user.valid?, "#{display_name} is invalid, when it should be"
     end
 
     bad.each do |display_name|
       user.display_name = display_name
       assert user.valid?, "#{display_name} is invalid, when it should be"
     end
 
     bad.each do |display_name|

-      user = users(:normal_user)
+      user = build(:user)

       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
     end
       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
     end


@@ -150,8 +150,8 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_user_preferred_editor
   end
 
   def test_user_preferred_editor

-    user = users(:normal_user)
-    assert_equal nil, user.preferred_editor
+    user = create(:user)
+    assert_nil user.preferred_editor

     user.preferred_editor = "potlatch"
     assert_equal "potlatch", user.preferred_editor
     user.save!
     user.preferred_editor = "potlatch"
     assert_equal "potlatch", user.preferred_editor
     user.save!


@@ -161,7 +161,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
   end
 
   def test_visible

-    assert_equal 22, User.visible.count
+    assert_equal 23, User.visible.count

     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.visible.find(users(:suspended_user).id)
     end


@@ -171,7 +171,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_active
   end
 
   def test_active

-    assert_equal 21, User.active.count
+    assert_equal 22, User.active.count

     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.active.find(users(:inactive_user).id)
     end


@@ -184,7 +184,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_identifiable
   end
 
   def test_identifiable

-    assert_equal 23, User.identifiable.count
+    assert_equal 24, User.identifiable.count

     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end
     assert_raise ActiveRecord::RecordNotFound do
       User.identifiable.find(users(:normal_user).id)
     end


@@ -244,8 +244,8 @@ class UserTest < ActiveSupport::TestCase
     user.delete
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     user.delete
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?

-    assert_equal nil, user.home_lat
-    assert_equal nil, user.home_lon
+    assert_nil user.home_lat
+    assert_nil user.home_lon

     assert_equal false, user.image.file?
     assert_equal "deleted", user.status
     assert_equal false, user.visible?
     assert_equal false, user.image.file?
     assert_equal "deleted", user.status
     assert_equal false, user.visible?