rspec-core 2.0.0.beta.22 → 2.6.0

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

@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/base_formatter'
+
 module RSpec
   module Core
     module Formatters
@@ -13,32 +15,9 @@ module RSpec
           output.puts
           output.puts "Failures:"
           failed_examples.each_with_index do |example, index|
-            output.puts if index > 0
-            exception = example.execution_result[:exception_encountered]
-            short_padding = '  '
-            padding = '     '
-            if exception.is_a?(RSpec::Core::PendingExampleFixedError)
-              output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
-              output.puts "#{padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised."
-            else
-              output.puts "#{short_padding}#{index.next}) #{example.full_description}"
-              output.puts "#{padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
-              exception.message.split("\n").each do |line|
-                output.puts "#{padding}#{red(line)}"
-              end
-
-              example.example_group.ancestors.push(example.example_group).each do |group|
-                if group.metadata[:shared_group_name]
-                  output.puts "#{padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
-                              "#{backtrace_line(group.metadata[:example_group][:location])}"
-                  break
-                end
-              end
-            end
-
-            format_backtrace(exception.backtrace, example).each do |backtrace_info|
-              output.puts grey("#{padding}# #{backtrace_info}")
-            end
+            output.puts
+            dump_pending_example_fixed(example, index) || dump_failure(example, index)
+            dump_backtrace(example)
           end
         end
 
@@ -67,7 +46,7 @@ module RSpec
           output.puts "\nTop #{sorted_examples.size} slowest examples:\n"
           sorted_examples.each do |example|
             output.puts "  #{example.full_description}"
-            output.puts grey("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.metadata[:location])}")
+            output.puts grey("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
           end
         end
 
@@ -84,8 +63,8 @@ module RSpec
             output.puts "Pending:"
             pending_examples.each do |pending_example|
               output.puts yellow("  #{pending_example.full_description}")
-              output.puts grey("    # #{pending_example.metadata[:execution_result][:pending_message]}")
-              output.puts grey("    # #{format_caller(pending_example.metadata[:location])}")
+              output.puts grey("    # #{pending_example.execution_result[:pending_message]}")
+              output.puts grey("    # #{format_caller(pending_example.location)}")
             end
           end
         end
@@ -132,6 +111,14 @@ module RSpec
           color(text, "\e[90m")
         end
 
+        def short_padding
+          '  '
+        end
+
+        def long_padding
+          '     '
+        end
+
       private
 
         def pluralize(count, string)
@@ -142,8 +129,37 @@ module RSpec
           backtrace_line(caller_info.to_s.split(':in `block').first)
         end
 
-      end
+        def dump_backtrace(example)
+          format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
+            output.puts grey("#{long_padding}# #{backtrace_info}")
+          end
+        end
+
+        def dump_pending_example_fixed(example, index)
+          if RSpec::Core::PendingExampleFixedError === example.execution_result[:exception]
+            output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
+            output.puts blue("#{long_padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised.")
+            true
+          end
+        end
+
+        def dump_failure(example, index)
+          exception = example.execution_result[:exception]
+          output.puts "#{short_padding}#{index.next}) #{example.full_description}"
+          output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
+          output.puts "#{long_padding}#{red(exception.class.name << ":")}" unless exception.class.name =~ /RSpec/
+          exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" } if exception.message
 
+          example.example_group.ancestors.push(example.example_group).each do |group|
+            if group.metadata[:shared_group_name]
+              output.puts "#{long_padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
+                "#{backtrace_line(group.metadata[:example_group][:location])}"
+              break
+            end
+          end
+        end
+
+      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/base_text_formatter'
+
 module RSpec
   module Core
     module Formatters
@@ -13,7 +15,7 @@ module RSpec
           super(example_group)
 
           output.puts if @group_level == 0
-          output.puts "#{'  ' * @group_level}#{example_group.description}"
+          output.puts "#{current_indentation}#{example_group.description}"
 
           @group_level += 1
         end
@@ -34,7 +36,7 @@ module RSpec
 
         def example_failed(example)
           super(example)
-          output.puts failure_output(example, example.execution_result[:exception_encountered])
+          output.puts failure_output(example, example.execution_result[:exception])
         end
 
         def failure_output(example, exception)

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

@@ -1,7 +1,5 @@
 module RSpec
-
   module Core
-
     module Formatters
 
       module Helpers
@@ -22,7 +20,5 @@ module RSpec
       end
 
     end
-
   end
-
 end

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

@@ -7,13 +7,6 @@ module RSpec
       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(output)
           @example_group_number = 0
@@ -21,6 +14,15 @@ module RSpec
           @header_red = nil
         end
 
+        private
+        def method_missing(m, *a, &b)
+          # no-op
+        end
+
+        public
+        def message(message)
+        end
+
         # The number of the currently running example_group
         def example_group_number
           @example_group_number
@@ -46,9 +48,9 @@ module RSpec
             @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.puts "<div id=\"div_group_#{example_group_number}\" class=\"example_group passed\">"
+          @output.puts "  <dl #{current_indentation}>"
+          @output.puts "  <dt id=\"example_group_#{example_group_number}\" class=\"passed\">#{h(example_group.description)}</dt>"
           @output.flush
         end
 
@@ -65,24 +67,24 @@ module RSpec
 
         def example_passed(example)
           move_progress
-          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{h(example.description)}</span></dd>"
+          @output.puts "    <dd class=\"example 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]
+          super(example)
+          exception = example.metadata[:execution_result][:exception]
           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('div_group_#{example_group_number}');</script>" unless @example_group_red
           @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 "    <dd class=\"example #{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=\"failure\" id=\"failure_#{@failed_examples.size}\">"
           @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 == ""
@@ -94,9 +96,10 @@ module RSpec
         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('div_group_#{example_group_number}');</script>" unless @example_group_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.puts "    <dd class=\"example not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example.description)} (PENDING: #{h(message)})</span></dd>"
           @output.flush
         end
 
@@ -133,7 +136,8 @@ module RSpec
           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 =  "#{example_count} example#{'s' unless example_count == 1}, "
+            totals << "#{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>"
@@ -144,6 +148,10 @@ module RSpec
           @output.puts "</html>"
           @output.flush
         end
+        
+        def current_indentation
+          "style=\"margin-left: #{(example_group.ancestors.size - 1) * 15}px;\""
+        end
 
         def html_header
           <<-EOF
@@ -187,36 +195,97 @@ EOF
     <h1>RSpec Code Examples</h1>
   </div>
 
+  <div id="display-filters">
+    <input id="passed_checkbox" name="passed_checkbox" type="checkbox" checked onchange="apply_filters()" value="1"> <label for="passed_checkbox">Passed</label>
+    <input id="failed_checkbox" name="failed_checkbox" type="checkbox" checked onchange="apply_filters()" value="2"> <label for="failed_checkbox">Failed</label>
+    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked onchange="apply_filters()" value="3"> <label for="pending_checkbox">Pending</label>
+  </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 addClass(element_id, classname) {
+  document.getElementById(element_id).className += (" " + classname);
+}
+
+function removeClass(element_id, classname) {
+  var elem = document.getElementById(element_id);
+  var classlist = elem.className.replace(classname,'');
+  elem.className = classlist;
+}
+
 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';
+  removeClass(element_id, 'passed');
+  removeClass(element_id, 'not_implemented');
+  addClass(element_id,'failed');
 }
 
 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';
+  var elem = document.getElementById(element_id);
+  if (elem.className.indexOf("failed") == -1) {  // class doesn't includes failed
+    if (elem.className.indexOf("not_implemented") == -1) { // class doesn't include not_implemented
+      removeClass(element_id, 'passed');
+      addClass(element_id,'not_implemented');
+    }
+  }
+}
+
+function apply_filters() {
+  var passed_filter = document.getElementById('passed_checkbox').checked;
+  var failed_filter = document.getElementById('failed_checkbox').checked;
+  var pending_filter = document.getElementById('pending_checkbox').checked;
+
+  assign_display_style("example passed", passed_filter);
+  assign_display_style("example failed", failed_filter);
+  assign_display_style("example not_implemented", pending_filter);
+
+  assign_display_style_for_group("example_group passed", passed_filter);
+  assign_display_style_for_group("example_group not_implemented", pending_filter, pending_filter || passed_filter);
+  assign_display_style_for_group("example_group failed", failed_filter, failed_filter || pending_filter || passed_filter);
+}
+
+function get_display_style(display_flag) {
+  var style_mode = 'none';
+  if (display_flag == true) {
+    style_mode = 'block';
+  }
+  return style_mode;
+}
+
+function assign_display_style(classname, display_flag) {
+  var style_mode = get_display_style(display_flag);
+  var elems = document.getElementsByClassName(classname)
+  for (var i=0; i<elems.length;i++) {
+    elems[i].style.display = style_mode;
   }
-  else
-  {
-    document.getElementById(element_id).style.background = '#FAF834';
-    document.getElementById(element_id).style.color = '#000000';
+}
+
+function assign_display_style_for_group(classname, display_flag, subgroup_flag) {
+  var display_style_mode = get_display_style(display_flag);
+  var subgroup_style_mode = get_display_style(subgroup_flag);
+  var elems = document.getElementsByClassName(classname)
+  for (var i=0; i<elems.length;i++) {
+    var style_mode = display_style_mode;
+    if ((display_flag != subgroup_flag) && (elems[i].getElementsByTagName('dt')[0].innerHTML.indexOf(", ") != -1)) {
+      elems[i].style.display = subgroup_style_mode;
+    } else {
+      elems[i].style.display = display_style_mode;
+    }
   }
 }
 EOF
@@ -236,13 +305,21 @@ EOF
   position: absolute;
 }
 
+#label {
+  float:left;
+}
+
+#display-filters {
+  float:left;
+  padding: 28px 0 0 40%;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+}
+
 #summary {
-  margin: 0; padding: 5px 10px;
+  float:right;
+  padding: 5px 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
-  top: 0px;
-  right: 0px;
-  float:right;
 }
 
 #summary p {
@@ -275,30 +352,58 @@ dd {
   padding: 3px 3px 3px 18px;
 }
 
-dd.spec.passed {
+
+dd.example.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 {
+dd.example.not_implemented {
   border-left: 5px solid #FAF834;
   border-bottom: 1px solid #FAF834;
   background: #FCFB98; color: #131313;
 }
 
-dd.spec.pending_fixed {
+dd.example.pending_fixed {
   border-left: 5px solid #0000C2;
   border-bottom: 1px solid #0000C2;
   color: #0000C2; background: #D3FBFF;
 }
 
+dd.example.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+
+dt.not_implemented {
+  color: #000000; background: #FAF834;
+}
+
+dt.pending_fixed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+dt.failed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+
+#rspec-header.not_implemented {
+  color: #000000; background: #FAF834;
+}
+
+#rspec-header.pending_fixed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+#rspec-header.failed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+
 .backtrace {
   color: #000;
   font-size: 12px;

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

@@ -1,3 +1,4 @@
+require 'rspec/core/formatters/base_text_formatter'
 module RSpec
   module Core
     module Formatters

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

@@ -25,7 +25,7 @@ module RSpec
 
         def lines_around(file, line)
           if File.file?(file)
-            lines = File.open(file).read.split("\n")
+            lines = File.read(file).split("\n")
             min = [0, line-3].max
             max = [line+1, lines.length-1].min
             selected_lines = []

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

@@ -7,9 +7,11 @@ module RSpec
       class TextMateFormatter < HtmlFormatter
         def backtrace_line(line)
           if line = super(line)
-            line.sub!(/([^:]*\.rb):(\d*)/) do
+            line.sub!(/([^:]*\.e?rb):(\d*)/) do
               "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
             end
+
+            line
           end
         end
       end

data/lib/rspec/core/hooks.rb

@@ -1,17 +1,19 @@
 module RSpec
   module Core
     module Hooks
+      include MetadataHashBuilder::WithConfigWarning
 
       class Hook
         attr_reader :options
 
-        def initialize(options, block)
+        def initialize(options, &block)
           @options = options
+          raise "no block given for #{self.class::TYPE} hook" unless block
           @block = block
         end
 
-        def options_apply?(group)
-          !group || group.all_apply?(options)
+        def options_apply?(example_or_group)
+          !example_or_group || example_or_group.apply?(:all?, options)
         end
 
         def to_proc
@@ -24,6 +26,7 @@ module RSpec
       end
 
       class BeforeHook < Hook
+        TYPE = 'before'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval(&self)
@@ -34,6 +37,7 @@ module RSpec
       end
 
       class AfterHook < Hook
+        TYPE = 'after'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval_with_rescue(&self)
@@ -44,20 +48,25 @@ module RSpec
       end
 
       class AroundHook < Hook
+        TYPE = 'around'
         def call(wrapped_example)
           @block.call(wrapped_example)
         end
       end
 
       class HookCollection < Array
-        def find_hooks_for(group)
-          dup.reject {|hook| !hook.options_apply?(group)}
+        def find_hooks_for(example_or_group)
+          self.class.new(select {|hook| hook.options_apply?(example_or_group)})
+        end
+
+        def without_hooks_for(example_or_group)
+          self.class.new(reject {|hook| hook.options_apply?(example_or_group)})
         end
       end
 
       class BeforeHooks < HookCollection
         def run_all(example_group_instance)
-          each {|h| h.run_in(example_group_instance) }
+          each {|h| h.run_in(example_group_instance) } unless empty?
         end
 
         def run_all!(example_group_instance)
@@ -67,7 +76,7 @@ module RSpec
 
       class AfterHooks < HookCollection
         def run_all(example_group_instance)
-          reverse.each {|h| h.run_in(example_group_instance) }
+          reverse.each {|h| h.run_in(example_group_instance) } unless empty?
         end
 
         def run_all!(example_group_instance)
@@ -85,16 +94,19 @@ module RSpec
         }
       end
 
-      def before(scope=:each, options={}, &block)
-        hooks[:before][scope] << BeforeHook.new(options, block)
+      def before(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:before][scope] << BeforeHook.new(options, &block)
       end
 
-      def after(scope=:each, options={}, &block)
-        hooks[:after][scope] << AfterHook.new(options, block)
+      def after(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:after][scope] << AfterHook.new(options, &block)
       end
 
-      def around(scope=:each, options={}, &block)
-        hooks[:around][scope] << AroundHook.new(options, block)
+      def around(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:around][scope] << AroundHook.new(options, &block)
       end
 
       # Runs all of the blocks stored with the hook in the context of the
@@ -109,12 +121,38 @@ module RSpec
         hooks[hook][scope].run_all!(example_group_instance)
       end
 
-      def run_hook_filtered(hook, scope, group, example_group_instance)
-        find_hook(hook, scope, group).run_all(example_group_instance)
+      def run_hook_filtered(hook, scope, group, example_group_instance, example = nil)
+        find_hook(hook, scope, group, example).run_all(example_group_instance)
       end
 
-      def find_hook(hook, scope, example_group_class)
-        hooks[hook][scope].find_hooks_for(example_group_class)
+      def find_hook(hook, scope, example_group_class, example = nil)
+        found_hooks = hooks[hook][scope].find_hooks_for(example || example_group_class)
+
+        # ensure we don't re-run :all hooks that were applied to any of the parent groups
+        if scope == :all
+          super_klass = example_group_class.superclass
+          while super_klass != RSpec::Core::ExampleGroup
+            found_hooks = found_hooks.without_hooks_for(super_klass)
+            super_klass = super_klass.superclass
+          end
+        end
+
+        found_hooks
+      end
+
+    private
+
+      def scope_and_options_from(*args)
+        scope = if [:each, :all, :suite].include?(args.first)
+          args.shift
+        elsif args.any? { |a| a.is_a?(Symbol) }
+          raise ArgumentError.new("You must explicitly give a scope (:each, :all, or :suite) when using symbols as metadata for a hook.")
+        else
+          :each
+        end
+
+        options = build_metadata_hash_from(args)
+        return scope, options
       end
     end
   end