From 2ed46075b272dac1143ea347496f223847a1e988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 28 Apr 2020 12:13:31 +0200
Subject: [PATCH] Update to rack-test 1.1.0.

Resolves: rhbz#1561254
---
 .gitignore             |  2 ++
 rubygem-rack-test.spec | 18 +++++++++++++-----
 sources                |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index a63c716..53df2e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ rack-test-0.4.0.gem
 /rack-test-0.6.3.gem
 /rack-test-0.8.3-spec.tgz
 /rack-test-0.8.3.gem
+/rack-test-1.1.0-spec.tar.gz
+/rack-test-1.1.0.gem
diff --git a/rubygem-rack-test.spec b/rubygem-rack-test.spec
index 78b39ac..ea60b84 100644
--- a/rubygem-rack-test.spec
+++ b/rubygem-rack-test.spec
@@ -1,15 +1,15 @@
 %global gem_name rack-test
 
 Name: rubygem-%{gem_name}
-Version: 0.8.3
-Release: 5%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 Summary: Simple testing API built on Rack
 License: MIT
 URL: http://github.com/rack-test/rack-test
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/rack-test/rack-test.git && cd rack-test
-# git checkout v0.8.3 && tar czvf rack-test-0.8.3-spec.tgz spec/
-Source1: %{gem_name}-%{version}-spec.tgz
+# git archive -v -o rack-test-1.1.0-spec.tar.gz v1.1.0 spec/
+Source1: %{gem_name}-%{version}-spec.tar.gz
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby >= 2.2.2
@@ -55,11 +55,15 @@ pushd .%{gem_instdir}
 ln -s %{_builddir}/spec spec
 
 # We don't care about code coverage.
-sed -i '/[cC]ode[cC]/ s/^/#/' spec/spec_helper.rb
+sed -i '/simplecov/,/^end$/ s/^/#/' spec/spec_helper.rb
 
 # Don't use Bundler.
 sed -i "/require 'bundler\/setup'/ s/^/#/" spec/spec_helper.rb
 
+# Workaround test error due to Rack 2.2.0+ changes.
+# https://github.com/rack/rack-test/issues/260
+sed -i "/expect(body).to receive(:close)/ s/^/#/" spec/rack/test_spec.rb
+
 rspec spec
 popd
 
@@ -76,6 +80,10 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Tue Apr 28 2020 Vít Ondruch <vondruch@redhat.com> - 1.1.0-1
+- Update to rack-test 1.1.0.
+  Resolves: rhbz#1561254
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 76fda23..d4da84f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rack-test-0.8.3-spec.tgz) = 0e173f39492b34279e76d4c6ac79f82db6ec13ddb6eb865bbcd6f1ab86ffcb9766c51f95e0ed7f954243feb708cc3a688d9fb406d517f05a060145d8758b361f
-SHA512 (rack-test-0.8.3.gem) = 455a5ef0402e9358617f8c7f08d8dc6351dfca6b672fad7bf3bbc858b5042ed05bf7d437420e783940fb6251f1e1312e9e63721d236a7488f388cef18261de0d
+SHA512 (rack-test-1.1.0-spec.tar.gz) = 818e26f5ce1549146f94263d1847649ac5e84f6d8201bb3fcba18c36da6c8aada9989322616367bbccb11d6f80d1aee96501309119ded8a90b700053fd619799
+SHA512 (rack-test-1.1.0.gem) = 16e291fa5a88b6866e8057b4bf1aae4ffe17dd9b0300c1ee36632c5b21ff2075cb4356f6f78437dd84ea76047a5d3abe3dda087a2c154f5e5712e62d7e57fdc9