1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- gem_tasks/rspec.rake.~1~ 2010-09-12 12:55:56.549346307 +0200
+++ gem_tasks/rspec.rake 2010-09-12 12:56:40.796472416 +0200
@@ -1,13 +1,3 @@
-begin
- require 'rspec/core/rake_task'
-
- desc "Run RSpec"
- Rspec::Core::RakeTask.new do |t|
- t.rcov = ENV['RCOV']
- t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
- t.verbose = true
- end
-rescue LoadError => e
require 'spec/rake/spectask'
desc "Run RSpec"
@@ -17,4 +7,3 @@
t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
t.verbose = true
end
-end
--- lib/cucumber/rspec/diffing.rb.~1~ 2010-09-12 12:55:56.276767180 +0200
+++ lib/cucumber/rspec/diffing.rb 2010-09-12 13:00:05.884598738 +0200
@@ -2,16 +2,9 @@
options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-begin
- # RSpec >=2.0
- require 'rspec/expectations'
- require 'rspec/expectations/differs/default'
- Rspec::Expectations.differ = ::Rspec::Expectations::Differs::Default.new(options)
-rescue LoadError => try_rspec_1_2_4_or_higher
begin
require 'spec/expectations'
require 'spec/runner/differs/default'
Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
rescue LoadError => give_up
end
-end
--- spec/spec_helper.rb.~1~ 2010-09-12 12:55:56.280518419 +0200
+++ spec/spec_helper.rb 2010-09-12 13:02:14.329221958 +0200
@@ -4,16 +4,6 @@
require 'rubygems'
-begin
- require 'rspec'
- require 'rspec/autorun'
- Rspec.configure do |c|
- c.color_enabled = true
- c.before(:each) do
- ::Term::ANSIColor.coloring = true
- end
- end
-rescue LoadError
require 'spec'
require 'spec/autorun'
Spec::Runner.configure do |c|
@@ -21,7 +11,6 @@
::Term::ANSIColor.coloring = true
end
end
-end
require 'cucumber'
$KCODE='u' unless Cucumber::RUBY_1_9
--- features/support/env.rb.~1~ 2010-09-12 12:55:56.272596255 +0200
+++ features/support/env.rb 2010-09-12 13:03:37.824881422 +0200
@@ -1,10 +1,6 @@
require 'rubygems'
require 'tempfile'
-begin
- require 'rspec/expectations'
-rescue LoadError
require 'spec/expectations'
-end
require 'fileutils'
require 'forwardable'
require 'cucumber/formatter/unicode'
--- cucumber.yml.~1~ 2010-09-12 13:06:35.832722414 +0200
+++ cucumber.yml 2010-09-12 13:07:58.896848344 +0200
@@ -2,13 +2,8 @@
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
std_opts = "--format progress features --strict --tags ~@wip"
-begin
- require 'rspec/expectations'
- std_opts << ' --tags ~@rspec1'
-rescue LoadError
# rspec 1
std_opts << ' --tags ~@rspec2'
-end
%>
default: <%= std_opts %>
jruby: <%= std_opts %> --tags ~@spork --tags ~@wire
|
GitWeb