2 files changed, 14 insertions, 4 deletions
diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index e737773..5ded5bb 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -20,11 +20,12 @@ class EmailAliasTest < ActiveSupport::TestCase
     assert_equal email_alias, @user.email_aliases.first.to_s
   end
 
-  test "can retrieve user by email alias" do
+  test "find user by email alias" do
     email_alias = "valid_alias@domain.net"
-    @user.attributes = {:email_aliases => [email_alias]}
-    @user.save
+    @user.attributes = {:email_aliases_attributes => {"0" => {: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)
-    assert_equal @user, User.find_by_email(email_alias)
+    assert_nil User.find_by_email(email_alias)
   end
 end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index cce11c2..29f6a89 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -49,4 +49,13 @@ class UserTest < ActiveSupport::TestCase
     assert_equal client_rnd, srp_session.aa
   end
 
+  test "find user by email" do
+    email = "tryto@find.me"
+    @user.email = email
+    @user.save
+    assert_equal @user, User.find_by_email(email)
+    assert_equal @user, User.find_by_email_or_alias(email)
+    assert_nil User.find_by_email_alias(email)
+  end
+
 end