Use 8+ characters long passwords in tests.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10886 e93f8b46-1217-0410-a6f0-8f06a7374b81

7 files changed, 42 insertions, 42 deletions

diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 05c3b047b..c715fa80d 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -119,8 +119,8 @@ class AccountControllerTest < ActionController::TestCase
       assert_difference 'User.count' do
         post :register, :user => {
           :login => 'register',
-          :password => 'test',
-          :password_confirmation => 'test',
+          :password => 'secret123',
+          :password_confirmation => 'secret123',
           :firstname => 'John',
           :lastname => 'Doe',
           :mail => 'register@example.com'
@@ -132,7 +132,7 @@ class AccountControllerTest < ActionController::TestCase
       assert_equal 'John', user.firstname
       assert_equal 'Doe', user.lastname
       assert_equal 'register@example.com', user.mail
-      assert user.check_password?('test')
+      assert user.check_password?('secret123')
       assert user.active?
     end
   end
@@ -218,10 +218,10 @@ class AccountControllerTest < ActionController::TestCase
     user = User.find(2)
     token = Token.create!(:action => 'recovery', :user => user)
 
-    post :lost_password, :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
+    post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
     assert_redirected_to '/login'
     user.reload
-    assert user.check_password?('newpass')
+    assert user.check_password?('newpass123')
     assert_nil Token.find_by_id(token.id), "Token was not deleted"
   end
 
@@ -230,9 +230,9 @@ class AccountControllerTest < ActionController::TestCase
     token = Token.create!(:action => 'recovery', :user => user)
     user.lock!
 
-    post :lost_password, :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
+    post :lost_password, :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
     assert_redirected_to '/'
-    assert ! user.check_password?('newpass')
+    assert ! user.check_password?('newpass123')
   end
 
   def test_post_lost_password_with_token_and_password_confirmation_failure_should_redisplay_the_form
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index e5ed9ed2b..f5f5f06b1 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -145,26 +145,26 @@ class MyControllerTest < ActionController::TestCase
 
     # non matching password confirmation
     post :password, :password => 'jsmith',
-                    :new_password => 'hello',
-                    :new_password_confirmation => 'hello2'
+                    :new_password => 'secret123',
+                    :new_password_confirmation => 'secret1234'
     assert_response :success
     assert_template 'password'
     assert_error_tag :content => /Password doesn&#x27;t match confirmation/
 
     # wrong password
     post :password, :password => 'wrongpassword',
-                    :new_password => 'hello',
-                    :new_password_confirmation => 'hello'
+                    :new_password => 'secret123',
+                    :new_password_confirmation => 'secret123'
     assert_response :success
     assert_template 'password'
     assert_equal 'Wrong password', flash[:error]
 
     # good password
     post :password, :password => 'jsmith',
-                    :new_password => 'hello',
-                    :new_password_confirmation => 'hello'
+                    :new_password => 'secret123',
+                    :new_password_confirmation => 'secret123'
     assert_redirected_to '/my/account'
-    assert User.try_to_login('jsmith', 'hello')
+    assert User.try_to_login('jsmith', 'secret123')
   end
 
   def test_change_password_should_redirect_if_user_cannot_change_its_password
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index db912bf6d..6ff9b72ab 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -173,8 +173,8 @@ class UsersControllerTest < ActionController::TestCase
             :firstname => 'John',
             :lastname => 'Doe',
             :login => 'jdoe',
-            :password => 'secret',
-            :password_confirmation => 'secret',
+            :password => 'secret123',
+            :password_confirmation => 'secret123',
             :mail => 'jdoe@gmail.com',
             :mail_notification => 'none'
           },
@@ -190,7 +190,7 @@ class UsersControllerTest < ActionController::TestCase
     assert_equal 'jdoe', user.login
     assert_equal 'jdoe@gmail.com', user.mail
     assert_equal 'none', user.mail_notification
-    assert user.check_password?('secret')
+    assert user.check_password?('secret123')
 
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
@@ -205,8 +205,8 @@ class UsersControllerTest < ActionController::TestCase
           :firstname => 'John',
           :lastname => 'Doe',
           :login => 'jdoe',
-          :password => 'secret',
-          :password_confirmation => 'secret',
+          :password => 'secret123',
+          :password_confirmation => 'secret123',
           :mail => 'jdoe@gmail.com',
           :mail_notification => 'none'
         },
@@ -287,14 +287,14 @@ class UsersControllerTest < ActionController::TestCase
     ActionMailer::Base.deliveries.clear
     Setting.bcc_recipients = '1'
 
-    put :update, :id => 2, :user => {:password => 'newpass', :password_confirmation => 'newpass'}, :send_information => '1'
+    put :update, :id => 2, :user => {:password => 'newpass123', :password_confirmation => 'newpass123'}, :send_information => '1'
     u = User.find(2)
-    assert u.check_password?('newpass')
+    assert u.check_password?('newpass123')
 
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal [u.mail], mail.bcc
-    assert_mail_body_match 'newpass', mail
+    assert_mail_body_match 'newpass123', mail
   end
 
   def test_update_user_switchin_from_auth_source_to_password_authentication
@@ -303,10 +303,10 @@ class UsersControllerTest < ActionController::TestCase
     u.auth_source = AuthSource.find(1)
     u.save!
 
-    put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass', :password_confirmation => 'newpass'}
+    put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass123', :password_confirmation => 'newpass123'}
 
     assert_equal nil, u.reload.auth_source
-    assert u.check_password?('newpass')
+    assert u.check_password?('newpass123')
   end
 
   def test_update_notified_project
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 905beb0a9..e16cda96b 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -91,11 +91,11 @@ class AccountTest < ActionController::IntegrationTest
     assert_select 'input[name=new_password]'
     assert_select 'input[name=new_password_confirmation]'
 
-    post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
+    post "account/lost_password", :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
     assert_redirected_to "/login"
     assert_equal 'Password was successfully updated.', flash[:notice]
 
-    log_user('jsmith', 'newpass')
+    log_user('jsmith', 'newpass123')
     assert_equal 0, Token.count
   end
 
@@ -107,7 +107,7 @@ class AccountTest < ActionController::IntegrationTest
     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"}
+                             :password => "newpass123", :password_confirmation => "newpass123"}
     assert_redirected_to '/my/account'
     follow_redirect!
     assert_response :success
@@ -123,7 +123,7 @@ class AccountTest < ActionController::IntegrationTest
     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"}
+                             :password => "newpass123", :password_confirmation => "newpass123"}
     assert_redirected_to '/login'
     assert !User.find_by_login('newuser').active?
   end
@@ -133,7 +133,7 @@ class AccountTest < ActionController::IntegrationTest
     Token.delete_all
 
     post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
-                             :password => "newpass", :password_confirmation => "newpass"}
+                             :password => "newpass123", :password_confirmation => "newpass123"}
     assert_redirected_to '/login'
     assert !User.find_by_login('newuser').active?
 
@@ -144,7 +144,7 @@ class AccountTest < ActionController::IntegrationTest
 
     get 'account/activate', :token => token.value
     assert_redirected_to '/login'
-    log_user('newuser', 'newpass')
+    log_user('newuser', 'newpass123')
   end
 
   def test_onthefly_registration
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index 3db7bb894..9ea1d538c 100644
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -102,7 +102,7 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
         @parameters = {
           :user => {
              :login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname',
-             :mail => 'foo@example.net', :password => 'secret',
+             :mail => 'foo@example.net', :password => 'secret123',
              :mail_notification => 'only_assigned'
           }
         }
@@ -113,7 +113,7 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
           '/users.xml',
            {:user => {
               :login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname',
-              :mail => 'foo@example.net', :password => 'secret'
+              :mail => 'foo@example.net', :password => 'secret123'
             }},
           {:success_code => :created})
 
@@ -129,7 +129,7 @@ class ApiTest::UsersTest < ActionController::IntegrationTest
           assert_equal 'foo@example.net', user.mail
           assert_equal 'only_assigned', user.mail_notification
           assert !user.admin?
-          assert user.check_password?('secret')
+          assert user.check_password?('secret123')
 
           assert_response :created
           assert_equal 'application/xml', @response.content_type
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index b1873b159..7539977f2 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -37,9 +37,9 @@ class LayoutTest < ActionController::IntegrationTest
   end
 
   test "browsing to an unauthorized page should render the base layout" do
-    change_user_password('miscuser9', 'test')
+    change_user_password('miscuser9', 'test1234')
 
-    log_user('miscuser9','test')
+    log_user('miscuser9','test1234')
 
     get "/admin"
     assert_response :forbidden
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index eff9a61ff..e3260b797 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -77,7 +77,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal 1, user.errors.count
 
     user.login = "newuser"
-    user.password, user.password_confirmation = "passwd", "password"
+    user.password, user.password_confirmation = "password", "pass"
     # password confirmation
     assert !user.save
     assert_equal 1, user.errors.count
@@ -375,12 +375,12 @@ class UserTest < ActiveSupport::TestCase
 
     should "select the exact matching user first" do
       case_sensitive_user = User.generate! do |user|
-        user.password = "admin"
+        user.password = "admin123"
       end
       # bypass validations to make it appear like existing data
       case_sensitive_user.update_attribute(:login, 'ADMIN')
 
-      user = User.try_to_login("ADMIN", "admin")
+      user = User.try_to_login("ADMIN", "admin123")
       assert_kind_of User, user
       assert_equal "ADMIN", user.login
 
@@ -391,10 +391,10 @@ class UserTest < ActiveSupport::TestCase
     user = User.try_to_login("admin", "admin")
     assert_kind_of User, user
     assert_equal "admin", user.login
-    user.password = "hello"
+    user.password = "hello123"
     assert user.save
 
-    user = User.try_to_login("admin", "hello")
+    user = User.try_to_login("admin", "hello123")
     assert_kind_of User, user
     assert_equal "admin", user.login
   end
@@ -695,7 +695,7 @@ class UserTest < ActiveSupport::TestCase
   def test_default_admin_account_changed_should_return_false_if_account_was_not_changed
     user = User.find_by_login("admin")
     user.password = "admin"
-    user.save!
+    assert user.save(:validate => false)
 
     assert_equal false, User.default_admin_account_changed?
   end
@@ -712,7 +712,7 @@ class UserTest < ActiveSupport::TestCase
     user = User.find_by_login("admin")
     user.password = "admin"
     user.status = User::STATUS_LOCKED
-    user.save!
+    assert user.save(:validate => false)
 
     assert_equal true, User.default_admin_account_changed?
   end