Merge branch 'master' into develop

Conflicts:
	users/test/unit/user_test.rb

3 files changed, 104 insertions, 1 deletions

diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
new file mode 100644
index 0000000..762aaea
--- /dev/null
+++ b/users/test/unit/email_aliases_test.rb
@@ -0,0 +1,57 @@
+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)
+  end
+
+  test "no email aliases set in the beginning" do
+    assert_equal [], @user.email_aliases
+  end
+
+  test "adding email alias through params" do
+    email_alias = "valid_alias@domain.net"
+    @user.attributes = {:email_aliases_attributes => {"0" => {:email => email_alias}}}
+    assert @user.changed?
+    assert @user.save
+    assert_equal email_alias, @user.email_aliases.first.to_s
+  end
+
+  test "adding email alias directly" do
+    email_alias = "valid_alias@domain.net"
+    @user.add_email_alias(email_alias)
+    assert @user.changed?
+    assert @user.save
+    assert_equal email_alias, @user.reload.email_aliases.first.to_s
+  end
+
+  test "duplicated email aliases are invalid" do
+    email_alias = "valid_alias@domain.net"
+    @user.add_email_alias(email_alias)
+    @user.save
+    # add again
+    @user.add_email_alias(email_alias)
+    assert @user.changed?
+    assert !@user.valid?
+  end
+
+  test "email is invalid as email alias" do
+    email_alias = "valid_alias@domain.net"
+    @user.email = email_alias
+    @user.add_email_alias(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)
+    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_nil User.find_by_email(email_alias)
+  end
+end
diff --git a/users/test/unit/email_test.rb b/users/test/unit/email_test.rb
new file mode 100644
index 0000000..1e216d6
--- /dev/null
+++ b/users/test/unit/email_test.rb
@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class EmailTest < ActiveSupport::TestCase
+
+  setup do
+    # TODO build helper for this ... make_record(User)
+    @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)
+  end
+
+  teardown do
+    @user.destroy if @user.persisted? # just in case
+    @other_user.destroy
+  end
+
+
+  test "email aliases need to be unique" do
+    email_alias = "valid_alias@domain.net"
+    @other_user.add_email_alias email_alias
+    @other_user.save
+    @user.add_email_alias email_alias
+    assert @user.changed?
+    assert !@user.save
+    # TODO handle errors
+  end
+
+  test "email aliases may not conflict with emails" do
+    email_alias = "valid_alias@domain.net"
+    @other_user.email = email_alias
+    @other_user.save
+    @user.add_email_alias email_alias
+    assert @user.changed?
+    assert !@user.save
+  end
+end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 2269d4e..5d2a7ea 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -59,5 +59,12 @@ class UserTest < ActiveSupport::TestCase
 
   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