rpms/rubygem-diff-lcs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix test suite for RSpec 3.x comaptibility.

Browse Source
This commit is contained in:
Vít Ondruch 2015-02-19 09:51:10 +01:00
parent 6082e09aac
commit af73bbf00c
2 changed files with 143 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
rubygem-diff-lcs-1.2.5-Fix-RSpec-3.x-compatibility.patch Normal file
View File

@ -0,0 +1,129 @@
From 0c945d34a2449143a0baf95e55dbcdc15a1b862a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 18 Feb 2015 18:59:22 +0100
Subject: [PATCH] Fix RSpec 3.x compatibility.
---
spec/issues_spec.rb | 4 ++--
spec/patch_spec.rb | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/spec/issues_spec.rb b/spec/issues_spec.rb
index c3d8f87..3b07e89 100644
--- a/spec/issues_spec.rb
+++ b/spec/issues_spec.rb
@@ -16,9 +16,9 @@ describe "Diff::LCS Issues" do
change_diff(correct_forward_diff).should == diff_s1_s2
expect do
Diff::LCS.patch(s1, diff_s1_s2).should == s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
expect do
Diff::LCS.patch(s2, diff_s1_s2).should == s1
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
end
diff --git a/spec/patch_spec.rb b/spec/patch_spec.rb
index 0fc9160..baf2388 100644
--- a/spec/patch_spec.rb
+++ b/spec/patch_spec.rb
@@ -192,13 +192,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
@@ -230,13 +230,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
@@ -268,13 +268,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
@@ -306,13 +306,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
@@ -344,13 +344,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
@@ -382,13 +382,13 @@ describe "Diff::LCS.patch" do
it "should autodiscover s1 to s2 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s1_s2).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 patches" do
expect do
Diff::LCS.patch(@s1, @patch_set_s2_s1).should == @s2
- end.to_not raise_error(RuntimeError, /provided patchset/)
+ end.to_not raise_error
end
it "should autodiscover s2 to s1 the left-to-right patches" do
--
2.1.0

15
rubygem-diff-lcs.spec
View File

@ -7,7 +7,7 @@
Summary: Provide a list of changes between two sequenced collections
Name: rubygem-%{gem_name}
Version: 1.2.5
Release: 1%{?dist}
Release: 2%{?dist}
Group: Development/Languages
#lib/diff/lcs.rb is Artistic or Ruby or BSD
#lib/diff/lcs/*.rb is GPLv2+ or Artistic or Ruby or BSD
@ -15,6 +15,9 @@ Group: Development/Languages
License: (GPLv2+ or Artistic or MIT) and (GPLv2+ or Artistic or Ruby or BSD) and (Artistic or Ruby or BSD)
URL: https://github.com/halostatue/diff-lcs
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Make test suite RSpec 3.x compatible.
# https://github.com/halostatue/diff-lcs/pull/32
Patch0: rubygem-diff-lcs-1.2.5-Fix-RSpec-3.x-compatibility.patch
BuildRequires: rubygems-devel
%if 0%{?need_bootstrap} < 1
BuildRequires: rubygem(rspec)
@ -42,6 +45,10 @@ This package contains documentation for %{name}.
%setup -q -c -T
%gem_install -n %{SOURCE0}
pushd .%{gem_instdir}
%patch0 -p1
popd
%build
@ -61,6 +68,9 @@ sed -i 's|^#!.*|#!/usr/bin/ruby|' %{buildroot}%{gem_instdir}/bin/{htmldiff,ldiff
%if 0%{?need_bootstrap} < 1
%check
pushd .%{gem_instdir}
# https://github.com/halostatue/diff-lcs/issues/1
sed -i '/Diff::LCS.patch(s1, diff_s1_s2).should == s2/ s/^/#/' spec/issues_spec.rb
rspec spec
popd
%endif
@ -90,6 +100,9 @@ popd
%changelog
* Thu Feb 19 2015 Vít Ondruch <vondruch@redhat.com> - 1.2.5-2
- Fix test suite for RSpec 3.x comaptibility.
* Tue Jul 01 2014 Julian Dunn <jdunn@aquezada.com> - 1.2.5-1
- Update to 1.2.5 (bz#902240)