Moved openid functional tests for their own test case.

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

diff --git a/test/functional/account_controller_openid_test.rb b/test/functional/account_controller_openid_test.rb
new file mode 100644 (file)
index 0000000..220cecb
--- /dev/null
+++ b/test/functional/account_controller_openid_test.rb
@@ -0,0 +1,133 @@
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class AccountControllerTest < ActionController::TestCase
+  tests AccountController
+  fixtures :users, :roles
+
+  def setup
+    User.current = nil
+  end
+
+  if Object.const_defined?(:OpenID)
+
+    def test_login_with_openid_for_existing_user
+      Setting.self_registration = '3'
+      Setting.openid = '1'
+      existing_user = User.new(:firstname => 'Cool',
+                               :lastname => 'User',
+                               :mail => 'user@somedomain.com',
+                               :identity_url => 'http://openid.example.com/good_user')
+      existing_user.login = 'cool_user'
+      assert existing_user.save!
+  
+      post :login, :openid_url => existing_user.identity_url
+      assert_redirected_to '/my/page'
+    end
+  
+    def test_login_with_invalid_openid_provider
+      Setting.self_registration = '0'
+      Setting.openid = '1'
+      post :login, :openid_url => 'http;//openid.example.com/good_user'
+      assert_redirected_to home_url
+    end
+  
+    def test_login_with_openid_for_existing_non_active_user
+      Setting.self_registration = '2'
+      Setting.openid = '1'
+      existing_user = User.new(:firstname => 'Cool',
+                               :lastname => 'User',
+                               :mail => 'user@somedomain.com',
+                               :identity_url => 'http://openid.example.com/good_user',
+                               :status => User::STATUS_REGISTERED)
+      existing_user.login = 'cool_user'
+      assert existing_user.save!
+  
+      post :login, :openid_url => existing_user.identity_url
+      assert_redirected_to '/login'
+    end
+  
+    def test_login_with_openid_with_new_user_created
+      Setting.self_registration = '3'
+      Setting.openid = '1'
+      post :login, :openid_url => 'http://openid.example.com/good_user'
+      assert_redirected_to '/my/account'
+      user = User.find_by_login('cool_user')
+      assert user
+      assert_equal 'Cool', user.firstname
+      assert_equal 'User', user.lastname
+    end
+  
+    def test_login_with_openid_with_new_user_and_self_registration_off
+      Setting.self_registration = '0'
+      Setting.openid = '1'
+      post :login, :openid_url => 'http://openid.example.com/good_user'
+      assert_redirected_to home_url
+      user = User.find_by_login('cool_user')
+      assert ! user
+    end
+  
+    def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token
+      Setting.self_registration = '1'
+      Setting.openid = '1'
+      post :login, :openid_url => 'http://openid.example.com/good_user'
+      assert_redirected_to '/login'
+      user = User.find_by_login('cool_user')
+      assert user
+  
+      token = Token.find_by_user_id_and_action(user.id, 'register')
+      assert token
+    end
+  
+    def test_login_with_openid_with_new_user_created_with_manual_activation
+      Setting.self_registration = '2'
+      Setting.openid = '1'
+      post :login, :openid_url => 'http://openid.example.com/good_user'
+      assert_redirected_to '/login'
+      user = User.find_by_login('cool_user')
+      assert user
+      assert_equal User::STATUS_REGISTERED, user.status
+    end
+  
+    def test_login_with_openid_with_new_user_with_conflict_should_register
+      Setting.self_registration = '3'
+      Setting.openid = '1'
+      existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com')
+      existing_user.login = 'cool_user'
+      assert existing_user.save!
+  
+      post :login, :openid_url => 'http://openid.example.com/good_user'
+      assert_response :success
+      assert_template 'register'
+      assert assigns(:user)
+      assert_equal 'http://openid.example.com/good_user', assigns(:user)[:identity_url]
+    end
+  
+    def test_setting_openid_should_return_true_when_set_to_true
+      Setting.openid = '1'
+      assert_equal true, Setting.openid?
+    end
+
+  else
+    puts "Skipping openid tests."
+
+    def test_dummy
+    end
+  end
+end

diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index c146c428901aa63f7fdb7944523dd75e4a5bfe53..923c7712490a5cba5df6cb70e6e2e3afa50482d0 100644 (file)
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -68,109 +68,6 @@ class AccountControllerTest < ActionController::TestCase
     assert_response 302
   end
 
-  if Object.const_defined?(:OpenID)
-
-  def test_login_with_openid_for_existing_user
-    Setting.self_registration = '3'
-    Setting.openid = '1'
-    existing_user = User.new(:firstname => 'Cool',
-                             :lastname => 'User',
-                             :mail => 'user@somedomain.com',
-                             :identity_url => 'http://openid.example.com/good_user')
-    existing_user.login = 'cool_user'
-    assert existing_user.save!
-
-    post :login, :openid_url => existing_user.identity_url
-    assert_redirected_to '/my/page'
-  end
-
-  def test_login_with_invalid_openid_provider
-    Setting.self_registration = '0'
-    Setting.openid = '1'
-    post :login, :openid_url => 'http;//openid.example.com/good_user'
-    assert_redirected_to home_url
-  end
-
-  def test_login_with_openid_for_existing_non_active_user
-    Setting.self_registration = '2'
-    Setting.openid = '1'
-    existing_user = User.new(:firstname => 'Cool',
-                             :lastname => 'User',
-                             :mail => 'user@somedomain.com',
-                             :identity_url => 'http://openid.example.com/good_user',
-                             :status => User::STATUS_REGISTERED)
-    existing_user.login = 'cool_user'
-    assert existing_user.save!
-
-    post :login, :openid_url => existing_user.identity_url
-    assert_redirected_to '/login'
-  end
-
-  def test_login_with_openid_with_new_user_created
-    Setting.self_registration = '3'
-    Setting.openid = '1'
-    post :login, :openid_url => 'http://openid.example.com/good_user'
-    assert_redirected_to '/my/account'
-    user = User.find_by_login('cool_user')
-    assert user
-    assert_equal 'Cool', user.firstname
-    assert_equal 'User', user.lastname
-  end
-
-  def test_login_with_openid_with_new_user_and_self_registration_off
-    Setting.self_registration = '0'
-    Setting.openid = '1'
-    post :login, :openid_url => 'http://openid.example.com/good_user'
-    assert_redirected_to home_url
-    user = User.find_by_login('cool_user')
-    assert ! user
-  end
-
-  def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token
-    Setting.self_registration = '1'
-    Setting.openid = '1'
-    post :login, :openid_url => 'http://openid.example.com/good_user'
-    assert_redirected_to '/login'
-    user = User.find_by_login('cool_user')
-    assert user
-
-    token = Token.find_by_user_id_and_action(user.id, 'register')
-    assert token
-  end
-
-  def test_login_with_openid_with_new_user_created_with_manual_activation
-    Setting.self_registration = '2'
-    Setting.openid = '1'
-    post :login, :openid_url => 'http://openid.example.com/good_user'
-    assert_redirected_to '/login'
-    user = User.find_by_login('cool_user')
-    assert user
-    assert_equal User::STATUS_REGISTERED, user.status
-  end
-
-  def test_login_with_openid_with_new_user_with_conflict_should_register
-    Setting.self_registration = '3'
-    Setting.openid = '1'
-    existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com')
-    existing_user.login = 'cool_user'
-    assert existing_user.save!
-
-    post :login, :openid_url => 'http://openid.example.com/good_user'
-    assert_response :success
-    assert_template 'register'
-    assert assigns(:user)
-    assert_equal 'http://openid.example.com/good_user', assigns(:user)[:identity_url]
-  end
-
-  def test_setting_openid_should_return_true_when_set_to_true
-    Setting.openid = '1'
-    assert_equal true, Setting.openid?
-  end
-
-  else
-    puts "Skipping openid tests."
-  end
-
   def test_logout
     @request.session[:user_id] = 2
     get :logout