rspec-core 2.4.0 → 2.5.0

data/lib/rspec/core/example_group.rb

@@ -58,7 +58,8 @@ module RSpec
 
       alias_example_to :it
       alias_example_to :specify
-      alias_example_to :focused, :focused => true
+      alias_example_to :focused, :focused => true, :focus => true
+      alias_example_to :focus,   :focused => true, :focus => true
       alias_example_to :pending, :pending => true
       alias_example_to :xit,     :pending => true
 
@@ -172,14 +173,14 @@ module RSpec
       def self.eval_before_alls(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(superclass.before_all_ivars, example_group_instance)
-        world.run_hook_filtered(:before, :all, self, example_group_instance) if top_level?
+        world.run_hook_filtered(:before, :all, self, example_group_instance)
         run_hook!(:before, :all, example_group_instance)
         store_before_all_ivars(example_group_instance)
       end
 
       def self.eval_around_eachs(example, initial_procsy)
         example.around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
-          Example::Procsy.new(procsy.metadata) do
+          Example.procsy(procsy.metadata) do
             example.example_group_instance.instance_eval_with_args(procsy, &around_hook)
           end
         end
@@ -212,7 +213,7 @@ An error occurred in an after(:all) hook.
         EOS
         end
 
-        world.run_hook_filtered(:after, :all, self, example_group_instance) if top_level?
+        world.run_hook_filtered(:after, :all, self, example_group_instance)
       end
 
       def self.around_hooks_for(example)

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

@@ -121,7 +121,7 @@ module RSpec
           file_path, line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)[1..2]
 
           if File.exist?(file_path)
-            open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
+            File.readlines(file_path)[line_number.to_i - 1]
           else
             "Unable to find #{file_path} to read failed line"
           end

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

@@ -15,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

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

@@ -48,9 +48,9 @@ module RSpec
             @output.puts "  </dl>"
             @output.puts "</div>"
           end
-          @output.puts "<div class=\"example_group\">"
+          @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}\">#{h(example_group.description)}</dt>"
+          @output.puts "  <dt id=\"example_group_#{example_group_number}\" class=\"passed\">#{h(example_group.description)}</dt>"
           @output.flush
         end
 
@@ -67,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
+          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 == ""
@@ -96,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
 
@@ -135,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>"
@@ -193,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';
   }
-  else
-  {
-    document.getElementById(element_id).style.background = '#FAF834';
-    document.getElementById(element_id).style.color = '#000000';
+  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;
+  }
+}
+
+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
@@ -242,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 {
@@ -281,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/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/hooks.rb

@@ -53,6 +53,10 @@ module RSpec
         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
@@ -117,7 +121,18 @@ module RSpec
       end
 
       def find_hook(hook, scope, example_group_class, example = nil)
-        hooks[hook][scope].find_hooks_for(example || example_group_class)
+        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

data/lib/rspec/core/option_parser.rb

@@ -23,7 +23,7 @@ module RSpec::Core
 
     def parser(options)
       OptionParser.new do |parser|
-        parser.banner = "Usage: rspec [options] [files or directories]"
+        parser.banner = "Usage: rspec [options] [files or directories]\n\n"
 
         parser.on('-b', '--backtrace', 'Enable full backtrace') do |o|
           options[:full_backtrace] = true
@@ -106,11 +106,7 @@ module RSpec::Core
           options[:drb_port] = o.to_i
         end
 
-        parser.on('--tty') do |o|
-          options[:tty] = true
-        end
-
-        parser.on('--fail-fast', 'Use the fail_fast option to tell RSpec to abort the run on first failure.') do |o|
+        parser.on('--fail-fast', 'Abort the run on first failure.') do |o|
           options[:fail_fast] = true
         end
 
@@ -126,6 +122,10 @@ module RSpec::Core
           options[filter_type] ||= {}
           options[filter_type][name] = value
         end
+
+        parser.on('--tty', 'Used internally by rspec when sending commands to other processes') do |o|
+          options[:tty] = true
+        end
       end
     end
   end

data/lib/rspec/core/rake_task.rb

@@ -161,7 +161,7 @@ module RSpec
                             cmd_parts << "bundle exec" if gemfile? unless skip_bundler
                             cmd_parts << runner
                             if rcov
-                              cmd_parts << ["-Ispec:lib", rcov_opts]
+                              cmd_parts << ["-Ispec#{File::PATH_SEPARATOR}lib", rcov_opts]
                             else
                               cmd_parts << rspec_opts
                             end

data/lib/rspec/core/subject.rb

@@ -124,13 +124,13 @@ module RSpec
             example do
               self.class.class_eval do
                 define_method(:subject) do
-                  if super().is_a?(Hash) && attribute.is_a?(Array)
-                    OpenStruct.new(super()).send(attribute.first)
-                  else
-                    attribute.to_s.split('.').inject(super()) do |target, method|
-                      target.send(method)
-                    end
-                  end
+                  @_subject ||= if super().is_a?(Hash) && attribute.is_a?(Array)
+                                  OpenStruct.new(super()).send(attribute.first)
+                                else
+                                  attribute.to_s.split('.').inject(super()) do |target, method|
+                                    target.send(method)
+                                  end
+                                end
                 end
               end
               instance_eval(&block)

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.4.0'
+      STRING = '2.5.0'
     end
   end
 end

data/rspec-core.gemspec

@@ -22,17 +22,5 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [ "README.md" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
-
-  s.post_install_message = %Q{**************************************************
-
-  Thank you for installing #{s.summary}
-
-  Please be sure to look at the upgrade instructions to see what might have
-  changed since the last release:
-
-  http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown
-
-**************************************************
-}
 end