summaryrefslogtreecommitdiff
path: root/users/test/unit/email_aliases_test.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-14 12:04:12 +0100
committerAzul <azul@leap.se>2013-01-14 12:04:12 +0100
commit3cd3c261bdf02b2da5217fa1c469d30f9d92c9a3 (patch)
tree3cf64d58e588b12103b3adac7397872427ed6677 /users/test/unit/email_aliases_test.rb
parent1623f51cc003f7de92f7192bba5ca88dfb2a92f6 (diff)
got users controller test to pass - tickets controller test next.
Diffstat (limited to 'users/test/unit/email_aliases_test.rb')
-rw-r--r--users/test/unit/email_aliases_test.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index 88f97f4..e3f060d 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -3,12 +3,8 @@ require 'test_helper'
class EmailAliasTest < ActiveSupport::TestCase
setup do
- @attribs = User.valid_attributes_hash
- User.find_by_login(@attribs[:login]).try(:destroy)
- @user = User.new(@attribs)
- @attribs.merge!(:login => "other_user")
- User.find_by_login(@attribs[:login]).try(:destroy)
- @other_user = User.create(@attribs)
+ @user = FactoryGirl.build :user
+ @other_user = FactoryGirl.build :user
@alias = "valid_alias@#{APP_CONFIG[:domain]}"
User.find_by_email_or_alias(@alias).try(:destroy)
end