diff options
author | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-07-02 15:36:23 -0700 |
---|---|---|
committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-08-14 00:03:32 +0800 |
commit | b1ba333ea72b8aa8fc5ffeda4067c128afb026e4 (patch) | |
tree | 3c88c707c9a1715fda7e31e307e5e1af8adc57ec /actionpack/lib | |
parent | e9ce987a9a6fdad436b5511874963e8485b66f84 (diff) | |
download | rails-b1ba333ea72b8aa8fc5ffeda4067c128afb026e4.tar.gz rails-b1ba333ea72b8aa8fc5ffeda4067c128afb026e4.tar.bz2 rails-b1ba333ea72b8aa8fc5ffeda4067c128afb026e4.zip |
Fix assert_template for files.
The test was not failing for `assert_template file: nil` when a file
has been rendered.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index eb5d824cbc..152420a54c 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -91,6 +91,13 @@ module ActionController # # assert that no partials were rendered # assert_template partial: false # + # # assert that a file was rendered + # assert_template file: "README.rdoc" + # + # # assert that no file was rendered + # assert_template file: nil + # assert_template file: false + # # In a view test case, you can also assert that specific locals are passed # to partials: # @@ -140,6 +147,8 @@ module ActionController if options[:file] assert_includes @_files.keys, options[:file] + elsif options.key?(:file) + assert @_files.blank?, "expected no files but #{@_files.keys} was rendered" end if expected_partial = options[:partial] |