From 3d962e17d4f9fe8b536fb2840bf28f0b0d372a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 24 Nov 2016 15:04:17 +0100 Subject: [PATCH] Fix FTBFS. --- cucumber-3.0.0.pre.1-Fix-brittle-spec.patch | 23 +++++++++++++++++++++ rubygem-cucumber.spec | 12 ++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 cucumber-3.0.0.pre.1-Fix-brittle-spec.patch diff --git a/cucumber-3.0.0.pre.1-Fix-brittle-spec.patch b/cucumber-3.0.0.pre.1-Fix-brittle-spec.patch new file mode 100644 index 0000000..87bc7d1 --- /dev/null +++ b/cucumber-3.0.0.pre.1-Fix-brittle-spec.patch @@ -0,0 +1,23 @@ +From 25d2ca520129e25cf6c033f9e7a84a7e3f582de0 Mon Sep 17 00:00:00 2001 +From: Matt Wynne +Date: Sat, 2 Jul 2016 22:06:51 +0100 +Subject: [PATCH] Fix brittle spec + +--- + spec/cucumber/formatter/html_spec.rb | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/spec/cucumber/formatter/html_spec.rb b/spec/cucumber/formatter/html_spec.rb +index 3c9554f..733c79f 100644 +--- a/spec/cucumber/formatter/html_spec.rb ++++ b/spec/cucumber/formatter/html_spec.rb +@@ -31,8 +31,7 @@ module Formatter + + describe "when writing the report to a file" do + before(:each) do +- allow(@out).to receive(:respond_to?).with(:path, false).and_return(true) +- expect(@out).to receive(:respond_to?).with(:path).and_return(true) ++ allow(@out).to receive(:respond_to?).with(:path).and_return(true) + expect(@out).to receive(:path).and_return('out/file.html') + run_defined_feature + @doc = Nokogiri.HTML(@out.string) diff --git a/rubygem-cucumber.spec b/rubygem-cucumber.spec index a667038..6633baa 100644 --- a/rubygem-cucumber.spec +++ b/rubygem-cucumber.spec @@ -4,12 +4,15 @@ Name: rubygem-%{gem_name} Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to execute plain-text documents as functional tests Group: Development/Languages License: MIT URL: http://cukes.info Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# Fix test failures. +# https://github.com/cucumber/cucumber-ruby/commit/25d2ca520129e25cf6c033f9e7a84a7e3f582de0 +Patch0: cucumber-3.0.0.pre.1-Fix-brittle-spec.patch Requires: js-jquery1 BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -48,6 +51,10 @@ Documentation for %{name}. %setup -q -c -T %gem_install -n %{SOURCE0} +pushd .%{gem_instdir} +%patch0 -p1 +popd + %build @@ -113,6 +120,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Nov 24 2016 Vít Ondruch - 2.3.3-2 +- Fix FTBFS. + * Tue Apr 05 2016 Vít Ondruch - 2.3.3-1 - Update to Cucumber 2.3.3.