diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-10 13:34:40 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-10 13:34:40 -0200 |
| commit | 2b5019e234b89a201e11ade6e280f3fc0e64f577 (patch) | |
| tree | e130e791c5353b1475e17ca9c9b428189b193925 /actionpack/test | |
| parent | 8d926f58d91020f9a8936ad6908939c0e298907b (diff) | |
| parent | 0121377cfb864e3a455280ff00531c4b066848bb (diff) | |
| download | rails-2b5019e234b89a201e11ade6e280f3fc0e64f577.tar.gz rails-2b5019e234b89a201e11ade6e280f3fc0e64f577.tar.bz2 rails-2b5019e234b89a201e11ade6e280f3fc0e64f577.zip | |
Merge pull request #8821 from jamis/master
Evaluate view_cache_dependencies at the instance level
Conflicts:
actionpack/lib/action_controller/caching.rb
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index eb5eeb0423..ca86837a2c 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -306,11 +306,11 @@ class ViewCacheDependencyTest < ActionController::TestCase end def test_view_cache_dependencies_are_empty_by_default - assert NoDependenciesController.view_cache_dependencies.empty? + assert NoDependenciesController.new.view_cache_dependencies.empty? end def test_view_cache_dependencies_are_listed_in_declaration_order - assert_equal %w(trombone flute), HasDependenciesController.view_cache_dependencies + assert_equal %w(trombone flute), HasDependenciesController.new.view_cache_dependencies end end |