diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-07-17 09:49:39 -0400 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-07-17 09:49:39 -0400 |
commit | 2c79122c0bbd61dcef12b95c80e025490d5a9783 (patch) | |
tree | 4fc7456d90d569df0a0526ce8e76e2f11276f1f3 | |
parent | e5bfe7149ac46de4ef68f15efd0b3c76ad8aa70c (diff) | |
parent | ae1b96cfcd0d47afa8d50a1a055a22d375c21fd4 (diff) | |
download | rails-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
-rw-r--r-- | actionpack/test/controller/parameters/mutators_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/dispatch/response_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/routing/concerns_test.rb | 2 |
3 files changed, 8 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 diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 7aca251066..5aa0215e8f 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -171,6 +171,8 @@ class ResponseTest < ActiveSupport::TestCase end test "read content type without charset" do + jruby_skip "https://github.com/jruby/jruby/issues/3138" + original = ActionDispatch::Response.default_charset begin ActionDispatch::Response.default_charset = 'utf-16' diff --git a/actionpack/test/dispatch/routing/concerns_test.rb b/actionpack/test/dispatch/routing/concerns_test.rb index 7ef513b0c8..361ceca677 100644 --- a/actionpack/test/dispatch/routing/concerns_test.rb +++ b/actionpack/test/dispatch/routing/concerns_test.rb @@ -109,6 +109,8 @@ class RoutingConcernsTest < ActionDispatch::IntegrationTest end def test_concerns_executes_block_in_context_of_current_mapper + jruby_skip "https://github.com/jruby/jruby/issues/3143" + mapper = ActionDispatch::Routing::Mapper.new(ActionDispatch::Routing::RouteSet.new) mapper.concern :test_concern do resources :things |