Upgrade to RSpec 2.8.0

whatbird · Jan 28, 2012 · 3c520b0 · 3c520b0
1 parent b6f6def
commit 3c520b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
       gherkin (>= 2.3.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     gherkin (2.3.5)
       json (>= 1.4.6)
     gherkin (2.3.5-java)
@@ -25,14 +25,14 @@ GEM
     rcov (0.9.9)
     rcov (0.9.9-java)
     rdoc (3.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     term-ansicolor (1.0.5)

diff --git a/lib/ci/reporter/rspec.rb b/lib/ci/reporter/rspec.rb
@@ -72,8 +72,10 @@ def location
         output.push "#{exception.class.name << ":"}" unless exception.class.name =~ /RSpec/
         output.push @exception.message
 
-        @formatter.format_backtrace(@exception.backtrace, @example).lines.each do |backtrace_info|
-          output.push "     #{backtrace_info}"
+        [@formatter.format_backtrace(@exception.backtrace, @example)].flatten.each do |backtrace_info|
+          backtrace_info.lines.each do |line|
+            output.push "     #{line}"
+          end
         end
         output.join "\n"
       end