2 files changed, 9 insertions, 11 deletions
diff --git a/users/test/unit/identity_test.rb b/users/test/unit/identity_test.rb
index 6b0a6b1..d20ad93 100644
--- a/users/test/unit/identity_test.rb
+++ b/users/test/unit/identity_test.rb
@@ -11,7 +11,7 @@ class IdentityTest < ActiveSupport::TestCase
   end
 
   test "initial identity for a user" do
-    id = @user.build_identity
+    id = @user.identity
     assert_equal @user.email_address, id.address
     assert_equal @user.email_address, id.destination
     assert_equal @user, id.user
@@ -56,13 +56,13 @@ class IdentityTest < ActiveSupport::TestCase
   end
 
   test "setting and getting pgp key" do
-    id = @user.build_identity
+    id = @user.identity
     id.keys[:pgp] = pgp_key_string
     assert_equal pgp_key_string, id.keys[:pgp]
   end
 
   test "querying pgp key via couch" do
-    id = @user.build_identity
+    id = @user.identity
     id.keys[:pgp] = pgp_key_string
     id.save
     view = Identity.pgp_key_by_email.key(id.address)
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index c8c837b..5d1fe06 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -56,23 +56,21 @@ class UserTest < ActiveSupport::TestCase
     other_user.destroy
   end
 
-  test "login needs to be different from other peoples email aliases" do
-    other_user = FactoryGirl.create :user
-    other_user.email_aliases.build :email => @user.login
-    other_user.save
-    assert !@user.valid?
-    other_user.destroy
+  test "deprecated public key api still works" do
+    key = SecureRandom.base64(4096)
+    @user.public_key = key
+    assert_equal key, @user.public_key
   end
 
   test "pgp key view" do
     @user.public_key = SecureRandom.base64(4096)
     @user.save
 
-    view = User.pgp_key_by_handle.key(@user.login)
+    view = Identity.pgp_key_by_email.key(@user.email_address)
 
     assert_equal 1, view.rows.count
     assert result = view.rows.first
-    assert_equal @user.login, result["key"]
+    assert_equal @user.email_address, result["key"]
     assert_equal @user.public_key, result["value"]
   end
 end