From e6073e1eb8ab5db571dead564656f7b0b4a1b8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Mon, 22 Jan 2024 12:00:00 +0000 Subject: [PATCH] test: Adapt test to Sinatra 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Géczi --- gemfiles/sinatra_40.gemfile | 13 +++++++++++++ test/frameworks/sinatra_test.rb | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gemfiles/sinatra_40.gemfile diff --git a/gemfiles/sinatra_40.gemfile b/gemfiles/sinatra_40.gemfile new file mode 100644 index 00000000..d17b4e1c --- /dev/null +++ b/gemfiles/sinatra_40.gemfile @@ -0,0 +1,13 @@ +# (c) Copyright IBM Corp. 2023 + +source "https://rubygems.org" + +gem "minitest-reporters" +gem "webmock" +gem "puma" +gem "rubocop", "~> 1.9" +gem "rack-test" +gem "simplecov", "~> 0.21.2" +gem "sinatra", ">= 4.0.0" + +gemspec path: "../" diff --git a/test/frameworks/sinatra_test.rb b/test/frameworks/sinatra_test.rb index 95e7d9ac..ac82aa0f 100644 --- a/test/frameworks/sinatra_test.rb +++ b/test/frameworks/sinatra_test.rb @@ -6,7 +6,11 @@ class SinatraTest < Minitest::Test include Rack::Test::Methods - APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru').first + APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru') + railties_version = Gem::Specification.find_by_name('sinatra').version + if railties_version < Gem::Version.new('4.0.0') + APP = APP.first + end def app APP