diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-05-24 22:02:22 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-05-30 18:57:10 +0200 |
| commit | 4abe29d813bf3212b2d6d2af9e17caa337330a15 (patch) | |
| tree | cd1fff6b55b9b7832913e265272ac05bcfce6f7f /actionpack | |
| parent | 7f60bedd7aca0c62d59e6f7971e73e214c2fb9db (diff) | |
| download | rails-4abe29d813bf3212b2d6d2af9e17caa337330a15.tar.gz rails-4abe29d813bf3212b2d6d2af9e17caa337330a15.tar.bz2 rails-4abe29d813bf3212b2d6d2af9e17caa337330a15.zip | |
Replace expectation with state check.
The tests would still pass if the cache call in the rendered templates were removed.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/fixtures/customers/_commented_customer.html.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/customers/_customer.html.erb | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 2d6607041d..de697858c3 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -352,6 +352,8 @@ class ViewCacheDependencyTest < ActionController::TestCase end class CollectionCacheController < ActionController::Base + attr_accessor :partial_rendered_times + def index @customers = [Customer.new('david', params[:id] || 1)] end @@ -377,14 +379,15 @@ class AutomaticCollectionCacheTest < ActionController::TestCase super @controller = CollectionCacheController.new @controller.perform_caching = true - @controller.cache_store = ActiveSupport::Cache::MemoryStore.new + @controller.partial_rendered_times = 0 end def test_collection_fetches_cached_views get :index + assert_equal 1, @controller.partial_rendered_times - ActionView::PartialRenderer.expects(:collection_with_template).never get :index + assert_equal 1, @controller.partial_rendered_times end def test_preserves_order_when_reading_from_cache_plus_rendering @@ -402,8 +405,9 @@ class AutomaticCollectionCacheTest < ActionController::TestCase def test_caching_works_with_beginning_comment get :index_with_comment + assert_equal 1, @controller.partial_rendered_times - ActionView::PartialRenderer.expects(:collection_with_template).never get :index_with_comment + assert_equal 1, @controller.partial_rendered_times end end diff --git a/actionpack/test/fixtures/customers/_commented_customer.html.erb b/actionpack/test/fixtures/customers/_commented_customer.html.erb index d5f6e3b491..8cc9c1ec13 100644 --- a/actionpack/test/fixtures/customers/_commented_customer.html.erb +++ b/actionpack/test/fixtures/customers/_commented_customer.html.erb @@ -1,4 +1,5 @@ <%# I'm a comment %> <% cache customer do %> + <% controller.partial_rendered_times += 1 %> <%= customer.name %>, <%= customer.id %> <% end %>
\ No newline at end of file diff --git a/actionpack/test/fixtures/customers/_customer.html.erb b/actionpack/test/fixtures/customers/_customer.html.erb index 67e9f6d411..5105090d4b 100644 --- a/actionpack/test/fixtures/customers/_customer.html.erb +++ b/actionpack/test/fixtures/customers/_customer.html.erb @@ -1,3 +1,4 @@ <% cache customer do %> + <% controller.partial_rendered_times += 1 %> <%= customer.name %>, <%= customer.id %> <% end %>
\ No newline at end of file |