diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/all_types_with_layout.html.erb (renamed from actionpack/test/fixtures/respond_to/all_types_with_layout.rhtml) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/all_types_with_layout.js.rjs (renamed from actionpack/test/fixtures/respond_to/all_types_with_layout.rjs) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults.html.erb (renamed from actionpack/test/fixtures/respond_to/using_defaults.rhtml) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults.js.rjs (renamed from actionpack/test/fixtures/respond_to/using_defaults.rjs) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults.xml.builder (renamed from actionpack/test/fixtures/respond_to/using_defaults.rxml) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults_with_type_list.html.erb (renamed from actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rhtml) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs (renamed from actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rjs) | 0 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder (renamed from actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rxml) | 0 |
9 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 3a1df02a7f..aa31d5b649 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -351,6 +351,6 @@ class MimeControllerTest < Test::Unit::TestCase assert_equal "using_defaults", @response.body get :using_defaults, :format => "xml" - assert_equal "using_defaults.rxml", @response.body + assert_equal "using_defaults.xml.builder", @response.body end end diff --git a/actionpack/test/fixtures/respond_to/all_types_with_layout.rhtml b/actionpack/test/fixtures/respond_to/all_types_with_layout.html.erb index 84a84049f8..84a84049f8 100644 --- a/actionpack/test/fixtures/respond_to/all_types_with_layout.rhtml +++ b/actionpack/test/fixtures/respond_to/all_types_with_layout.html.erb diff --git a/actionpack/test/fixtures/respond_to/all_types_with_layout.rjs b/actionpack/test/fixtures/respond_to/all_types_with_layout.js.rjs index b7aec7c505..b7aec7c505 100644 --- a/actionpack/test/fixtures/respond_to/all_types_with_layout.rjs +++ b/actionpack/test/fixtures/respond_to/all_types_with_layout.js.rjs diff --git a/actionpack/test/fixtures/respond_to/using_defaults.rhtml b/actionpack/test/fixtures/respond_to/using_defaults.html.erb index 6769dd60bd..6769dd60bd 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults.rhtml +++ b/actionpack/test/fixtures/respond_to/using_defaults.html.erb diff --git a/actionpack/test/fixtures/respond_to/using_defaults.rjs b/actionpack/test/fixtures/respond_to/using_defaults.js.rjs index 469fcd8e15..469fcd8e15 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults.rjs +++ b/actionpack/test/fixtures/respond_to/using_defaults.js.rjs diff --git a/actionpack/test/fixtures/respond_to/using_defaults.rxml b/actionpack/test/fixtures/respond_to/using_defaults.xml.builder index 598d62e2fc..598d62e2fc 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults.rxml +++ b/actionpack/test/fixtures/respond_to/using_defaults.xml.builder diff --git a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rhtml b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.html.erb index 6769dd60bd..6769dd60bd 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rhtml +++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.html.erb diff --git a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rjs b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs index 469fcd8e15..469fcd8e15 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rjs +++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs diff --git a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rxml b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder index 598d62e2fc..598d62e2fc 100644 --- a/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rxml +++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder |