teaspoon 1.1.5 → 1.2.0

data/lib/teaspoon/formatter/dot.rb

@@ -8,20 +8,20 @@ module Teaspoon
 
       protected
 
-      def log_spec(result)
-        return log_str(".", GREEN) if result.passing?
-        return log_str("*", YELLOW) if result.pending?
-        log_str("F", RED)
-      end
+        def log_spec(result)
+          return log_str(".", GREEN) if result.passing?
+          return log_str("*", YELLOW) if result.pending?
+          log_str("F", RED)
+        end
 
-      def log_console(message)
-        log_str(message)
-      end
+        def log_console(message)
+          log_str(message)
+        end
 
-      def log_result(result)
-        log_line("\n")
-        super
-      end
+        def log_result(result)
+          log_line("\n")
+          super
+        end
     end
   end
 end

data/lib/teaspoon/formatter/json.rb

@@ -5,33 +5,33 @@ module Teaspoon
     class Json < Base
       protected
 
-      def log_runner(result)
-        log_result(result)
-      end
+        def log_runner(result)
+          log_result(result)
+        end
 
-      def log_suite(result)
-        log_result(result)
-      end
+        def log_suite(result)
+          log_result(result)
+        end
 
-      def log_spec(result)
-        log_result(result)
-      end
+        def log_spec(result)
+          log_result(result)
+        end
 
-      def log_error(result)
-        log_result(result)
-      end
+        def log_error(result)
+          log_result(result)
+        end
 
-      def log_exception(result)
-        log_result(result)
-      end
+        def log_exception(result)
+          log_result(result)
+        end
 
-      def log_console(message)
-        log_line(%{{"type":"console","log":"#{message.gsub(/\n$/, '').gsub('\n', '\\n')}"}})
-      end
+        def log_console(message)
+          log_line(%{{"type":"console","log":"#{message.gsub(/\n$/, '').gsub('\n', '\\n')}"}})
+        end
 
-      def log_result(result)
-        log_str(result.original_json)
-      end
+        def log_result(result)
+          log_str(result.original_json)
+        end
     end
   end
 end

data/lib/teaspoon/formatter/junit.rb

@@ -6,75 +6,75 @@ module Teaspoon
     class Junit < Base
       protected
 
-      def log_runner(result)
-        log_line(%{<?xml version="1.0" encoding="UTF-8"?>})
-        log_line(%{<testsuites name="Teaspoon">})
-        start_time = Time.parse(result.start).iso8601
-        log_line(%{<testsuite name="#{escape(@suite_name)}" tests="#{@total_count}" timestamp="#{start_time}">})
-      end
+        def log_runner(result)
+          log_line(%{<?xml version="1.0" encoding="UTF-8"?>})
+          log_line(%{<testsuites name="Teaspoon">})
+          start_time = Time.parse(result.start).iso8601
+          log_line(%{<testsuite name="#{escape(@suite_name)}" tests="#{@total_count}" timestamp="#{start_time}">})
+        end
 
-      def log_suite(result)
-        log_end_suite
-        log_line(%{<testsuite name="#{escape(result.label)}">})
-      end
+        def log_suite(result)
+          log_end_suite
+          log_line(%{<testsuite name="#{escape(result.label)}">})
+        end
 
-      def log_passing_spec(result)
-        log_junit_spec(suite: result.suite, label: result.label)
-      end
+        def log_passing_spec(result)
+          log_junit_spec(suite: result.suite, label: result.label)
+        end
 
-      def log_pending_spec(result)
-        log_junit_spec(suite: result.suite, label: result.label) do
-          log_line(%{  <skipped/>})
+        def log_pending_spec(result)
+          log_junit_spec(suite: result.suite, label: result.label) do
+            log_line(%{  <skipped/>})
+          end
         end
-      end
 
-      def log_failing_spec(result)
-        log_junit_spec(suite: result.suite, label: result.label) do
-          log_line(%{  <failure type="AssertionFailed">#{cdata(result.message)}</failure>})
+        def log_failing_spec(result)
+          log_junit_spec(suite: result.suite, label: result.label) do
+            log_line(%{  <failure type="AssertionFailed">#{cdata(result.message)}</failure>})
+          end
         end
-      end
 
-      def log_result(_result)
-        log_end_suite
-      end
+        def log_result(_result)
+          log_end_suite
+        end
 
-      def log_coverage(message)
-        properties = "<properties>#{cdata(message)}</properties>"
-        log_line(%{<testsuite name="Coverage summary" tests="0">\n#{properties}\n</testsuite>})
-      end
+        def log_coverage(message)
+          properties = "<properties>#{cdata(message)}</properties>"
+          log_line(%{<testsuite name="Coverage summary" tests="0">\n#{properties}\n</testsuite>})
+        end
 
-      def log_threshold_failure(message)
-        log_line(%{<testsuite name="Coverage thresholds" tests="1">})
-        log_junit_spec(suite: "Coverage thresholds", label: "were not met") do
-          log_line(%{  <failure type="AssertionFailed">#{cdata(message)}</failure>})
+        def log_threshold_failure(message)
+          log_line(%{<testsuite name="Coverage thresholds" tests="1">})
+          log_junit_spec(suite: "Coverage thresholds", label: "were not met") do
+            log_line(%{  <failure type="AssertionFailed">#{cdata(message)}</failure>})
+          end
+          log_line(%{</testsuite>})
         end
-        log_line(%{</testsuite>})
-      end
 
-      def log_complete(_failure_count)
-        log_line(%{</testsuite>\n</testsuites>})
-      end
+        def log_complete(_failure_count)
+          log_line(%{</testsuite>\n</testsuites>})
+        end
 
       private
 
-      def log_end_suite
-        log_line(%{</testsuite>}) if @last_suite
-      end
+        def log_end_suite
+          log_line(%{</testsuite>}) if @last_suite
+        end
 
-      def log_junit_spec(opts, &_block)
-        log_line(%{<testcase classname="#{escape(opts[:suite])}" name="#{escape(opts[:label])}">})
-        yield if block_given?
-        log_line(%{<system-out>#{cdata(@stdout)}</system-out>}) unless @stdout.blank?
-        log_line(%{</testcase>})
-      end
+        def log_junit_spec(opts, &_block)
+          log_line(%{<testcase classname="#{escape(opts[:suite])}" name="#{escape(opts[:label])}">})
+          yield if block_given?
+          log_line(%{<system-out>#{cdata(@stdout)}</system-out>}) unless @stdout.blank?
+          log_line(%{</testcase>})
+        end
 
-      def escape(str)
-        CGI::escapeHTML(str)
-      end
+        def escape(str)
+          CGI.escapeHTML(str)
+        end
 
-      def cdata(str)
-        "\n<![CDATA[\n#{str.gsub(/\n$/, '')}\n]]>\n"
-      end
+        def cdata(str)
+          "\n<![CDATA[\n#{str.gsub(/\n$/, '')}\n]]>\n"
+        end
     end
   end
 end

data/lib/teaspoon/formatter/modules/report_module.rb

@@ -15,6 +15,8 @@ module Teaspoon
         log_line
       end
 
+      alias_method :log_exception, :log_error
+
       def log_result(result)
         log_information
         log_stats(result)
@@ -31,46 +33,46 @@ module Teaspoon
 
       private
 
-      def log_information
-        log_pending if pendings.size > 0
-        log_failures if failures.size > 0
-      end
+        def log_information
+          log_pending if pendings.size > 0
+          log_failures if failures.size > 0
+        end
 
-      def log_pending
-        log_line("Pending:")
-        pendings.each do |result|
-          log_line("  #{result.description}", YELLOW)
-          log_line("    # Not yet implemented\n", CYAN)
+        def log_pending
+          log_line("Pending:")
+          pendings.each do |result|
+            log_line("  #{result.description}", YELLOW)
+            log_line("    # Not yet implemented\n", CYAN)
+          end
         end
-      end
 
-      def log_failures
-        log_line("Failures:\n")
-        failures.each_with_index do |failure, index|
-          log_line("  #{index + 1}) #{failure.description}")
-          log_line("     Failure/Error: #{failure.message}\n", RED)
+        def log_failures
+          log_line("Failures:\n")
+          failures.each_with_index do |failure, index|
+            log_line("  #{index + 1}) #{failure.description}")
+            log_line("     Failure/Error: #{failure.message}\n", RED)
+          end
         end
-      end
 
-      def log_stats(result)
-        log_line("Finished in #{result.elapsed} seconds")
-        stats = "#{pluralize('example', run_count)}, #{pluralize('failure', failures.size)}"
-        stats << ", #{pendings.size} pending" if pendings.size > 0
-        log_line(stats, stats_color)
-      end
+        def log_stats(result)
+          log_line("Finished in #{result.elapsed} seconds")
+          stats = "#{pluralize('example', run_count)}, #{pluralize('failure', failures.size)}"
+          stats << ", #{pendings.size} pending" if pendings.size > 0
+          log_line(stats, stats_color)
+        end
 
-      def log_failed_examples
-        return if failures.size == 0
-        log_line
-        log_line("Failed examples:\n")
-        failures.each do |failure|
-          log_line("teaspoon -s #{@suite_name} --filter=\"#{failure.link}\"", RED)
+        def log_failed_examples
+          return if failures.size == 0
+          log_line
+          log_line("Failed examples:\n")
+          failures.each do |failure|
+            log_line("teaspoon -s #{@suite_name} --filter=\"#{failure.link}\"", RED)
+          end
         end
-      end
 
-      def stats_color
-        failures.size > 0 ? RED : pendings.size > 0 ? YELLOW : GREEN
-      end
+        def stats_color
+          failures.size > 0 ? RED : pendings.size > 0 ? YELLOW : GREEN
+        end
     end
   end
 end

data/lib/teaspoon/formatter/pride.rb

@@ -12,34 +12,34 @@ module Teaspoon
 
       protected
 
-      def log_spec(result)
-        return log_pride if result.passing?
-        super
-      end
+        def log_spec(result)
+          return log_pride if result.passing?
+          super
+        end
 
       private
 
-      def log_pride
-        return log_str(".") unless Teaspoon.configuration.color
-        log_str("\e[38;5;#{next_color}m.\e[0m")
-      end
+        def log_pride
+          return log_str(".") unless Teaspoon.configuration.color
+          log_str("\e[38;5;#{next_color}m.\e[0m")
+        end
 
-      def colors
-        @colors ||= (0...42).map do |i|
-          i *= 1.0 / 6
-          36 * calc_color(i) + 6 * calc_color(i + 2 * PI_3) + calc_color(i + 4 * PI_3) + 16
+        def colors
+          @colors ||= (0...42).map do |i|
+            i *= 1.0 / 6
+            36 * calc_color(i) + 6 * calc_color(i + 2 * PI_3) + calc_color(i + 4 * PI_3) + 16
+          end
         end
-      end
 
-      def calc_color(val)
-        (3 * Math.sin(val) + 3).to_i
-      end
+        def calc_color(val)
+          (3 * Math.sin(val) + 3).to_i
+        end
 
-      def next_color
-        c = colors[@color_index % colors.size]
-        @color_index += 1
-        c
-      end
+        def next_color
+          c = colors[@color_index % colors.size]
+          @color_index += 1
+          c
+        end
     end
   end
 end

data/lib/teaspoon/formatter/rspec_html.rb

@@ -38,38 +38,38 @@ module Teaspoon
 
       private
 
-      def log_suite_start(result)
-        @current_suite << result.label
-        log_template @suite_start_template, result
-      end
+        def log_suite_start(result)
+          @current_suite << result.label
+          log_template @suite_start_template, result
+        end
 
-      def log_suite_end
-        log_template @suite_end_template, @current_suite.pop
-      end
+        def log_suite_end
+          log_template @suite_end_template, @current_suite.pop
+        end
 
-      def template(contents)
-        Template.new contents
-      end
+        def template(contents)
+          Template.new contents
+        end
 
-      def log_template(template, object)
-        log_str template.render(object)
-      end
+        def log_template(template, object)
+          log_str template.render(object)
+        end
 
-      class Template
-        include ERB::Util
+        class Template
+          include ERB::Util
 
-        def initialize(contents)
-          @template = contents
-        end
+          def initialize(contents)
+            @template = contents
+          end
 
-        def render(obj)
-          @o = obj
-          ERB.new(@template).result binding
+          def render(obj)
+            @o = obj
+            ERB.new(@template).result binding
+          end
         end
-      end
 
-      module Templates
-        CSS = <<-CSS.strip_heredoc
+        module Templates
+          CSS = <<-CSS.strip_heredoc
         body {
           margin: 0;
           padding: 0;
@@ -191,7 +191,7 @@ module Teaspoon
         }
         CSS
 
-        JAVASCRIPT = <<-JAVASCRIPT.strip_heredoc
+          JAVASCRIPT = <<-JAVASCRIPT.strip_heredoc
         (function() {
           "use strict";
 
@@ -386,7 +386,7 @@ module Teaspoon
         })();
         JAVASCRIPT
 
-        HEADER = <<-HTML.strip_heredoc
+          HEADER = <<-HTML.strip_heredoc
         <!DOCTYPE html>
         <html>
           <head>
@@ -422,13 +422,13 @@ module Teaspoon
               <div class="results">
         HTML
 
-        SUITE_START = <<-HTML.strip_heredoc
+          SUITE_START = <<-HTML.strip_heredoc
         <div class="example_group">
           <dl>
             <dt><%= h @o.label %></dt>
         HTML
 
-        SPEC = <<-HTML.strip_heredoc
+          SPEC = <<-HTML.strip_heredoc
         <dd class="example <%= h @o.status %>">
           <span class="spec-name"><%= h @o.label %></span>
           <span class="duration"><%= h "\#{@o.elapsed}s" if @o.elapsed %></span>
@@ -441,12 +441,12 @@ module Teaspoon
         </dd>
         HTML
 
-        SUITE_END = <<-HTML.strip_heredoc
+          SUITE_END = <<-HTML.strip_heredoc
           </dl>
         </div>
         HTML
 
-        FOOTER = <<-HTML.strip_heredoc
+          FOOTER = <<-HTML.strip_heredoc
               </div>
             </div>
 
@@ -458,7 +458,7 @@ module Teaspoon
           </body>
         </html>
         HTML
-      end
+        end
     end
   end
 end