aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorZuhao Wan <wanzuhao@gmail.com>2014-05-16 23:09:43 +0800
committerZuhao Wan <wanzuhao@gmail.com>2014-05-17 19:09:09 +0800
commit45c396bd82e1492077d351deb014bf77e7f27795 (patch)
treec90337742371f12accb2c8ecb9cbc4741f22ee5c /actionpack
parent8109dc8067a0e25933cd5cbc6adba365504ea054 (diff)
downloadrails-45c396bd82e1492077d351deb014bf77e7f27795.tar.gz
rails-45c396bd82e1492077d351deb014bf77e7f27795.tar.bz2
rails-45c396bd82e1492077d351deb014bf77e7f27795.zip
Ensure :js is defined regardless of the outcome of the test.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract/collector_test.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
index b1a5044399..fc59bf19c4 100644
--- a/actionpack/test/abstract/collector_test.rb
+++ b/actionpack/test/abstract/collector_test.rb
@@ -24,15 +24,21 @@ module AbstractController
test "does not respond to unknown mime types" do
collector = MyCollector.new
- assert !collector.respond_to?(:unknown)
+ assert_not_respond_to collector, :unknown
end
test "register mime types on method missing" do
AbstractController::Collector.send(:remove_method, :js)
- collector = MyCollector.new
- assert !collector.respond_to?(:js)
- collector.js
- assert_respond_to collector, :js
+ begin
+ collector = MyCollector.new
+ assert_not_respond_to collector, :js
+ collector.js
+ assert_respond_to collector, :js
+ ensure
+ unless AbstractController::Collector.method_defined? :js
+ AbstractController::Collector.generate_method_for_mime :js
+ end
+ end
end
test "does not register unknown mime types" do