summaryrefslogtreecommitdiff
path: root/users/test/unit/email_aliases_test.rb
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-01-17 22:45:39 -0800
committerazul <azul@riseup.net>2013-01-17 22:45:39 -0800
commit168c36b578d675c99aad62a350aa68cc1b6d1316 (patch)
treecd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /users/test/unit/email_aliases_test.rb
parent19d563e2e2db98ecc5143229f554df6a09bc457e (diff)
parent27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (diff)
Merge pull request #18 from leapcode/feature/fixed-email-address
make email address just login@domain.tld
Diffstat (limited to 'users/test/unit/email_aliases_test.rb')
-rw-r--r--users/test/unit/email_aliases_test.rb30
1 files changed, 15 insertions, 15 deletions
diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index e3f060d..86d14aa 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -4,9 +4,9 @@ class EmailAliasTest < ActiveSupport::TestCase
setup do
@user = FactoryGirl.build :user
- @other_user = FactoryGirl.build :user
- @alias = "valid_alias@#{APP_CONFIG[:domain]}"
- User.find_by_email_or_alias(@alias).try(:destroy)
+ @alias = "valid_alias"
+ # make sure no existing records are in the way...
+ User.find_by_login_or_alias(@alias).try(:destroy)
end
test "no email aliases set in the beginning" do
@@ -17,13 +17,13 @@ class EmailAliasTest < ActiveSupport::TestCase
@user.attributes = {:email_aliases_attributes => {"0" => {:email => @alias}}}
assert @user.changed?
assert @user.save
- assert_equal @alias, @user.email_aliases.first.to_s
+ assert_equal @alias, @user.email_aliases.first.username
end
test "adding email alias directly" do
@user.email_aliases.build :email => @alias
assert @user.save
- assert_equal @alias, @user.reload.email_aliases.first.to_s
+ assert_equal @alias, @user.email_aliases.first.username
end
test "duplicated email aliases are invalid" do
@@ -32,29 +32,29 @@ class EmailAliasTest < ActiveSupport::TestCase
assert_invalid_alias @alias
end
- test "email alias needs to be different from other peoples email" do
- @other_user.email = @alias
- @other_user.save
+ test "email alias needs to be different from other peoples login" do
+ other_user = FactoryGirl.create :user, :login => @alias
assert_invalid_alias @alias
+ other_user.destroy
end
test "email needs to be different from other peoples email aliases" do
- @other_user.email_aliases.build :email => @alias
- @other_user.save
+ other_user = FactoryGirl.create :user, :email_aliases_attributes => {'1' => @alias}
assert_invalid_alias @alias
+ other_user.destroy
end
- test "email is invalid as email alias" do
- @user.email = @alias
+ test "login is invalid as email alias" do
+ @user.login = @alias
assert_invalid_alias @alias
end
test "find user by email alias" do
@user.email_aliases.build :email => @alias
assert @user.save
- assert_equal @user, User.find_by_email_or_alias(@alias)
- assert_equal @user, User.find_by_email_alias(@alias)
- assert_nil User.find_by_email(@alias)
+ assert_equal @user, User.find_by_login_or_alias(@alias)
+ assert_equal @user, User.find_by_alias(@alias)
+ assert_nil User.find_by_login(@alias)
end
def assert_invalid_alias(string)