1 |
commit: d7d711b12fc31d364d2464e63fdd274e1cacd65c |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 6 16:57:47 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 27 21:53:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d711b1 |
7 |
|
8 |
dev-util/cucumber: remove unused patch. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/2494 |
11 |
|
12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
13 |
|
14 |
.../files/cucumber-0.7.3-remove-rspec2.patch | 96 ---------------------- |
15 |
1 file changed, 96 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch b/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch |
18 |
deleted file mode 100644 |
19 |
index 5f1f8b2..00000000 |
20 |
--- a/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch |
21 |
+++ /dev/null |
22 |
@@ -1,96 +0,0 @@ |
23 |
---- gem_tasks/rspec.rake.~1~ 2010-09-12 12:55:56.549346307 +0200 |
24 |
-+++ gem_tasks/rspec.rake 2010-09-12 12:56:40.796472416 +0200 |
25 |
-@@ -1,13 +1,3 @@ |
26 |
--begin |
27 |
-- require 'rspec/core/rake_task' |
28 |
-- |
29 |
-- desc "Run RSpec" |
30 |
-- Rspec::Core::RakeTask.new do |t| |
31 |
-- t.rcov = ENV['RCOV'] |
32 |
-- t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/} |
33 |
-- t.verbose = true |
34 |
-- end |
35 |
--rescue LoadError => e |
36 |
- require 'spec/rake/spectask' |
37 |
- |
38 |
- desc "Run RSpec" |
39 |
-@@ -17,4 +7,3 @@ |
40 |
- t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/} |
41 |
- t.verbose = true |
42 |
- end |
43 |
--end |
44 |
---- lib/cucumber/rspec/diffing.rb.~1~ 2010-09-12 12:55:56.276767180 +0200 |
45 |
-+++ lib/cucumber/rspec/diffing.rb 2010-09-12 13:00:05.884598738 +0200 |
46 |
-@@ -2,16 +2,9 @@ |
47 |
- |
48 |
- options = OpenStruct.new(:diff_format => :unified, :context_lines => 3) |
49 |
- |
50 |
--begin |
51 |
-- # RSpec >=2.0 |
52 |
-- require 'rspec/expectations' |
53 |
-- require 'rspec/expectations/differs/default' |
54 |
-- Rspec::Expectations.differ = ::Rspec::Expectations::Differs::Default.new(options) |
55 |
--rescue LoadError => try_rspec_1_2_4_or_higher |
56 |
- begin |
57 |
- require 'spec/expectations' |
58 |
- require 'spec/runner/differs/default' |
59 |
- Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options) |
60 |
- rescue LoadError => give_up |
61 |
- end |
62 |
--end |
63 |
---- spec/spec_helper.rb.~1~ 2010-09-12 12:55:56.280518419 +0200 |
64 |
-+++ spec/spec_helper.rb 2010-09-12 13:02:14.329221958 +0200 |
65 |
-@@ -4,16 +4,6 @@ |
66 |
- |
67 |
- require 'rubygems' |
68 |
- |
69 |
--begin |
70 |
-- require 'rspec' |
71 |
-- require 'rspec/autorun' |
72 |
-- Rspec.configure do |c| |
73 |
-- c.color_enabled = true |
74 |
-- c.before(:each) do |
75 |
-- ::Term::ANSIColor.coloring = true |
76 |
-- end |
77 |
-- end |
78 |
--rescue LoadError |
79 |
- require 'spec' |
80 |
- require 'spec/autorun' |
81 |
- Spec::Runner.configure do |c| |
82 |
-@@ -21,7 +11,6 @@ |
83 |
- ::Term::ANSIColor.coloring = true |
84 |
- end |
85 |
- end |
86 |
--end |
87 |
- |
88 |
- require 'cucumber' |
89 |
- $KCODE='u' unless Cucumber::RUBY_1_9 |
90 |
---- features/support/env.rb.~1~ 2010-09-12 12:55:56.272596255 +0200 |
91 |
-+++ features/support/env.rb 2010-09-12 13:03:37.824881422 +0200 |
92 |
-@@ -1,10 +1,6 @@ |
93 |
- require 'rubygems' |
94 |
- require 'tempfile' |
95 |
--begin |
96 |
-- require 'rspec/expectations' |
97 |
--rescue LoadError |
98 |
- require 'spec/expectations' |
99 |
--end |
100 |
- require 'fileutils' |
101 |
- require 'forwardable' |
102 |
- require 'cucumber/formatter/unicode' |
103 |
---- cucumber.yml.~1~ 2010-09-12 13:06:35.832722414 +0200 |
104 |
-+++ cucumber.yml 2010-09-12 13:07:58.896848344 +0200 |
105 |
-@@ -2,13 +2,8 @@ |
106 |
- rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : "" |
107 |
- rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}" |
108 |
- std_opts = "--format progress features --strict --tags ~@wip" |
109 |
--begin |
110 |
-- require 'rspec/expectations' |
111 |
-- std_opts << ' --tags ~@rspec1' |
112 |
--rescue LoadError |
113 |
- # rspec 1 |
114 |
- std_opts << ' --tags ~@rspec2' |
115 |
--end |
116 |
- %> |
117 |
- default: <%= std_opts %> |
118 |
- jruby: <%= std_opts %> --tags ~@spork --tags ~@wire |