From 9f6496b0bccb50deb65c162e6c51f4ad955d6601 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 5 Feb 2012 12:17:29 +0000
Subject: Fixed registration form broken by r8479.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8782 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
test/functional/account_controller_test.rb | 7 +++++++
test/integration/account_test.rb | 12 ++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
(limited to 'test')
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 1adb92eea..00142ffd0 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -167,6 +167,9 @@ class AccountControllerTest < ActionController::TestCase
assert_response :success
assert_template 'register'
assert_not_nil assigns(:user)
+
+ assert_tag 'input', :attributes => {:name => 'user[password]'}
+ assert_tag 'input', :attributes => {:name => 'user[password_confirmation]'}
end
end
@@ -193,6 +196,10 @@ class AccountControllerTest < ActionController::TestCase
end
user = User.first(:order => 'id DESC')
assert_equal 'register', user.login
+ assert_equal 'John', user.firstname
+ assert_equal 'Doe', user.lastname
+ assert_equal 'register@example.com', user.mail
+ assert user.check_password?('test')
assert user.active?
end
end
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 53b40aad1..8cf105f2e 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -103,8 +103,8 @@ class AccountTest < ActionController::IntegrationTest
assert_response :success
assert_template 'account/register'
- post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
- :password => "newpass", :password_confirmation => "newpass"
+ post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
+ :password => "newpass", :password_confirmation => "newpass"}
assert_redirected_to '/my/account'
follow_redirect!
assert_response :success
@@ -119,8 +119,8 @@ class AccountTest < ActionController::IntegrationTest
def test_register_with_manual_activation
Setting.self_registration = '2'
- post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
- :password => "newpass", :password_confirmation => "newpass"
+ post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
+ :password => "newpass", :password_confirmation => "newpass"}
assert_redirected_to '/login'
assert !User.find_by_login('newuser').active?
end
@@ -129,8 +129,8 @@ class AccountTest < ActionController::IntegrationTest
Setting.self_registration = '1'
Token.delete_all
- post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
- :password => "newpass", :password_confirmation => "newpass"
+ post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
+ :password => "newpass", :password_confirmation => "newpass"}
assert_redirected_to '/login'
assert !User.find_by_login('newuser').active?
--
cgit v1.2.3