Merge pull request #5 from leapcode/feature/removing-email-aliases

Removing email aliases - proper error display

1 files changed, 6 insertions, 5 deletions

diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index 762aaea..f680ac6 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -22,7 +22,7 @@ class EmailAliasTest < ActiveSupport::TestCase
 
   test "adding email alias directly" do
     email_alias = "valid_alias@domain.net"
-    @user.add_email_alias(email_alias)
+    @user.email_aliases.build :email => email_alias
     assert @user.changed?
     assert @user.save
     assert_equal email_alias, @user.reload.email_aliases.first.to_s
@@ -30,10 +30,11 @@ class EmailAliasTest < ActiveSupport::TestCase
 
   test "duplicated email aliases are invalid" do
     email_alias = "valid_alias@domain.net"
-    @user.add_email_alias(email_alias)
+    @user.email_aliases.build :email => email_alias
     @user.save
     # add again
-    @user.add_email_alias(email_alias)
+    email_alias = @user.email_aliases.build :email => email_alias
+    assert !email_alias.valid?
     assert @user.changed?
     assert !@user.valid?
   end
@@ -41,14 +42,14 @@ class EmailAliasTest < ActiveSupport::TestCase
   test "email is invalid as email alias" do
     email_alias = "valid_alias@domain.net"
     @user.email = email_alias
-    @user.add_email_alias(email_alias)
+    @user.email_aliases.build :email => email_alias
     assert @user.changed?
     assert !@user.valid?
   end
 
   test "find user by email alias" do
     email_alias = "valid_alias@domain.net"
-    @user.add_email_alias(email_alias)
+    @user.email_aliases.build :email => email_alias
     assert @user.save
     assert_equal @user, User.find_by_email_or_alias(email_alias)
     assert_equal @user, User.find_by_email_alias(email_alias)