rspec-core 2.0.0.beta.15 → 2.0.0.beta.16

data/features/hooks/described_class.feature

@@ -10,5 +10,5 @@ Feature: described class
       end
       """
     When I run "rspec ./spec/example_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 

data/features/hooks/halt.feature

@@ -23,4 +23,4 @@ Feature: halt
       end
       """
     When I run "rspec ./spec/example_spec.rb"
-    Then I should see "1 example, 1 failure"
+    Then the output should contain "1 example, 1 failure"

data/features/mock_framework_integration/use_flexmock.feature

@@ -19,5 +19,5 @@ Feature: mock with flexmock
       end
       """
     When I run "rspec ./flexmock_example_spec.rb"
-    Then I should see "1 example, 0 failures" 
+    Then the output should contain "1 example, 0 failures" 
     And the exit status should be 0

data/features/mock_framework_integration/use_mocha.feature

@@ -19,5 +19,5 @@ Feature: mock with mocha
       end
       """
     When I run "rspec ./mocha_example_spec.rb"
-    Then I should see "1 example, 0 failures" 
+    Then the output should contain "1 example, 0 failures" 
     And the exit status should be 0

data/features/mock_framework_integration/use_rr.feature

@@ -19,5 +19,5 @@ Feature: mock with rr
       end
       """
     When I run "rspec ./rr_example_spec.rb"
-    Then I should see "1 example, 0 failures" 
+    Then the output should contain "1 example, 0 failures" 
     And the exit status should be 0

data/features/mock_framework_integration/use_rspec.feature

@@ -19,5 +19,5 @@ Feature: mock with rspec
       end
       """
     When I run "rspec ./rspec_example_spec.rb"
-    Then I should see "1 example, 0 failures" 
+    Then the output should contain "1 example, 0 failures" 
     And the exit status should be 0

data/features/pending/pending_examples.feature

@@ -12,9 +12,9 @@ Feature: pending examples
       """
     When I run "rspec ./example_without_block_spec.rb"
     Then the exit status should be 0
-    And I should see "1 example, 0 failures, 1 pending"
-    And I should see "Not Yet Implemented"
-    And I should see "example_without_block_spec.rb:2"
+    And the output should contain "1 example, 0 failures, 1 pending"
+    And the output should contain "Not Yet Implemented"
+    And the output should contain "example_without_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with no block
     Given a file named "pending_without_block_spec.rb" with:
@@ -28,9 +28,9 @@ Feature: pending examples
       """
     When I run "rspec ./pending_without_block_spec.rb"
     Then the exit status should be 0
-    And I should see "1 example, 0 failures, 1 pending"
-    And I should see "(something else getting finished)"
-    And I should see "pending_without_block_spec.rb:2"
+    And the output should contain "1 example, 0 failures, 1 pending"
+    And the output should contain "(something else getting finished)"
+    And the output should contain "pending_without_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with a block that fails
     Given a file named "pending_with_failing_block_spec.rb" with:
@@ -45,9 +45,9 @@ Feature: pending examples
       """
     When I run "rspec ./pending_with_failing_block_spec.rb"
     Then the exit status should be 0
-    And I should see "1 example, 0 failures, 1 pending"
-    And I should see "(something else getting finished)"
-    And I should see "pending_with_failing_block_spec.rb:2"
+    And the output should contain "1 example, 0 failures, 1 pending"
+    And the output should contain "(something else getting finished)"
+    And the output should contain "pending_with_failing_block_spec.rb:2"
 
   Scenario: pending any arbitary reason, with a block that passes
     Given a file named "pending_with_passing_block_spec.rb" with:
@@ -62,7 +62,7 @@ Feature: pending examples
       """
     When I run "rspec ./pending_with_passing_block_spec.rb"
     Then the exit status should not be 0
-    And I should see "1 example, 1 failure"
-    And I should see "FIXED"
-    And I should see "Expected pending 'something else getting finished' to fail. No Error was raised."
-    And I should see "pending_with_passing_block_spec.rb:3"
+    And the output should contain "1 example, 1 failure"
+    And the output should contain "FIXED"
+    And the output should contain "Expected pending 'something else getting finished' to fail. No Error was raised."
+    And the output should contain "pending_with_passing_block_spec.rb:3"

data/features/subject/explicit_subject.feature

@@ -15,7 +15,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec ./top_level_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -32,7 +32,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec ./nested_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: access subject from before block
     Given a file named "top_level_subject_spec.rb" with:
@@ -46,7 +46,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec ./top_level_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: subject using helper method
     Given a file named "helper_subject_spec.rb" with:
@@ -64,4 +64,4 @@ Feature: explicit subject
       end
       """
     When I run "rspec ./helper_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/features/subject/implicit_subject.feature

@@ -14,7 +14,7 @@ Feature: implicit subject
       end
       """
     When I run "rspec ./top_level_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -28,4 +28,4 @@ Feature: implicit subject
       end
       """
     When I run "rspec ./nested_subject_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/lib/rspec/core/backward_compatibility.rb

@@ -1,11 +1,5 @@
 module RSpec
   module Core
-    class Configuration
-      def mock_with(use_me_to_mock)
-        self.mock_framework = use_me_to_mock
-      end
-    end
-
     module ConstMissing
       def const_missing(name)
         case name

data/lib/rspec/core/command_line.rb

@@ -1,29 +1,26 @@
 module RSpec
   module Core
     class CommandLine
-      def initialize(args_or_options)
-        if RSpec::Core::ConfigurationOptions === args_or_options
-          @options = args_or_options
-        else
-          @options = RSpec::Core::ConfigurationOptions.new(args_or_options)
-          @options.parse_options
-        end
-        @options.configure(configuration)
-        configuration.require_files_to_run
-        configuration.configure_mock_framework
+      def initialize(options, configuration=RSpec::configuration, world=RSpec::world)
+        @options       = options
+        @configuration = configuration
+        @world         = world
       end
 
       def run(err, out)
-        configuration.error_stream = err
-        configuration.output_stream = out
-        world.announce_inclusion_filter
-
-        configuration.reporter.report(example_count) do |reporter|
+        @options.configure(@configuration)
+        @configuration.error_stream = err
+        @configuration.output_stream = out
+        @configuration.require_files_to_run
+        @configuration.configure_mock_framework
+        @world.announce_inclusion_filter
+
+        @configuration.reporter.report(example_count) do |reporter|
           begin
-            configuration.run_hook(:before, :suite)
+            @configuration.run_hook(:before, :suite)
             example_groups.run_examples(reporter)
           ensure
-            configuration.run_hook(:after, :suite)
+            @configuration.run_hook(:after, :suite)
           end
         end
 
@@ -33,7 +30,7 @@ module RSpec
     private
 
       def example_count
-        world.example_count
+        @world.example_count
       end
 
       module ExampleGroups
@@ -47,15 +44,7 @@ module RSpec
       end
 
       def example_groups
-        world.example_groups.extend(ExampleGroups)
-      end
-
-      def configuration
-        RSpec.configuration
-      end
-
-      def world
-        RSpec.world
+        @world.example_groups.extend(ExampleGroups)
       end
     end
   end

data/lib/rspec/core/configuration.rb

@@ -12,7 +12,7 @@ module RSpec
           alias_method "#{name}?", "#{opts[:alias]}?"
         else
           define_method("#{name}=") {|val| settings[name] = val}
-          define_method(name) { settings.has_key?(name) ? settings[name] : opts[:default] }
+          define_method(name)       { settings.has_key?(name) ? settings[name] : opts[:default] }
           define_method("#{name}?") { !!(send name) }
         end
       end
@@ -40,7 +40,7 @@ module RSpec
         /bin\/spec/,
         /lib\/rspec\/(core|expectations|matchers|mocks)/
       ]
-    
+
       # :call-seq:
       #   add_setting(:name)
       #   add_setting(:name, :default => "default_value")
@@ -91,7 +91,7 @@ module RSpec
         @settings ||= {}
       end
 
-      def clear_inclusion_filter
+      def clear_inclusion_filter # :nodoc:
         self.filter = nil
       end
 
@@ -99,6 +99,10 @@ module RSpec
         backtrace_clean_patterns.any? { |regex| line =~ regex }
       end
 
+      def mock_with(mock_framework)
+        settings[:mock_framework] = mock_framework
+      end
+
       def require_mock_framework_adapter
         require case mock_framework.to_s
         when /rspec/i
@@ -115,7 +119,7 @@ module RSpec
       end
 
       def full_backtrace=(bool)
-        backtrace_clean_patterns.clear
+        settings[:backtrace_clean_patterns] = []
       end
 
       def color_enabled=(bool)
@@ -177,6 +181,10 @@ EOM
           formatter_class = case formatter_to_use.to_s
           when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
             RSpec::Core::Formatters::DocumentationFormatter
+          when 'h', 'html'
+            RSpec::Core::Formatters::HtmlFormatter
+          when 't', 'textmate'
+            RSpec::Core::Formatters::TextMateFormatter
           when 'progress' 
             RSpec::Core::Formatters::ProgressFormatter
           else 
@@ -220,6 +228,7 @@ EOM
       end
 
       def filter_run_including(options={})
+        # TODO (DC 2010-07-03) this should probably warn when the unless clause returns true
         self.filter = options unless filter and filter[:line_number] || filter[:full_description]
       end
 

data/lib/rspec/core/example.rb

@@ -39,7 +39,7 @@ module RSpec
         @example_group_instance = example_group_instance
         @example_group_instance.example = self
 
-        start
+        start(reporter)
 
         begin
           unless pending
@@ -90,7 +90,8 @@ module RSpec
           @example_group_class.ancestors.reverse.map{|a| a.hooks[:around][:each]}).flatten
       end
 
-      def start
+      def start(reporter)
+        reporter.example_started(self)
         record :started_at => Time.now
       end
 

data/lib/rspec/core/formatters.rb

@@ -3,15 +3,6 @@ require 'rspec/core/formatters/base_formatter'
 require 'rspec/core/formatters/base_text_formatter'
 require 'rspec/core/formatters/documentation_formatter'
 require 'rspec/core/formatters/progress_formatter'
+require 'rspec/core/formatters/html_formatter'
+require 'rspec/core/formatters/text_mate_formatter'
 
-module RSpec
-
-  module Core
-
-    module Formatters
-
-    end
-
-  end
-
-end

data/lib/rspec/core/formatters/base_formatter.rb

@@ -58,16 +58,20 @@ module RSpec
           @duration = Time.now - @start
         end
 
-        def example_passed(example)
+        def example_started(example)
           examples << example
         end
 
+        def example_passed(example)
+        end
+
         def example_pending(example)
-          examples << example
         end
 
         def example_failed(example)
-          examples << example
+        end
+
+        def message(message)
         end
 
         # This method is invoked at the beginning of the execution of each example group.

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -4,6 +4,10 @@ module RSpec
 
       class BaseTextFormatter < BaseFormatter
 
+        def message(message)
+          output.puts message
+        end
+
         def dump_failures
           output.puts
           failed_examples.each_with_index do |failed_example, index|

data/lib/rspec/core/formatters/html_formatter.rb

@@ -0,0 +1,350 @@
+require 'erb'
+require 'rspec/core/formatters/base_text_formatter'
+
+module RSpec
+  module Core
+    module Formatters
+      class HtmlFormatter < BaseTextFormatter
+        include ERB::Util # for the #h method
+
+        def method_missing(m, *a, &b)
+          # no-op
+        end
+
+        def message(message)
+        end
+        
+        def initialize(output)
+          super
+          @example_group_number = 0
+          @example_number = 0
+          @header_red = nil
+        end
+        
+        # The number of the currently running example_group
+        def example_group_number
+          @example_group_number
+        end
+        
+        # The number of the currently running example (a global counter)
+        def example_number
+          @example_number
+        end
+        
+        def start(example_count)
+          super
+          @output.puts html_header
+          @output.puts report_header
+          @output.flush
+        end
+
+        def add_example_group(example_group)
+          super
+          @example_group_red = false
+          @example_group_number += 1
+          unless example_group_number == 1
+            @output.puts "  </dl>"
+            @output.puts "</div>"
+          end
+          @output.puts "<div class=\"example_group\">"
+          @output.puts "  <dl>"
+          @output.puts "  <dt id=\"example_group_#{example_group_number}\">#{h(example_group.description)}</dt>"
+          @output.flush
+        end
+
+        def start_dump(duration)
+          @output.puts "  </dl>"
+          @output.puts "</div>"
+          @output.flush
+        end
+
+        def example_started(example)
+          super
+          @example_number += 1
+        end
+
+        def example_passed(example)
+          move_progress
+          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{h(example.description)}</span></dd>"
+          @output.flush
+        end
+
+        def example_failed(example)
+          counter = 0
+          exception = example.metadata[:execution_result][:exception_encountered]
+          extra = extra_failure_content(exception)
+          failure_style = 'failed'
+          failure_style = RSpec::Core::PendingExampleFixedError === exception ? 'pending_fixed' : 'failed'
+          @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
+          @header_red = true
+          @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{example_group_number}');</script>" unless @example_group_red
+          @example_group_red = true
+          move_progress
+          @output.puts "    <dd class=\"spec #{failure_style}\">"
+          @output.puts "      <span class=\"failed_spec_name\">#{h(example.description)}</span>"
+          @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
+          @output.puts "        <div class=\"message\"><pre>#{h(exception.message)}</pre></div>" unless exception.nil?
+          @output.puts "        <div class=\"backtrace\"><pre>#{format_backtrace(exception.backtrace, example).join("\n")}</pre></div>" if exception
+          @output.puts extra unless extra == ""
+          @output.puts "      </div>"
+          @output.puts "    </dd>"
+          @output.flush
+        end
+
+        def example_pending(example)
+          message = example.metadata[:execution_result][:pending_message]
+          @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
+          @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{example_group_number}');</script>" unless @example_group_red
+          move_progress
+          @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example.description)} (PENDING: #{h(message)})</span></dd>"
+          @output.flush
+        end
+
+        # Override this method if you wish to output extra HTML for a failed spec. For example, you
+        # could output links to images or other files produced during the specs.
+        #
+        def extra_failure_content(exception)
+          require 'rspec/core/formatters/snippet_extractor'
+          @snippet_extractor ||= SnippetExtractor.new
+          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(exception)}</code></pre>"
+        end
+        
+        def move_progress
+          @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
+          @output.flush
+        end
+
+        def percent_done
+          result = 100.0
+          if @example_count > 0
+            result = ((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
+          end
+          result
+        end
+
+        def dump_failures
+        end
+
+        def dump_pending
+        end
+
+        def dump_summary
+          if dry_run?
+            totals = "This was a dry-run"
+          else
+            totals = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+            totals << ", #{pending_count} pending" if pending_count > 0  
+          end
+          @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>"
+          @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+          @output.puts "</div>"
+          @output.puts "</div>"
+          @output.puts "</body>"
+          @output.puts "</html>"
+          @output.flush
+        end
+
+        def html_header 
+          <<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+  <script type="text/javascript">
+    // <![CDATA[
+#{global_scripts}
+    // ]]>
+  </script>
+  <style type="text/css">
+#{global_styles}
+  </style>
+</head>
+<body>
+EOF
+        end
+
+        def report_header
+          <<-EOF
+<div class="rspec-report">
+
+<div id="rspec-header">
+  <div id="label">
+    <h1>RSpec Code Examples</h1>
+  </div>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+EOF
+        end
+
+        def global_scripts
+          <<-EOF
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+EOF
+        end
+        
+        def global_styles
+          <<-EOF
+#rspec-header {
+  background: #65C400; color: #fff; height: 4em;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+  position: absolute;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  top: 0px;
+  right: 0px;
+  float:right;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.example_group {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+EOF
+        end
+      end
+    end
+  end
+end