Skip to content

Commit 2c79122

Browse files
committed
Merge pull request rails#20915 from robin850/jruby-skips
Skip a few failing tests on JRuby with the attached tickets
2 parents e5bfe71 + ae1b96c commit 2c79122

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

actionpack/test/controller/parameters/mutators_test.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,15 @@ class ParametersMutatorsTest < ActiveSupport::TestCase
6262
end
6363

6464
test "select! retains permitted status" do
65+
jruby_skip "https://github.com/jruby/jruby/issues/3137"
66+
6567
@params.permit!
6668
assert @params.select! { |k| k != "person" }.permitted?
6769
end
6870

6971
test "select! retains unpermitted status" do
72+
jruby_skip "https://github.com/jruby/jruby/issues/3137"
73+
7074
assert_not @params.select! { |k| k != "person" }.permitted?
7175
end
7276

actionpack/test/dispatch/response_test.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ def test_response_body_encoding
171171
end
172172

173173
test "read content type without charset" do
174+
jruby_skip "https://github.com/jruby/jruby/issues/3138"
175+
174176
original = ActionDispatch::Response.default_charset
175177
begin
176178
ActionDispatch::Response.default_charset = 'utf-16'

actionpack/test/dispatch/routing/concerns_test.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ def test_with_an_invalid_concern_name
109109
end
110110

111111
def test_concerns_executes_block_in_context_of_current_mapper
112+
jruby_skip "https://github.com/jruby/jruby/issues/3143"
113+
112114
mapper = ActionDispatch::Routing::Mapper.new(ActionDispatch::Routing::RouteSet.new)
113115
mapper.concern :test_concern do
114116
resources :things

0 commit comments

Comments
 (0)