Skip to content

Commit

Permalink
Merge pull request #1648 from newrelic/remove_racktest_from_rails_env
Browse files Browse the repository at this point in the history
Remove rack-test references from Rails envfile
  • Loading branch information
hannahramadan authored Nov 22, 2022
2 parents d689443 + d86e3bf commit 107cadb
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions test/multiverse/suites/rails/Envfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
# frozen_string_literal: true

# TODO: UNIT TESTS - Determine the root cause of our compatibility issues with
# rack-test 2+. If rack-test is not specified in Gemfile, the rum tests
# fail because the JS header is always included, even when not desired.
# Once the compatibility issue is addressed, all "rack_test" lines from
# this file and this comment should be removed.

RAILS_VERSIONS = [
[nil, 2.7],
['7.0.4', 2.7],
Expand Down Expand Up @@ -43,18 +37,13 @@ def minitest_rails_version(rails_version = nil)
end
end

def pre2_rack_test
%Q(gem 'rack-test')
end

def gem_list(rails_version = nil)
<<-RB
gem 'rails'#{rails_version}
gem 'haml', '5.1.2'
#{haml_rails(rails_version)}
gem 'minitest', '#{minitest_rails_version(rails_version)}'
gem 'erubis' if RUBY_PLATFORM.eql?('java')
#{pre2_rack_test}
#{ruby3_gem_webrick}
RB
end
Expand All @@ -70,7 +59,6 @@ if RUBY_VERSION < '2.4.0'
gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3
gem 'minitest', '~> 4.7.5'
gem 'minitest_tu_shim', :require => false
#{pre2_rack_test}
RB

gemfile <<-RB
Expand All @@ -80,6 +68,5 @@ if RUBY_VERSION < '2.4.0'
gem 'haml', '4.0.2' # Getting load issues with haml 4.0.3
gem 'minitest', '~> 4.7.5'
gem 'minitest_tu_shim', :require => false
#{pre2_rack_test}
RB
end

0 comments on commit 107cadb

Please sign in to comment.