From 6369d9af723029608f354045c167cca3b740169c Mon Sep 17 00:00:00 2001 From: HoneyryderChuck Date: Fri, 14 Jan 2022 02:13:09 +0200 Subject: [PATCH] fix CI script and assertion helper for headers --- test/support/assertion_helpers.rb | 2 +- test/support/ci/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/support/assertion_helpers.rb b/test/support/assertion_helpers.rb index 8fa6a572..0ab123a2 100644 --- a/test/support/assertion_helpers.rb +++ b/test/support/assertion_helpers.rb @@ -12,7 +12,7 @@ module ResponseHelpers %w[header param].each do |meth| class_eval <<-DEFINE, __FILE__, __LINE__ + 1 def verify_#{meth}(#{meth}s, key, expect) # def verify_header(headers, key, expect) - assert #{meth}s.key?(key), "#{meth}s don't contain the given key (\"\#{key.to_s}\", headers: \#{#{meth}s})" # assert headers.key?(key), "headers ... + assert #{meth}s.key?(key), "#{meth}s don't contain the given key ('\#{key}', headers: \#{#{meth}s})" # assert headers.key?(key), "headers ... value = #{meth}s[key] # value = headers[key] if value.respond_to?(:start_with?) # if value.respond_to?(:start_with?) assert value.start_with?(expect), "#{meth} assertion failed: \#{key}=\#{value} (expected: \#{expect}})" # assert value.start_with?(expect), "headers assertion failed: ... diff --git a/test/support/ci/build.sh b/test/support/ci/build.sh index cdfd00ab..9c53d306 100755 --- a/test/support/ci/build.sh +++ b/test/support/ci/build.sh @@ -69,7 +69,7 @@ echo ' Success: Reached S3' export SSL_CERT_FILE=/home/test/support/ci/certs/ca-bundle.crt -if [[ ${RUBY_VERSION:0:1} = "3" ]] && ![[ $RUBYOPT =~ "jit" ]]; then +if [[ ${RUBY_VERSION:0:1} = "3" ]] && [[ ! $RUBYOPT =~ "jit" ]]; then echo "running runtime type checking..." export RUBYOPT="$RUBYOPT -rbundler/setup -rrbs/test/setup" export RBS_TEST_RAISE=true