turnip_formatter 0.1.0 → 0.1.1

data/lib/turnip_formatter/ext/turnip/rspec.rb

@@ -16,10 +16,6 @@ module Turnip
         end
       end
 
-      def initialize_scenario_metadata
-        example.metadata[:turnip] = { steps: [] }
-      end
-
       def push_scenario_metadata(scenario)
         steps = scenario.steps
         example.metadata[:turnip].tap do |turnip|
@@ -45,12 +41,12 @@ module Turnip
 
             before do
               example.metadata[:file_path] = feature_file
-              initialize_scenario_metadata
+              example.metadata[:turnip] = { steps: [], tags: [] }
 
               feature.backgrounds.each do |background|
                 push_scenario_metadata(background)
               end
-              
+
               background_steps.each.with_index do |step, index|
                 run_step(feature_file, step, index)
               end

data/lib/turnip_formatter/formatter.css

@@ -1,5 +1,5 @@
 body {
-  background-color: #586e75; }
+  background-color: #ffffff; }
 
 div#report {
   margin: 0 auto;
@@ -17,7 +17,7 @@ footer {
 div#main {
   margin: 0 auto;
   padding: 2em;
-  background-color: #fff9f9; }
+  background-color: #ffffff; }
   div#main .ui-tabs-nav {
     border-width: 0;
     padding: 0; }

data/lib/turnip_formatter/formatter.scss

@@ -42,7 +42,7 @@ $gray-background: #DDDDDD;
 }
 
 body {
-    background-color: #586e75;
+    background-color: #ffffff;
 }
 
 div#report {
@@ -60,7 +60,7 @@ footer {
 
 div#main {
     @include content_centering;
-    background-color: #fff9f9;
+    background-color: #ffffff;
 
     .ui-tabs-nav {
         border-width: 0;

data/lib/turnip_formatter/scenario.rb

@@ -31,7 +31,7 @@ module TurnipFormatter
     def id
       "step_" + object_id.to_s
     end
-    
+
     #
     # @return  [String] scenario name
     #
@@ -78,8 +78,7 @@ module TurnipFormatter
     def clean_backtrace
       return if example.exception.nil?
       formatted = format_backtrace(example.exception.backtrace, example.metadata)
-      new_backtrace = formatted.map { |b| backtrace_line(b) }.compact
-      example.exception.set_backtrace(new_backtrace)
+      example.exception.set_backtrace(formatted)
     end
   end
 end

data/lib/turnip_formatter/step/failure.rb

@@ -6,7 +6,7 @@ module TurnipFormatter
   class Step
     module Failure
       extend DSL
-      
+
       def self.status
         :failure
       end
@@ -14,14 +14,14 @@ module TurnipFormatter
       def status
         Failure.status
       end
-    end
-  end
-end
 
-TurnipFormatter::Step::Failure.add_template :source do
-  example.exception.backtrace.first
-end
+      add_template :source do
+        example.exception.backtrace.first
+      end
 
-TurnipFormatter::Step::Failure.add_template :exception do
-  example.exception
+      add_template :exception do
+        example.exception
+      end
+    end
+  end
 end

data/lib/turnip_formatter/step/pending.rb

@@ -14,13 +14,13 @@ module TurnipFormatter
       def status
         Pending.status
       end
+
+      add_template :exception do
+        message = example.execution_result[:pending_message]
+        exception = RSpec::Core::Pending::PendingDeclaredInExample.new(message)
+        exception.set_backtrace(example.location)
+        exception
+      end
     end
   end
 end
-
-TurnipFormatter::Step::Pending.add_template :exception do
-  message = example.execution_result[:pending_message]
-  exception = RSpec::Core::Pending::PendingDeclaredInExample.new(message)
-  exception.set_backtrace(example.location)
-  exception
-end

data/lib/turnip_formatter/template.rb

@@ -36,7 +36,7 @@ module TurnipFormatter
               $(function() {
                   var scenarioHeader = 'section.scenario header';
                   $(scenarioHeader).siblings().hide();
-                   
+
                   /**
                    * Step folding/expanding
                    */
@@ -44,13 +44,13 @@ module TurnipFormatter
                       var steps = $(this).siblings();
                       steps.slideToggle();
                   });
-                   
+
                   /**
                    * All step folding/expanding action
                    */
                   $('#scenario_display_check').change(function() {
                       var steps = $(scenarioHeader).siblings();
-                   
+
                       if (this.checked) {
                           steps.slideUp();
                       } else {
@@ -73,7 +73,7 @@ module TurnipFormatter
                    */
                    var tab_area = 'div#main';
                    $(tab_area).tabs();
-                    
+
                    $('div#speed-statistics a').click(function() {
                        $(tab_area).tabs("option", "active", 0);
                    });
@@ -108,7 +108,7 @@ module TurnipFormatter
     def print_main_footer(total_count, failed_count, pending_count, total_time)
       update_report_js_tmp = '<script type="text/javascript">document.getElementById("%s").innerHTML = "%s";</script>'
       update_report_js = ''
-      
+
       %w{ total_count failed_count pending_count total_time }.each do |key|
         update_report_js += update_report_js_tmp % [key, eval(key)]
       end
@@ -163,12 +163,7 @@ module TurnipFormatter
     end
 
     def print_runtime_error(example, exception)
-      if example.exception
-        example_backtrace = format_backtrace(example.exception.backtrace[0..14], example.metadata).map do |l|
-          RSpec::Core::Metadata::relative_path(l)
-        end
-      end
-
+      exception.set_backtrace(format_backtrace(exception.backtrace))
       template_exception.result(binding)
     end
 
@@ -229,7 +224,7 @@ module TurnipFormatter
             <label for="failed_check">Failed</label><input type="checkbox" checked id="failed_check">
             <label for="pending_check">Pending</label><input type="checkbox" checked id="pending_check">
           </section>
-           
+
           <section class="result">
             <p>
               <span id="total_count"></span> Scenario (<span id="failed_count"></span> failed <span id="pending_count"></span> pending).
@@ -282,24 +277,21 @@ module TurnipFormatter
         <section class="exception">
           <h1>TurnipFormatter RuntimeError</h1>
           <dl>
-            <dt>Exception</dt>
+            <dt>Runtime Exception</dt>
             <dd><%= h(exception.to_s) %></dd>
 
+            <dt>Runtime Exception Backtrace</dt>
+            <%= template_exception_backtrace(exception) %>
+
             <dt>Example Full Description</dt>
             <dd><%= h(example.metadata[:full_description]) %></dd>
 
             <% if example.exception %>
               <dt>Example Exception</dt>
               <dd><%= h(example.exception.to_s) %></dd>
-   
-              <dt>Backtrace:</dt>
-              <dd>
-                <ol>
-                  <% example_backtrace.each do |line| %>
-                  <li><%= h(line) %></li>
-                  <% end %>
-                </ol>
-              </dd>
+
+              <dt>Example Backtrace</dt>
+              <%= template_exception_backtrace(example.exception) %>
             <% end %>
 
             <% if example.pending %>
@@ -310,5 +302,18 @@ module TurnipFormatter
         </section>
       EOS
     end
+
+    def template_exception_backtrace(exception)
+      @template_exception_backtrace ||= ERB.new(<<-EOS)
+        <dd>
+          <ol>
+            <% exception.backtrace.each do |line| %>
+            <li><%= h(line) %></li>
+            <% end %>
+          </ol>
+        </dd>
+      EOS
+      @template_exception_backtrace.result(binding)
+    end
   end
 end

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -181,18 +181,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 835368190807014694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 835368190807014694
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23