diff options
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/new_base/render_once_test.rb | 11 | ||||
-rw-r--r-- | actionpack/test/template/lookup_context_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/template/template_test.rb | 8 |
3 files changed, 1 insertions, 22 deletions
diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb index 3a847ac932..3035ed4ff2 100644 --- a/actionpack/test/controller/new_base/render_once_test.rb +++ b/actionpack/test/controller/new_base/render_once_test.rb @@ -79,17 +79,8 @@ module RenderTemplate end end - class TestWithResolverCache < Rack::TestCase + class TestRenderOnce < Rack::TestCase testing RenderTemplate::RenderOnceController include Tests end - - class TestWithoutResolverCache < Rack::TestCase - testing RenderTemplate::RenderOnceController - include Tests - - def setup - RenderTemplate::RenderOnceController::RESOLVER.stubs(:caching?).returns(false) - end - end end diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb index 850589b13b..6d3b26e131 100644 --- a/actionpack/test/template/lookup_context_test.rb +++ b/actionpack/test/template/lookup_context_test.rb @@ -180,10 +180,6 @@ class LookupContextTest < ActiveSupport::TestCase assert_not_equal template, old_template end - - test "can have cache disabled on initialization" do - assert !ActionView::LookupContext.new(FIXTURE_LOAD_PATH, :cache => false).cache - end end class LookupContextWithFalseCaching < ActiveSupport::TestCase diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb index f2156c31de..63f792d328 100644 --- a/actionpack/test/template/template_test.rb +++ b/actionpack/test/template/template_test.rb @@ -151,14 +151,6 @@ class TestERBTemplate < ActiveSupport::TestCase end end - def test_inline_template_is_only_equal_if_source_match - inline1 = ActionView::Template::Inline.new("sample", ERBHandler) - inline2 = ActionView::Template::Inline.new("sample", ERBHandler) - inline3 = ActionView::Template::Inline.new("other", ERBHandler) - assert inline1.eql?(inline2) - assert !inline1.eql?(inline3) - end - if "ruby".encoding_aware? def test_resulting_string_is_utf8 @template = new_template |