From 7bcb5192710c7c0884a9438b75998f240275f03e Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Tue, 19 Nov 2024 13:30:15 +0530 Subject: [PATCH 1/2] test: fix failing sinatra tests for version 4.1.0 Signed-off-by: Arjun Rajappa --- test/frameworks/sinatra_test.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/frameworks/sinatra_test.rb b/test/frameworks/sinatra_test.rb index 8c67cbab..81e7aeca 100644 --- a/test/frameworks/sinatra_test.rb +++ b/test/frameworks/sinatra_test.rb @@ -3,10 +3,11 @@ require 'test_helper' require 'rack/test' - +require 'byebug' class SinatraTest < Minitest::Test include Rack::Test::Methods APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru') + byebug sinatra_version = Gem::Specification.find_by_name('sinatra').version if sinatra_version < Gem::Version.new('4.0.0') APP = APP.first @@ -18,8 +19,12 @@ def app def test_basic_get clear_all! - + byebug r = get '/' + # , nil, { + # "HTTP_FORWARDED" => "localhost", + # "action_dispatch.show_detailed_exceptions" => true + # } assert last_response.ok? From d2d6bbc3da50a806fbbcc97d26b9ececbdea7348 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Tue, 19 Nov 2024 13:32:43 +0530 Subject: [PATCH 2/2] test: fix failing sinatra tests for version 4.1.0 Signed-off-by: Arjun Rajappa --- test/frameworks/sinatra_test.rb | 10 +++------- test/support/apps/sinatra/config.ru | 6 +++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/frameworks/sinatra_test.rb b/test/frameworks/sinatra_test.rb index 81e7aeca..43e56462 100644 --- a/test/frameworks/sinatra_test.rb +++ b/test/frameworks/sinatra_test.rb @@ -3,11 +3,11 @@ require 'test_helper' require 'rack/test' -require 'byebug' + class SinatraTest < Minitest::Test include Rack::Test::Methods APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru') - byebug + sinatra_version = Gem::Specification.find_by_name('sinatra').version if sinatra_version < Gem::Version.new('4.0.0') APP = APP.first @@ -19,12 +19,8 @@ def app def test_basic_get clear_all! - byebug r = get '/' - # , nil, { - # "HTTP_FORWARDED" => "localhost", - # "action_dispatch.show_detailed_exceptions" => true - # } + assert last_response.ok? diff --git a/test/support/apps/sinatra/config.ru b/test/support/apps/sinatra/config.ru index 5ddd78c1..210a0f82 100644 --- a/test/support/apps/sinatra/config.ru +++ b/test/support/apps/sinatra/config.ru @@ -5,10 +5,14 @@ class InstanaSinatraApp < ::Sinatra::Base get '/' do "Hello Sinatra!" end - + get '/greet/:name' do "Hello, #{params[:name]}!" end + + configure do + set :host_authorization, {permitted_hosts: "example.org"} + end end run InstanaSinatraApp