aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-07-17 09:49:39 -0400
committerSean Griffin <sean@seantheprogrammer.com>2015-07-17 09:49:39 -0400
commit2c79122c0bbd61dcef12b95c80e025490d5a9783 (patch)
tree4fc7456d90d569df0a0526ce8e76e2f11276f1f3 /actionpack/test/controller
parente5bfe7149ac46de4ef68f15efd0b3c76ad8aa70c (diff)
parentae1b96cfcd0d47afa8d50a1a055a22d375c21fd4 (diff)
downloadrails-2c79122c0bbd61dcef12b95c80e025490d5a9783.tar.gz
rails-2c79122c0bbd61dcef12b95c80e025490d5a9783.tar.bz2
rails-2c79122c0bbd61dcef12b95c80e025490d5a9783.zip
Merge pull request #20915 from robin850/jruby-skips
Skip a few failing tests on JRuby with the attached tickets
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/parameters/mutators_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/controller/parameters/mutators_test.rb b/actionpack/test/controller/parameters/mutators_test.rb
index 744d8664be..6c57c4caeb 100644
--- a/actionpack/test/controller/parameters/mutators_test.rb
+++ b/actionpack/test/controller/parameters/mutators_test.rb
@@ -62,11 +62,15 @@ class ParametersMutatorsTest < ActiveSupport::TestCase
end
test "select! retains permitted status" do
+ jruby_skip "https://github.com/jruby/jruby/issues/3137"
+
@params.permit!
assert @params.select! { |k| k != "person" }.permitted?
end
test "select! retains unpermitted status" do
+ jruby_skip "https://github.com/jruby/jruby/issues/3137"
+
assert_not @params.select! { |k| k != "person" }.permitted?
end