diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f8117e..5371108 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,8 @@ jobs: gemfile: gemfiles/rails_7_1.gemfile - ruby: "3.2" gemfile: gemfiles/rails_7_2.gemfile + - ruby: "3.2" + gemfile: gemfiles/rails_8_0.gemfile - ruby: "3.3" gemfile: gemfiles/rails_6_0.gemfile - ruby: "3.3" @@ -75,6 +77,16 @@ jobs: gemfile: gemfiles/rails_7_1.gemfile - ruby: "3.3" gemfile: gemfiles/rails_7_2.gemfile + - ruby: "3.3" + gemfile: gemfiles/rails_8_0.gemfile + - ruby: "3.4" + gemfile: gemfiles/rails_7_0.gemfile + - ruby: "3.4" + gemfile: gemfiles/rails_7_1.gemfile + - ruby: "3.4" + gemfile: gemfiles/rails_7_2.gemfile + - ruby: "3.4" + gemfile: gemfiles/rails_8_0.gemfile - ruby: "head" gemfile: gemfiles/rails_head.gemfile env: diff --git a/.gitignore b/.gitignore index f316c60..9bbefad 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.gem /test/rails_app/tmp/* /test/rails_app/log/* +/test/rails_app/db/* *.sqlite3 Gemfile.lock diff --git a/derailed_benchmarks.gemspec b/derailed_benchmarks.gemspec index 358ac4d..6da106d 100644 --- a/derailed_benchmarks.gemspec +++ b/derailed_benchmarks.gemspec @@ -51,6 +51,6 @@ Gem::Specification.new do |gem| gem.add_development_dependency "webrick", ">= 0" gem.add_development_dependency "capybara", "~> 2" gem.add_development_dependency "m" - gem.add_development_dependency "rails", "> 3", "< 7.1" + gem.add_development_dependency "rails", "> 3", "< 8.1" gem.add_development_dependency "devise", "> 3", "< 6" end diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile new file mode 100644 index 0000000..9d4d0d6 --- /dev/null +++ b/gemfiles/rails_8_0.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 8.0.0" + +group :development, :test do + gem "sqlite3", '~> 2.1', platform: [:ruby, :mswin, :mingw] + gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby + gem "test-unit", "~> 3.0" +end + +gemspec path: "../" diff --git a/test/integration/tasks_test.rb b/test/integration/tasks_test.rb index c32911f..1408547 100644 --- a/test/integration/tasks_test.rb +++ b/test/integration/tasks_test.rb @@ -127,13 +127,13 @@ def rake(cmd, options = {}) } result = rake "perf:test", env: env assert_match 'Endpoint: "foo_secret"', result - assert_match (/"Authorization"=>"Basic YWRtaW46c2VjcmV0"/), result - assert_match (/"Cache-Control"=>"no-cache"/), result + assert_match (/"Authorization"\s?=>\s?"Basic YWRtaW46c2VjcmV0"/), result + assert_match (/"Cache-Control"\s?=>\s?"no-cache"/), result env["USE_SERVER"] = "webrick" result = rake "perf:test", env: env - assert_match (/"Authorization"=>"Basic YWRtaW46c2VjcmV0"/), result - assert_match (/"Cache-Control"=>"no-cache"/), result + assert_match (/"Authorization"\s?=>\s?"Basic YWRtaW46c2VjcmV0"/), result + assert_match (/"Cache-Control"\s?=>"\s?no-cache"/), result end test 'CONTENT_TYPE' do @@ -147,12 +147,12 @@ def rake(cmd, options = {}) result = rake "perf:test", env: env assert_match 'Body: {"user":{"email":"foo@bar.com","password":"123456","password_confirmation":"123456"}}', result - assert_match 'HTTP headers: {"Content-Type"=>"application/json"}', result + assert_match(/HTTP headers: {"Content-Type"\s?=>\s?"application\/json"}/, result) env["USE_SERVER"] = "webrick" result = rake "perf:test", env: env assert_match 'Body: {"user":{"email":"foo@bar.com","password":"123456","password_confirmation":"123456"}}', result - assert_match 'HTTP headers: {"Content-Type"=>"application/json"}', result + assert_match(/HTTP headers: {"Content-Type"\s?=>\s?"application\/json"}/, result) end test 'REQUEST_METHOD and REQUEST_BODY' do