diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
| commit | c01c8967a02537f132d437d5ae15332982119651 (patch) | |
| tree | 76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /actionpack/test/new_base/render_layout_test.rb | |
| parent | 770fca10fba68fa14308f33e923493e6f63bfa35 (diff) | |
| parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
| download | rails-c01c8967a02537f132d437d5ae15332982119651.tar.gz rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2 rails-c01c8967a02537f132d437d5ae15332982119651.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'actionpack/test/new_base/render_layout_test.rb')
| -rw-r--r-- | actionpack/test/new_base/render_layout_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/new_base/render_layout_test.rb b/actionpack/test/new_base/render_layout_test.rb index 279b807a5f..933eef58e7 100644 --- a/actionpack/test/new_base/render_layout_test.rb +++ b/actionpack/test/new_base/render_layout_test.rb @@ -83,7 +83,7 @@ module ControllerLayouts testing ControllerLayouts::MismatchFormatController test "if JS is selected, an HTML template is not also selected" do - get :index + get :index, "format" => "js" assert_response "$(\"test\").omg();" end |