aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-03-18 17:15:22 +0000
committerJamis Buck <jamis@37signals.com>2006-03-18 17:15:22 +0000
commitb2122159b1eed173b37d0a240cb9d933f7564d24 (patch)
treea66369632245a001e20e5694e88b7f2847161636 /actionpack/test
parentaced2863f0c76169692287c36bf384e3abc35e3b (diff)
downloadrails-b2122159b1eed173b37d0a240cb9d933f7564d24.tar.gz
rails-b2122159b1eed173b37d0a240cb9d933f7564d24.tar.bz2
rails-b2122159b1eed173b37d0a240cb9d933f7564d24.zip
fix broken respond_to test
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3934 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb2
-rw-r--r--actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rhtml1
-rw-r--r--actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rjs1
-rw-r--r--actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rxml1
4 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 640bc900a0..06addad2ea 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -76,7 +76,7 @@ class RespondToController < ActionController::Base
end
def rescue_action(e)
- raise unless ActionController::MissingTemplate === e
+ raise
end
end
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.rhtml
new file mode 100644
index 0000000000..6769dd60bd
--- /dev/null
+++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rhtml
@@ -0,0 +1 @@
+Hello world! \ No newline at end of file
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.rjs
new file mode 100644
index 0000000000..469fcd8e15
--- /dev/null
+++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rjs
@@ -0,0 +1 @@
+page[:body].visual_effect :highlight \ No newline at end of file
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.rxml
new file mode 100644
index 0000000000..598d62e2fc
--- /dev/null
+++ b/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.rxml
@@ -0,0 +1 @@
+xml.p "Hello world!" \ No newline at end of file