From a1fa133d70bd61bf43a5422e705a28b15b6497e8 Mon Sep 17 00:00:00 2001
From: Brian Hogan <brianhogan@napcs.com>
Date: Sun, 11 May 2008 22:20:09 -0500
Subject: [PATCH] Updated the tests that come from the generators to load the test helper properly. Some environments like TextMate and the command line (ruby test/unit/foo_test.rb) have trouble without this fix.

---
 .../controller/templates/functional_test.rb        |    2 +-
 .../integration_test/templates/integration_test.rb |    2 +-
 .../components/mailer/templates/unit_test.rb       |    2 +-
 .../components/model/templates/unit_test.rb        |    2 +-
 .../components/observer/templates/unit_test.rb     |    2 +-
 .../resource/templates/functional_test.rb          |    2 +-
 .../scaffold/templates/functional_test.rb          |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
index 38e0ae7..876bd79 100644
--- a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb b/railties/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
index 149b987..59da264 100644
--- a/railties/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
+++ b/railties/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= class_name %>Test < ActionController::IntegrationTest
   # fixtures :your, :models
diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
index 0b4b2ec..a732b01 100644
--- a/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= class_name %>Test < ActionMailer::TestCase
   tests <%= class_name %>
diff --git a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
index 96bd34a..e4a8f52 100644
--- a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= class_name %>Test < ActiveSupport::TestCase
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
index 1faf8ed..7ba7d6b 100644
--- a/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= class_name %>ObserverTest < Test::Unit::TestCase
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
index fbb69fc..0b38943 100644
--- a/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
index 3b430a2..6a314f4 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   def test_should_get_index
-- 
1.5.4.3