summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2010-12-12 23:24:34 +0000
committerJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2010-12-12 23:24:34 +0000
commit17f86d964fe05e677714baa35ec319abe13ae8bf (patch)
tree0b5c1d07883152cfe5ed8b1a7b76c2388d97583d /test/integration
parentf9f1bd58d6a6563e99b067195975c7b101817ab0 (diff)
downloadredmine-17f86d964fe05e677714baa35ec319abe13ae8bf.tar.gz
redmine-17f86d964fe05e677714baa35ec319abe13ae8bf.zip
Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/account_test.rb2
-rw-r--r--test/integration/admin_test.rb2
-rw-r--r--test/integration/api_test/disabled_rest_api_test.rb2
-rw-r--r--test/integration/api_test/http_basic_login_test.rb2
-rw-r--r--test/integration/api_test/http_basic_login_with_api_token_test.rb2
-rw-r--r--test/integration/api_test/issues_test.rb2
-rw-r--r--test/integration/api_test/news_test.rb2
-rw-r--r--test/integration/api_test/projects_test.rb2
-rw-r--r--test/integration/api_test/time_entries_test.rb2
-rw-r--r--test/integration/api_test/token_authentication_test.rb2
-rw-r--r--test/integration/api_test/users_test.rb2
-rw-r--r--test/integration/application_test.rb2
-rw-r--r--test/integration/issues_test.rb2
-rw-r--r--test/integration/layout_test.rb2
-rw-r--r--test/integration/lib/redmine/menu_manager_test.rb2
-rw-r--r--test/integration/projects_test.rb2
-rw-r--r--test/integration/routing_test.rb2
17 files changed, 17 insertions, 17 deletions
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 69e42f6d1..4943f862e 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
begin
require 'mocha'
diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index af44d5226..b2664af02 100644
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class AdminTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb
index d94d14b6e..13ad4a00d 100644
--- a/test/integration/api_test/disabled_rest_api_test.rb
+++ b/test/integration/api_test/disabled_rest_api_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::DisabledRestApiTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/http_basic_login_test.rb b/test/integration/api_test/http_basic_login_test.rb
index 21b584c79..a27331da4 100644
--- a/test/integration/api_test/http_basic_login_test.rb
+++ b/test/integration/api_test/http_basic_login_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::HttpBasicLoginTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/http_basic_login_with_api_token_test.rb b/test/integration/api_test/http_basic_login_with_api_token_test.rb
index 42c0be287..e47f7365a 100644
--- a/test/integration/api_test/http_basic_login_with_api_token_test.rb
+++ b/test/integration/api_test/http_basic_login_with_api_token_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::HttpBasicLoginWithApiTokenTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index a5bda05c1..bfcd63e2a 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::IssuesTest < ActionController::IntegrationTest
fixtures :projects,
diff --git a/test/integration/api_test/news_test.rb b/test/integration/api_test/news_test.rb
index 2d09e6d4c..646c06fbe 100644
--- a/test/integration/api_test/news_test.rb
+++ b/test/integration/api_test/news_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
require 'pp'
class ApiTest::NewsTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
index aaf40e1d5..e40d6584a 100644
--- a/test/integration/api_test/projects_test.rb
+++ b/test/integration/api_test/projects_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::ProjectsTest < ActionController::IntegrationTest
fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb
index 317baba67..60a9dba62 100644
--- a/test/integration/api_test/time_entries_test.rb
+++ b/test/integration/api_test/time_entries_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::TimeEntriesTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/token_authentication_test.rb b/test/integration/api_test/token_authentication_test.rb
index 5c116c161..dbd8c8e36 100644
--- a/test/integration/api_test/token_authentication_test.rb
+++ b/test/integration/api_test/token_authentication_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
class ApiTest::TokenAuthenticationTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index f19a64989..b1687b7ed 100644
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../test_helper"
+require File.expand_path('../../../test_helper', __FILE__)
require 'pp'
class ApiTest::UsersTest < ActionController::IntegrationTest
fixtures :users
diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index fba11e049..f6bb2f24e 100644
--- a/test/integration/application_test.rb
+++ b/test/integration/application_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class ApplicationTest < ActionController::IntegrationTest
include Redmine::I18n
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 61024ce22..b6955d252 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class IssuesTest < ActionController::IntegrationTest
fixtures :projects,
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index 001bf50d2..cb6371601 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class LayoutTest < ActionController::IntegrationTest
fixtures :all
diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb
index 0ff59cf48..ae814caf5 100644
--- a/test/integration/lib/redmine/menu_manager_test.rb
+++ b/test/integration/lib/redmine/menu_manager_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../../../test_helper"
+require File.expand_path('../../../../test_helper', __FILE__)
class MenuManagerTest < ActionController::IntegrationTest
include Redmine::I18n
diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb
index 26b1a5ca9..5c4602a5f 100644
--- a/test/integration/projects_test.rb
+++ b/test/integration/projects_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class ProjectsTest < ActionController::IntegrationTest
fixtures :projects, :users, :members
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 7d467b5d3..01462a74e 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -15,7 +15,7 @@
# 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.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
class RoutingTest < ActionController::IntegrationTest
context "activities" do