diff options
28 files changed, 54 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/testing/test_case.rb index c14785ba83..4f38f75f41 100644 --- a/actionpack/lib/action_controller/testing/test_case.rb +++ b/actionpack/lib/action_controller/testing/test_case.rb @@ -141,7 +141,9 @@ module ActionController end end - setup :setup_controller_request_and_response + def setup + setup_controller_request_and_response + end @@controller_class = nil diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index cb7922efd2..96f7a42c9b 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -168,11 +168,13 @@ end class ActionPackAssertionsControllerTest < ActionController::TestCase # let's get this party started def setup + super ActionController::Routing::Routes.reload ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user)) end def teardown + super ActionController::Routing::Routes.reload end diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb index 556b0593ea..2f092b6731 100644 --- a/actionpack/test/controller/addresses_render_test.rb +++ b/actionpack/test/controller/addresses_render_test.rb @@ -23,6 +23,7 @@ class AddressesTest < ActionController::TestCase tests AddressesTestController def setup + super # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". @controller.logger = Logger.new(nil) diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb index 99c57c0c91..3db1d4addf 100644 --- a/actionpack/test/controller/assert_select_test.rb +++ b/actionpack/test/controller/assert_select_test.rb @@ -66,12 +66,14 @@ class AssertSelectTest < ActionController::TestCase tests AssertSelectController def setup + super ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] end def teardown + super ActionMailer::Base.deliveries.clear end diff --git a/actionpack/test/controller/benchmark_test.rb b/actionpack/test/controller/benchmark_test.rb index f9100a2313..66ebfcf20a 100644 --- a/actionpack/test/controller/benchmark_test.rb +++ b/actionpack/test/controller/benchmark_test.rb @@ -20,6 +20,7 @@ class BenchmarkTest < ActionController::TestCase end def setup + super # benchmark doesn't do anything unless a logger is set @controller.logger = MockLogger.new @request.host = "test.actioncontroller.i" diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 7f8e47ba58..d743f50dff 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -44,6 +44,7 @@ end class PageCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true ActionController::Routing::Routes.draw do |map| @@ -224,6 +225,7 @@ end class ActionCacheTest < ActionController::TestCase def setup + super reset! FileUtils.mkdir_p(FILE_STORE_PATH) @path_class = ActionController::Caching::Actions::ActionCachePath @@ -473,6 +475,7 @@ end class FragmentCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true @store = ActiveSupport::Cache::MemoryStore.new ActionController::Base.cache_store = @store @@ -605,6 +608,7 @@ end class FunctionalFragmentCachingTest < ActionController::TestCase def setup + super ActionController::Base.perform_caching = true @store = ActiveSupport::Cache::MemoryStore.new ActionController::Base.cache_store = @store diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index 6dfa0995eb..9a0976ca9f 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -27,6 +27,7 @@ class CaptureTest < ActionController::TestCase tests CaptureController def setup + super # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". @controller.logger = Logger.new(nil) diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb index 32c1757ef9..7377546631 100644 --- a/actionpack/test/controller/content_type_test.rb +++ b/actionpack/test/controller/content_type_test.rb @@ -54,6 +54,7 @@ class ContentTypeTest < ActionController::TestCase tests ContentTypeController def setup + super # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". @controller.logger = Logger.new(nil) @@ -136,10 +137,12 @@ class AcceptBasedContentTypeTest < ActionController::TestCase tests ContentTypeController def setup + super ActionController::Base.use_accept_header = true end def teardown + super ActionController::Base.use_accept_header = false end diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb index 9508348ca1..5a00de50ac 100644 --- a/actionpack/test/controller/cookie_test.rb +++ b/actionpack/test/controller/cookie_test.rb @@ -44,6 +44,7 @@ class CookieTest < ActionController::TestCase tests TestController def setup + super @request.host = "www.nextangle.com" end diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 16c16aa88d..09283eddc9 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -37,6 +37,7 @@ end class LayoutAutoDiscoveryTest < ActionController::TestCase def setup + super @request.host = "www.nextangle.com" end diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb index 3c936854dd..1f3ff4ef52 100644 --- a/actionpack/test/controller/logging_test.rb +++ b/actionpack/test/controller/logging_test.rb @@ -18,7 +18,10 @@ class LoggingTest < ActionController::TestCase end end - setup :set_logger + def setup + super + set_logger + end def test_logging_without_parameters get :show diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 948e90254d..f40a2e04d6 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -166,11 +166,13 @@ class MimeControllerTest < ActionController::TestCase tests RespondToController def setup + super ActionController::Base.use_accept_header = true @request.host = "www.example.com" end def teardown + super ActionController::Base.use_accept_header = false end @@ -511,6 +513,7 @@ class MimeControllerLayoutsTest < ActionController::TestCase tests PostController def setup + super @request.host = "www.example.com" end diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index d3ac844541..dde49cd136 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -696,6 +696,7 @@ class RenderTest < ActionController::TestCase def setup # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". + super @controller.logger = Logger.new(nil) @request.host = "www.nextangle.com" @@ -1460,6 +1461,7 @@ class EtagRenderTest < ActionController::TestCase tests TestController def setup + super @request.host = "www.nextangle.com" @expected_bang_etag = etag_for(expand_key([:foo, 123])) end @@ -1560,6 +1562,7 @@ class LastModifiedRenderTest < ActionController::TestCase tests TestController def setup + super @request.host = "www.nextangle.com" @last_modified = Time.now.utc.beginning_of_day.httpdate end @@ -1615,6 +1618,7 @@ class RenderingLoggingTest < ActionController::TestCase tests TestController def setup + super @request.host = "www.nextangle.com" end diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb index a2a2a3ee29..744ca9286c 100644 --- a/actionpack/test/controller/rescue_test.rb +++ b/actionpack/test/controller/rescue_test.rb @@ -143,8 +143,11 @@ end class RescueControllerTest < ActionController::TestCase FIXTURE_PUBLIC = "#{File.dirname(__FILE__)}/../fixtures".freeze - setup :set_all_requests_local - setup :populate_exception_object + def setup + super + set_all_requests_local + populate_exception_object + end def set_all_requests_local RescueController.consider_all_requests_local = true diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index d378188b43..55b59d9401 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -119,6 +119,7 @@ XML end def setup + super @controller = TestController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -127,6 +128,7 @@ XML end def teardown + super ActionController::Routing::Routes.reload end 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 |