aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 13:31:57 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 13:31:57 -0200
commite12be48774e174be3e79b0108073efdc418956b5 (patch)
treece691cc50e85bb093f9605030f2843d4aef43388
parentf26c955b9a1ea9409db14ec2340ffeaba9ecab24 (diff)
parent8dfa585db2539d8e5d933ac57e19c07fb6daa953 (diff)
downloadrails-e12be48774e174be3e79b0108073efdc418956b5.tar.gz
rails-e12be48774e174be3e79b0108073efdc418956b5.tar.bz2
rails-e12be48774e174be3e79b0108073efdc418956b5.zip
Merge pull request #18036 from claudiob/remove-redundant-tests-about-around-actions-returning-false
Remove misleading test: around_action return false
-rw-r--r--actionpack/test/controller/filters_test.rb20
1 files changed, 1 insertions, 19 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 38533dbf23..829729eb1b 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -504,7 +504,6 @@ class FilterTest < ActionController::TestCase
def non_yielding_action
@filters << "it didn't yield"
- @filter_return_value
end
def action_three
@@ -528,32 +527,15 @@ class FilterTest < ActionController::TestCase
end
end
- def test_non_yielding_around_actions_not_returning_false_do_not_raise
+ def test_non_yielding_around_actions_do_not_raise
controller = NonYieldingAroundFilterController.new
- controller.instance_variable_set "@filter_return_value", true
assert_nothing_raised do
test_process(controller, "index")
end
end
- def test_non_yielding_around_actions_returning_false_do_not_raise
- controller = NonYieldingAroundFilterController.new
- controller.instance_variable_set "@filter_return_value", false
- assert_nothing_raised do
- test_process(controller, "index")
- end
- end
-
- def test_after_actions_are_not_run_if_around_action_returns_false
- controller = NonYieldingAroundFilterController.new
- controller.instance_variable_set "@filter_return_value", false
- test_process(controller, "index")
- assert_equal ["filter_one", "it didn't yield"], controller.assigns['filters']
- end
-
def test_after_actions_are_not_run_if_around_action_does_not_yield
controller = NonYieldingAroundFilterController.new
- controller.instance_variable_set "@filter_return_value", true
test_process(controller, "index")
assert_equal ["filter_one", "it didn't yield"], controller.assigns['filters']
end