Commit f8b7f4128495868f3f72c21f89c87f104c5fa45f

clean up

git-svn-id: http://rspec.rubyforge.org/svn/trunk@3293 410327ef-2207-0410-a325-f78bbcb22a5a

Commit diff

invert.patch

 
0Index: rspec/spec/spec/expectations/differs/default_spec.rb
1===================================================================
2--- rspec/spec/spec/expectations/differs/default_spec.rb (revision 3288)
3+++ rspec/spec/spec/expectations/differs/default_spec.rb (working copy)
4@@ -28,7 +28,25 @@
5 it "should output unified diff of two strings" do
6 expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
7 actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
8- expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
9+ expected_diff= <<'EOD'
10+
11+
12+@@ -1,6 +1,6 @@
13+ foo
14+-zap
15+ bar
16++zap
17+ this
18+ is
19+ soo
20+@@ -9,6 +9,5 @@
21+ equal
22+ insert
23+ a
24+-another
25+ line
26+EOD
27+
28 diff = @differ.diff_as_string(expected, actual)
29 diff.should eql(expected_diff)
30 end
31@@ -44,11 +62,11 @@
32 :metasyntactic,
33 "variable",
34 :delta,
35Index: rspec/spec/spec/expectations/differs/default_spec.rb
36===================================================================
37--- rspec/spec/spec/expectations/differs/default_spec.rb (revision 3288)
38+++ rspec/spec/spec/expectations/differs/default_spec.rb (working copy)
39@@ -28,7 +28,25 @@
40 it "should output unified diff of two strings" do
41 expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
42 actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
43- expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
44+ expected_diff= <<'EOD'
45+
46+
47+@@ -1,6 +1,6 @@
48+ foo
49+-zap
50+ bar
51++zap
52+ this
53+ is
54+ soo
55+@@ -9,6 +9,5 @@
56+ equal
57+ insert
58+ a
59+-another
60+ line
61+EOD
62+
63 diff = @differ.diff_as_string(expected, actual)
64 diff.should eql(expected_diff)
65 end
66@@ -44,11 +62,11 @@
67 :metasyntactic,
68 "variable",
69 :delta,
70-+ "tango",
71+- "tango",
72++ "charlie",
73 :width,
74Index: rspec/spec/spec/expectations/differs/default_spec.rb
75===================================================================
76--- rspec/spec/spec/expectations/differs/default_spec.rb (revision 3288)
77+++ rspec/spec/spec/expectations/differs/default_spec.rb (working copy)
78@@ -28,7 +28,25 @@
79 it "should output unified diff of two strings" do
80 expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
81 actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
82- expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
83+ expected_diff= <<'EOD'
84+
85+
86+@@ -1,6 +1,6 @@
87+ foo
88+-zap
89+ bar
90++zap
91+ this
92+ is
93+ soo
94+@@ -9,6 +9,5 @@
95+ equal
96+ insert
97+ a
98+-another
99+ line
100+EOD
101+
102 diff = @differ.diff_as_string(expected, actual)
103 diff.should eql(expected_diff)
104 end
105@@ -44,11 +62,11 @@
106 :metasyntactic,
107 "variable",
108 :delta,
109-+ "tango",
110+- "tango",
111++ "charlie",
112 :width,
113-+ "very wide"]
114+- "very wide"]
115++ "quite wide"]
116 EOD
117
118
119@@ -65,8 +83,8 @@
120 @@ -1,5 +1,5 @@
121 <Animal
122 name=bob,
123Index: rspec/spec/spec/expectations/differs/default_spec.rb
124===================================================================
125--- rspec/spec/spec/expectations/differs/default_spec.rb (revision 3288)
126+++ rspec/spec/spec/expectations/differs/default_spec.rb (working copy)
127@@ -28,7 +28,25 @@
128 it "should output unified diff of two strings" do
129 expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
130 actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
131- expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
132+ expected_diff= <<'EOD'
133+
134+
135+@@ -1,6 +1,6 @@
136+ foo
137+-zap
138+ bar
139++zap
140+ this
141+ is
142+ soo
143+@@ -9,6 +9,5 @@
144+ equal
145+ insert
146+ a
147+-another
148+ line
149+EOD
150+
151 diff = @differ.diff_as_string(expected, actual)
152 diff.should eql(expected_diff)
153 end
154@@ -44,11 +62,11 @@
155 :metasyntactic,
156 "variable",
157 :delta,
158-+ "tango",
159+- "tango",
160++ "charlie",
161 :width,
162-+ "very wide"]
163+- "very wide"]
164++ "quite wide"]
165 EOD
166
167
168@@ -65,8 +83,8 @@
169 @@ -1,5 +1,5 @@
170 <Animal
171 name=bob,
172-+ species=tortoise
173+- species=tortoise
174++ species=giraffe
175 >
176 EOD
177
178@@ -94,12 +112,12 @@
179 *** 1,5 ****
180 <Animal
181 name=bob,
182-! species=giraffe
183+! species=tortoise
184 >
185 --- 1,5 ----
186 <Animal
187 name=bob,
188-! species=tortoise
189+! species=giraffe
190 >
191 EOD
192
193Index: rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html
194===================================================================
195--- rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html (revision 3288)
196+++ rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html (working copy)
197@@ -189,9 +189,9 @@
198 <div class="failure" id="failure_1">
199 <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
200 <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
201-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
202-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
203-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
204+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
205+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
206+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
207 <pre class="ruby"><code><span class="linenum">11</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
208 <span class="linenum">12</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
209 <span class="offending"><span class="linenum">13</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
210@@ -205,9 +205,9 @@
211 <div class="failure" id="failure_2">
212 <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
213 <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
214-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
215-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
216-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
217+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
218+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
219+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
220 <pre class="ruby"><code><span class="linenum">20</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
221 <span class="linenum">21</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
222 <span class="offending"><span class="linenum">22</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
223@@ -221,9 +221,9 @@
224 <div class="failure" id="failure_3">
225 <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
226 <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
227-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
228-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
229-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
230+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
231+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
232+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
233 <pre class="ruby"><code><span class="linenum">26</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
234 <span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
235 <span class="offending"><span class="linenum">28</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
236@@ -236,7 +236,10 @@
237 <span class="failed_spec_name">has a bug we need to fix</span>
238 <div class="failure" id="failure_4">
239 <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
240-
241+ <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
242+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
243+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
244+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
245 <pre class="ruby"><code><span class="linenum">31</span>
246 <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
247 <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
248@@ -259,11 +262,14 @@
249 Diff:
250 @@ -1,4 +1,4 @@
251 RSpec is a
252--behavior driven development
253-+behaviour driven development
254+-behaviour driven development
255++behavior driven development
256 framework for Ruby
257 </pre></div>
258-
259+ <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:
260+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
261+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
262+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
263 <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
264 <span class="linenum">12</span><span class="constant">EOF</span>
265 <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
266@@ -287,14 +293,14 @@
267 @@ -1,5 +1,5 @@
268 &lt;Animal
269 name=bob,
270--species=giraffe
271-+species=tortoise
272+-species=tortoise
273++species=giraffe
274 &gt;
275 </pre></div>
276- <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
277-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
278-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
279-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
280+ <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34:
281+./spec/spec/runner/formatter/html_formatter_spec.rb:28:
282+./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
283+./spec/spec/runner/formatter/html_formatter_spec.rb:24:</pre></div>
284 <pre class="ruby"><code><span class="linenum">32</span> <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
285 <span class="linenum">33</span> <span class="ident">actual</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
286 <span class="offending"><span class="linenum">34</span> <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
287Index: rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html
288===================================================================
289--- rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html (revision 3288)
290+++ rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html (working copy)
291@@ -1,5 +1,5 @@
292 <?xml version="1.0" encoding="UTF-8"?>
293-<!DOCTYPE html
294+<!DOCTYPE html
295 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
296 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
297 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
298@@ -188,10 +188,10 @@
299 <span class="failed_spec_name">should fail when expected message not received</span>
300 <div class="failure" id="failure_1">
301 <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
302- <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
303-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
304-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
305-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
306+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/mocking_example.rb&line=13">./failing_examples/mocking_example.rb:13</a>
307+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
308+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
309+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
310 <pre class="ruby"><code><span class="linenum">11</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
311 <span class="linenum">12</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
312 <span class="offending"><span class="linenum">13</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
313@@ -204,10 +204,10 @@
314 <span class="failed_spec_name">should fail when messages are received out of order</span>
315 <div class="failure" id="failure_2">
316 <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
317- <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
318-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
319-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
320-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
321+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/mocking_example.rb&line=22">./failing_examples/mocking_example.rb:22</a>
322+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
323+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
324+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
325 <pre class="ruby"><code><span class="linenum">20</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
326 <span class="linenum">21</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
327 <span class="offending"><span class="linenum">22</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
328@@ -220,10 +220,10 @@
329 <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
330 <div class="failure" id="failure_3">
331 <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
332- <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
333-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
334-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
335-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
336+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/mocking_example.rb&line=28">./failing_examples/mocking_example.rb:28</a>
337+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
338+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
339+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
340 <pre class="ruby"><code><span class="linenum">26</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
341 <span class="linenum">27</span> <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
342 <span class="offending"><span class="linenum">28</span> <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
343@@ -236,7 +236,10 @@
344 <span class="failed_spec_name">has a bug we need to fix</span>
345 <div class="failure" id="failure_4">
346 <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
347-
348+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/mocking_example.rb&line=33">./failing_examples/mocking_example.rb:33</a>
349+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
350+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
351+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
352 <pre class="ruby"><code><span class="linenum">31</span>
353 <span class="linenum">32</span> <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
354 <span class="offending"><span class="linenum">33</span> <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
355@@ -259,11 +262,14 @@
356 Diff:
357 @@ -1,4 +1,4 @@
358 RSpec is a
359--behavior driven development
360-+behaviour driven development
361+-behaviour driven development
362++behavior driven development
363 framework for Ruby
364 </pre></div>
365-
366+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/diffing_spec.rb&line=13">./failing_examples/diffing_spec.rb:13</a>
367+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
368+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
369+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
370 <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
371 <span class="linenum">12</span><span class="constant">EOF</span>
372 <span class="offending"><span class="linenum">13</span> <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
373@@ -287,14 +293,14 @@
374 @@ -1,5 +1,5 @@
375 &lt;Animal
376 name=bob,
377--species=giraffe
378-+species=tortoise
379+-species=tortoise
380++species=giraffe
381 &gt;
382 </pre></div>
383- <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
384-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
385-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
386-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
387+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/failing_examples/diffing_spec.rb&line=34">./failing_examples/diffing_spec.rb:34</a>
388+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a>
389+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
390+<a href="txmt://open?url=file:///Users/wincent/trabajo/vendor/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </pre></div>
391 <pre class="ruby"><code><span class="linenum">32</span> <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
392 <span class="linenum">33</span> <span class="ident">actual</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
393 <span class="offending"><span class="linenum">34</span> <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
394Index: rspec/lib/spec/expectations/differs/default.rb
395===================================================================
396--- rspec/lib/spec/expectations/differs/default.rb (revision 3288)
397+++ rspec/lib/spec/expectations/differs/default.rb (working copy)
398@@ -17,7 +17,7 @@
399 end
400
401 # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
402- def diff_as_string(data_old, data_new)
403+ def diff_as_string(data_new, data_old)
404 data_old = data_old.split(/\n/).map! { |e| e.chomp }
405 data_new = data_new.split(/\n/).map! { |e| e.chomp }
406 output = ""
toggle raw diff