Merge branch 'user-messages' into production

Carlos Purificação
2 parents a625a7d8 1a1253fb
Showing 1 changed file with 10 additions and 0 deletions Show diff stats
test/unit/user_test.rb
@@ -52,6 +52,16 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
  
+  def test_should_require_unique_email
+    user1 = create_user('new_user', :email => 'new_user1@example.com', :password => 'test', :password_confirmation => 'test')
+    assert !user1.errors[:login].present?
+    user1.save!
+    user2 = new_user(:login => 'other_user', :email => 'new_user1@example.com')
+    assert user2.errors[:email].present?
+    expected = ["has already been taken"]
+    assert_equal expected, user2.errors[:email]
+  end
+
   def test_email_format
     assert_no_difference 'User.count' do
       u = new_user(:email => 'test.email')
...	...	@@ -52,6 +52,16 @@ class UserTest < ActiveSupport::TestCase
52	52	end
53	53	end
54	54
	55	+ def test_should_require_unique_email
	56	+ user1 = create_user('new_user', :email => 'new_user1@example.com', :password => 'test', :password_confirmation => 'test')
	57	+ assert !user1.errors[:login].present?
	58	+ user1.save!
	59	+ user2 = new_user(:login => 'other_user', :email => 'new_user1@example.com')
	60	+ assert user2.errors[:email].present?
	61	+ expected = ["has already been taken"]
	62	+ assert_equal expected, user2.errors[:email]
	63	+ end
	64	+
55	65	def test_email_format
56	66	assert_no_difference 'User.count' do
57	67	u = new_user(:email => 'test.email')
...	...