Moved helpers for integration tests in a specific class.

git-svn-id: http://svn.redmine.org/redmine/trunk@13680 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 17 insertions, 15 deletions

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7ec75708e..4754aaf06 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -43,24 +43,10 @@ class ActiveSupport::TestCase
   ESCAPED_CANT  = 'can't'
   ESCAPED_UCANT = 'Can't'
 
-  def log_user(login, password)
-    User.anonymous
-    get "/login"
-    assert_equal nil, session[:user_id]
-    assert_response :success
-    assert_template "account/login"
-    post "/login", :username => login, :password => password
-    assert_equal login, User.find(session[:user_id]).login
-  end
-
   def uploaded_test_file(name, mime)
     fixture_file_upload("files/#{name}", mime, true)
   end
 
-  def credentials(user, password=nil)
-    {'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)}
-  end
-
   # Mock out a file
   def self.mock_file
     file = 'a_file.png'
@@ -248,11 +234,27 @@ module Redmine
     end
   end
 
+  class IntegrationTest < ActionDispatch::IntegrationTest
+    def log_user(login, password)
+      User.anonymous
+      get "/login"
+      assert_equal nil, session[:user_id]
+      assert_response :success
+      assert_template "account/login"
+      post "/login", :username => login, :password => password
+      assert_equal login, User.find(session[:user_id]).login
+    end
+
+    def credentials(user, password=nil)
+      {'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)}
+    end
+  end
+
   module ApiTest
     API_FORMATS = %w(json xml).freeze
 
     # Base class for API tests
-    class Base < ActionDispatch::IntegrationTest
+    class Base < Redmine::IntegrationTest
       def setup
         Setting.rest_api_enabled = '1'
       end