Moved helpers for integration tests in a specific class.

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

diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 8d8444a9d3752ab613585613c3981a2f053afa4d..ca6516b9d659f1bfddba8028f8b7524541a99bed 100644 (file)
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AccountTest < ActionDispatch::IntegrationTest
+class AccountTest < Redmine::IntegrationTest
   fixtures :users, :roles
 
   def test_login

diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index 3b60f0c95aa79e0b1a813302d0ab8b93b1af4b92..c3334f5010be37017ce473daa878dcbf62fc1358 100644 (file)
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AdminTest < ActionDispatch::IntegrationTest
+class AdminTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,

diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index e40dda8ea6bf68eea07bf95ed58054d65aa1734c..5b8368732d1c0e7eefe40692464a2274ba9e095b 100644 (file)
--- a/test/integration/application_test.rb
+++ b/test/integration/application_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ApplicationTest < ActionDispatch::IntegrationTest
+class ApplicationTest < Redmine::IntegrationTest
   include Redmine::I18n
 
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/attachments_test.rb b/test/integration/attachments_test.rb
index 69d42d48a255383d2f656e7c45a0b1468097aae8..47577cbd088f3b87edc34bac060a17caba6c01ec 100644 (file)
--- a/test/integration/attachments_test.rb
+++ b/test/integration/attachments_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AttachmentsTest < ActionDispatch::IntegrationTest
+class AttachmentsTest < Redmine::IntegrationTest
   fixtures :projects, :enabled_modules,
            :users, :roles, :members, :member_roles,
            :trackers, :projects_trackers,

diff --git a/test/integration/feeds_test.rb b/test/integration/feeds_test.rb
index 160174f688baec507c232a9fd9feedf54616cc7e..6b7a245fa7c51b562ff5d1b412e3a16a6885a351 100644 (file)
--- a/test/integration/feeds_test.rb
+++ b/test/integration/feeds_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class FeedsTest < ActionDispatch::IntegrationTest
+class FeedsTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers, :enabled_modules,

diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 358389325f656be2adceeafa282f7543c0af5320..201105cebac4b00f331fd4501025b0f73f79888d 100644 (file)
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssuesTest < ActionDispatch::IntegrationTest
+class IssuesTest < Redmine::IntegrationTest
   fixtures :projects,
            :users,
            :roles,

diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index b4f472a750a1378596d9c9e0072abdf66d65270d..91c16c364f6e2c7b8a42d724fc2e0666ad66f64b 100644 (file)
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class LayoutTest < ActionDispatch::IntegrationTest
+class LayoutTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,

diff --git a/test/integration/lib/redmine/hook_test.rb b/test/integration/lib/redmine/hook_test.rb
index 9e5c5bbb12141f1a6d6c55d0fef98fc5e4150f92..20509ce4e19e86be7cc593be60d028a1862a9733 100644 (file)
--- a/test/integration/lib/redmine/hook_test.rb
+++ b/test/integration/lib/redmine/hook_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../../test_helper', __FILE__)
 
-class HookTest < ActionDispatch::IntegrationTest
+class HookTest < Redmine::IntegrationTest
   fixtures :users, :roles, :projects, :members, :member_roles
 
   # Hooks that are manually registered later

diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb
index bc4fbf017d4f1b6c7f2872b2da87cdba57592ec5..531af524a0de0d4e0b96cbcbc752f3a1ac0a413b 100644 (file)
--- a/test/integration/lib/redmine/menu_manager_test.rb
+++ b/test/integration/lib/redmine/menu_manager_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../../test_helper', __FILE__)
 
-class MenuManagerTest < ActionDispatch::IntegrationTest
+class MenuManagerTest < Redmine::IntegrationTest
   include Redmine::I18n
 
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
index f0d422c58b145fbc9cdc831a094edb1b1a6a8106..601e2e2b47e588a268d2fac7001ec56933384673 100644 (file)
--- a/test/integration/lib/redmine/themes_test.rb
+++ b/test/integration/lib/redmine/themes_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../../test_helper', __FILE__)
 
-class ThemesTest < ActionDispatch::IntegrationTest
+class ThemesTest < Redmine::IntegrationTest
 
   def setup
     @theme = Redmine::Themes.themes.last

diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb
index fcbf71daedbf63d277af421182406323dafd72a9..6bbeb656e042ab374f82a8b24fe1558a406d0261 100644 (file)
--- a/test/integration/projects_test.rb
+++ b/test/integration/projects_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ProjectsTest < ActionDispatch::IntegrationTest
+class ProjectsTest < Redmine::IntegrationTest
   fixtures :projects, :users, :members, :enabled_modules
 
   def test_archive_project

diff --git a/test/integration/repositories_git_test.rb b/test/integration/repositories_git_test.rb
index 14c7d087f96f2dc5f59d2abe584cb134fc8e7793..e366026989830fbb537238ba06587d1a196ae080 100644 (file)
--- a/test/integration/repositories_git_test.rb
+++ b/test/integration/repositories_git_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesGitTest < ActionDispatch::IntegrationTest
+class RepositoriesGitTest < Redmine::IntegrationTest
   fixtures :projects, :users, :roles, :members, :member_roles,
            :repositories, :enabled_modules
 

diff --git a/test/integration/users_test.rb b/test/integration/users_test.rb
index de5e35e185d19078be4f874e1ed198006990d599..85c6f31a2097cb2274d88714cb957d9e4b6d91f1 100644 (file)
--- a/test/integration/users_test.rb
+++ b/test/integration/users_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class UsersTest < ActionDispatch::IntegrationTest
+class UsersTest < Redmine::IntegrationTest
   fixtures :users
 
   def test_destroy_should_not_accept_get_requests

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7ec75708e70718d48a03c9913713f86adbeb19e4..4754aaf06ed70e57cbd870d8a0ee1eb3a3086bac 100644 (file)
--- 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