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

This commit is contained in:
Andy Allan 2017-02-01 17:42:05 +00:00
parent 7b0b09a527
commit 589e9802a9
2 changed files with 13 additions and 6 deletions

7
test/factories/user.rb Normal file
View file

@ -0,0 +1,7 @@
FactoryGirl.define do
factory :user do
sequence(:email) { |n| "user#{n}@example.com" }
sequence(:display_name) { |n| "User #{n}" }
pass_crypt Digest::MD5.hexdigest("test")
end
end

View file

@ -52,20 +52,20 @@ class UserTest < ActiveSupport::TestCase
@ah.com @s.name) @ah.com @s.name)
ok.each do |name| ok.each do |name|
user = users(:normal_user) user = build(:user)
user.email = name user.email = name
assert user.valid?(:save), user.errors.full_messages.join(",") assert user.valid?(:save), user.errors.full_messages.join(",")
end end
bad.each do |name| bad.each do |name|
user = users(:normal_user) user = build(:user)
user.email = name user.email = name
assert user.invalid?(:save), "#{name} is valid when it shouldn't be" assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
end end
end end
def test_display_name_length def test_display_name_length
user = users(:normal_user) user = build(:user)
user.display_name = "123" user.display_name = "123"
assert user.valid?, " should allow nil display name" assert user.valid?, " should allow nil display name"
user.display_name = "12" user.display_name = "12"
@ -93,13 +93,13 @@ class UserTest < ActiveSupport::TestCase
"new", "terms", "save", "confirm", "confirm-email", "new", "terms", "save", "confirm", "confirm-email",
"go_public", "reset-password", "forgot-password", "suspended"] "go_public", "reset-password", "forgot-password", "suspended"]
ok.each do |display_name| ok.each do |display_name|
user = users(:normal_user) user = build(:user)
user.display_name = display_name user.display_name = display_name
assert user.valid?, "#{display_name} is invalid, when it should be" assert user.valid?, "#{display_name} is invalid, when it should be"
end end
bad.each do |display_name| bad.each do |display_name|
user = users(:normal_user) user = build(:user)
user.display_name = display_name user.display_name = display_name
assert !user.valid?, "#{display_name} is valid when it shouldn't be" assert !user.valid?, "#{display_name} is valid when it shouldn't be"
end end
@ -150,7 +150,7 @@ class UserTest < ActiveSupport::TestCase
end end
def test_user_preferred_editor def test_user_preferred_editor
user = users(:normal_user) user = create(:user)
assert_nil user.preferred_editor assert_nil user.preferred_editor
user.preferred_editor = "potlatch" user.preferred_editor = "potlatch"
assert_equal "potlatch", user.preferred_editor assert_equal "potlatch", user.preferred_editor