Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test failures for typhoeus on jruby #812

Merged
merged 5 commits into from
Oct 19, 2021
Merged

Fix test failures for typhoeus on jruby #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fd29f6
pin ethon version to 0.14.0 due to failure on
tannalynn Oct 19, 2021
378a510
only pin ethon version on jruby
tannalynn Oct 19, 2021
c2bb9b7
for jruby, pin racc version in rails unit tests
tannalynn Oct 19, 2021
75c6ebf
add racc pin to rails env files
tannalynn Oct 19, 2021
558c819
missed a envfile entry
tannalynn Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/environments/rails42/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ platforms :jruby do
gem "activerecord-jdbcmysql-adapter", "~>1.3.0"
gem "activerecord-jdbcsqlite3-adapter", "~>1.3.0"
gem "jruby-openssl"
gem 'racc', '<= 1.5.2'
end

platforms :ruby, :rbx do
Expand Down
1 change: 1 addition & 0 deletions test/environments/rails51/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ platforms :jruby do
gem "activerecord-jdbcmysql-adapter", "~> 51.0"
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0"
gem "jruby-openssl"
gem 'racc', '<= 1.5.2'
end

platforms :ruby, :rbx do
Expand Down
8 changes: 8 additions & 0 deletions test/multiverse/suites/activemerchant/Envfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ if RUBY_VERSION >= '3.0.0'
gem 'nokogiri'
gem 'minitest', '~> 5.1.0'

gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'

# Need to load newrelic_rpm after ActiveMerchant Gateways are required
gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
RB
Expand All @@ -23,6 +25,8 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0'
gem 'nokogiri'
gem 'minitest', '~> 5.1.0'

gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'

# Need to load newrelic_rpm after ActiveMerchant Gateways are required
gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
RB
Expand All @@ -37,6 +41,8 @@ if RUBY_VERSION >= '2.3.0' && RUBY_VERSION < '3.0.0'
gem 'nokogiri'
gem 'minitest', '~> 5.1.0'

gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'

# Need to load newrelic_rpm after ActiveMerchant Gateways are required
gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
RB
Expand All @@ -52,6 +58,8 @@ if RUBY_VERSION < '2.4.0'
gem 'activesupport', '~>4.0.4'
gem 'nokogiri', '~>1.6.1'

gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'

# Need to load newrelic_rpm after ActiveMerchant Gateways are required
gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
RB
Expand Down
10 changes: 10 additions & 0 deletions test/multiverse/suites/rails/Envfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
if RUBY_VERSION >= '2.5.0'
gemfile <<-RB
gem 'rails', '~> 6.1.0'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '2.0.0'
gem 'minitest', '5.2.3'
Expand All @@ -12,6 +13,7 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0'

gemfile <<-RB
gem 'rails', '6.0.0'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '2.0.0'
gem 'minitest', '5.2.3'
Expand All @@ -23,20 +25,23 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0'

gemfile <<-RB
gem 'rails', '5.2.2'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '~>1.0.0'
gem 'minitest', '5.2.3'
RB

gemfile <<-RB
gem 'rails', '~>5.1.0'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '~>1.0.0'
gem 'minitest', '5.2.3'
RB

gemfile <<-RB
gem 'rails', '~>5.0.0'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '~>1.0.0'
gem 'minitest', '5.2.3'
Expand All @@ -46,6 +51,7 @@ end
if RUBY_VERSION < '2.4.0'
gemfile <<-RB
gem 'rails', '~>4.2.1'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '~>1.0.0'
gem 'minitest', '5.2.3'
Expand All @@ -54,6 +60,7 @@ if RUBY_VERSION < '2.4.0'

gemfile <<-RB
gem 'rails', '~>4.1.10'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
# Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
# now
gem 'haml', '~>5.0.0'
Expand All @@ -64,20 +71,23 @@ if RUBY_VERSION < '2.4.0'

gemfile <<-RB
gem 'rails', '~>4.0.13'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'haml', '~>5.0.0'
gem 'haml-rails', '~>1.0.0'
gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
RB

gemfile <<-RB
gem 'rails', '~>3.2.22.2'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'i18n', '~>0.6.11'
gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3
gem 'minitest_tu_shim', :require => false
RB

gemfile <<-RB
gem 'rails', '~>3.2.22.2'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'i18n', '~>0.6.11'
gem 'sinatra', '~> 1.4.5'
gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3
Expand Down
9 changes: 8 additions & 1 deletion test/multiverse/suites/rails_prepend/Envfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0'
gem 'haml', '~>5.0.0'
gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
gem 'minitest', '5.2.3'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
RB
end

Expand All @@ -13,19 +14,22 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0'
gem 'haml', '~>5.0.0'
gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
gem 'minitest', '5.2.3'
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
RB

gemfile <<-RB
gem 'rails', '~>5.1.0'
gem 'haml', '~>5.0.0'
gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'minitest', '5.2.3'
RB

gemfile <<-RB
gem 'rails', '~>5.0.0'
gem 'haml', '~>5.0.0'
gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
gem 'minitest', '5.2.3'
RB
end
Expand All @@ -38,7 +42,8 @@ if RUBY_VERSION < '2.4.0'
gem 'minitest', '5.2.3'
gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
RB
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
RB

gemfile <<-RB
gem 'rails', '~>4.1.10'
Expand All @@ -49,6 +54,7 @@ if RUBY_VERSION < '2.4.0'
gem 'minitest', '5.2.3'
gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
RB

gemfile <<-RB
Expand All @@ -57,5 +63,6 @@ if RUBY_VERSION < '2.4.0'
gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
RB
end
6 changes: 6 additions & 0 deletions test/multiverse/suites/typhoeus/Envfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ instrumentation_methods :chain, :prepend

gemfile <<-RB
gem 'typhoeus' # latest version
if RUBY_PLATFORM == 'java'
gem 'ethon', '0.14.0'
end
gem 'rack'
#{ruby3_gem_webrick}
RB

SUPPORTED_TYPHOEUS_VERSIONS.each do |version|
gemfile <<-RB
gem 'typhoeus', '~> #{version}'
if RUBY_PLATFORM == 'java'
gem 'ethon', '0.14.0'
end
gem 'rack'
#{ruby3_gem_webrick}
RB
Expand Down