Temporarily modifies setup to call super directly. This can support more T::U runners.

13 files changed, 17 insertions, 0 deletions

diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index e46f95d18b..f03998231e 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -88,6 +88,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
   attr_accessor :request_forgery_protection_token, :form_authenticity_token
 
   def setup
+    super
     setup_post
     setup_user
 
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 5e2fc20167..44eca55a0e 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -4,6 +4,7 @@ class AssetTagHelperTest < ActionView::TestCase
   tests ActionView::Helpers::AssetTagHelper
 
   def setup
+    super
     silence_warnings do
       ActionView::Helpers::AssetTagHelper.send(
         :const_set,
@@ -629,6 +630,7 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   tests ActionView::Helpers::AssetTagHelper
 
   def setup
+    super
     ActionController::Base.relative_url_root = "/collaboration/hieraki"
 
     @controller = Class.new do
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 8a00a397ca..bd97caf5d7 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -170,6 +170,7 @@ class AtomFeedTest < ActionController::TestCase
   tests ScrollsController
 
   def setup
+    super
     @request.host = "www.nextangle.com"
   end
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 9454fd7e91..e268728c79 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -35,6 +35,7 @@ class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
 
   def setup
+    super
     @post = Post.new
     @comment = Comment.new
     def @post.errors()
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 86b321e6e5..6821832ee9 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -16,6 +16,7 @@ uses_mocha "FormOptionsHelperTest" do
     end
 
     def setup
+      super
       @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
         tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
         ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 0c8af60aa4..9d4dac64f2 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -4,6 +4,7 @@ class FormTagHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormTagHelper
 
   def setup
+    super
     @controller = Class.new do
       def url_for(options)
         "http://www.example.com"
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index d814f84752..cf79480ab5 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -6,6 +6,7 @@ class JavaScriptHelperTest < ActionView::TestCase
   attr_accessor :formats, :output_buffer
 
   def setup
+    super
     @template = self
   end
 
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 8ff29412bf..cd6ee6ea11 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -28,6 +28,7 @@ class PrototypeHelperBaseTest < ActionView::TestCase
   attr_accessor :formats, :output_buffer
 
   def setup
+    super
     @template = self
     @controller = Class.new do
       def url_for(options)
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 67aa047745..809ed6d6af 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -13,6 +13,7 @@ class RecordTagHelperTest < ActionView::TestCase
   tests ActionView::Helpers::RecordTagHelper
 
   def setup
+    super
     @post = Post.new
   end
 
diff --git a/actionpack/test/template/scriptaculous_helper_test.rb b/actionpack/test/template/scriptaculous_helper_test.rb
index 690a7751b5..bebc3cb9f4 100644
--- a/actionpack/test/template/scriptaculous_helper_test.rb
+++ b/actionpack/test/template/scriptaculous_helper_test.rb
@@ -4,6 +4,7 @@ class ScriptaculousHelperTest < ActionView::TestCase
   tests ActionView::Helpers::ScriptaculousHelper
 
   def setup
+    super
     @controller = Class.new do
       def url_for(options)
         url =  "http://www.example.com/"
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index 660f51b3be..c35a264abf 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -20,6 +20,7 @@ end
 
 class PeopleHelperTest < ActionView::TestCase
   def setup
+    super
     ActionController::Routing::Routes.draw do |map|
       map.people 'people', :controller => 'people', :action => 'index'
       map.connect ':controller/:action/:id'
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 564845779f..c420e1f13d 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -6,6 +6,7 @@ class TextHelperTest < ActionView::TestCase
   include TestingSandbox
 
   def setup
+    super
     # This simulates the fact that instance variables are reset every time
     # a view is rendered.  The cycle helper depends on this behavior.
     @_cycles = nil if (defined? @_cycles)
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 2f6fa134b5..c5147c2417 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -7,6 +7,7 @@ class UrlHelperTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
+    super
     @controller = Class.new do
       attr_accessor :url, :request
       def url_for(options)
@@ -347,6 +348,7 @@ class UrlHelperWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
+    super
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @controller = UrlHelperController.new
@@ -425,6 +427,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
+    super
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @controller = TasksController.new
@@ -527,6 +530,7 @@ class PolymorphicControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
+    super
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end