rspec-core 2.0.0.beta.17 → 2.0.0.beta.18

data/lib/rspec/core/configuration_options.rb

@@ -7,13 +7,13 @@ module RSpec
     class ConfigurationOptions
       LOCAL_OPTIONS_FILE  = ".rspec"
       GLOBAL_OPTIONS_FILE = File.join(File.expand_path("~"), ".rspec")
-      
+
       attr_reader :options
-      
+
       def initialize(args)
         @args = args
       end
-      
+
       def configure(config)
         keys = options.keys
         keys.unshift(:requires) if keys.delete(:requires)
@@ -22,7 +22,7 @@ module RSpec
           config.send("#{key}=", options[key])
         end
       end
-      
+
       def drb_argv
         argv = []
         argv << "--color"     if options[:color_enabled]
@@ -73,7 +73,7 @@ module RSpec
       def parse_global_options
         parse_options_file(GLOBAL_OPTIONS_FILE)
       end
-      
+
       def parse_options_file(path)
         Parser.parse(args_from_options_file(path))
       end

data/lib/rspec/core/deprecation.rb

@@ -1,8 +1,8 @@
 module RSpec
-  
+
   class << self
     def deprecate(method, alternate_method=nil, version=nil)
-      version_string = version ? "rspec-#{version}" : "a future version of RSpec" 
+      version_string = version ? "rspec-#{version}" : "a future version of RSpec"
 
       message = <<-NOTICE
 
@@ -30,16 +30,16 @@ ADDITIONAL
   end
 
   class HashWithDeprecationNotice < Hash
-  
+
     def initialize(method, alternate_method=nil, &block)
       @method, @alternate_method = method, alternate_method
     end
-  
+
     def []=(k,v)
       RSpec.deprecate(@method, @alternate_method)
       super
     end
-  
+
   end
-  
+
 end

data/lib/rspec/core/errors.rb

@@ -5,7 +5,7 @@ module RSpec
     superclass = ['Test::Unit::AssertionFailedError', '::StandardError'].map do |c|
       eval(c) rescue nil
     end.compact.first
-    
+
     class PendingExampleFixedError < superclass
     end
   end

data/lib/rspec/core/example.rb

@@ -12,14 +12,11 @@ module RSpec
 
       delegate_to_metadata :description, :full_description, :execution_result, :file_path, :pending
 
-      alias_method :inspect, :full_description
-      alias_method :to_s, :full_description
-
       def initialize(example_group_class, desc, options, example_block=nil)
         @example_group_class, @options, @example_block = example_group_class, options, example_block
         @metadata  = @example_group_class.metadata.for_example(desc, options)
         @exception = nil
-        @in_block  = false
+        @pending_declared_in_example = @in_block = false
       end
 
       def example_group
@@ -35,6 +32,10 @@ module RSpec
         @in_block
       end
 
+      def pending?
+        !!pending
+      end
+
       def run(example_group_instance, reporter)
         @example_group_instance = example_group_instance
         @example_group_instance.example = self
@@ -43,21 +44,20 @@ module RSpec
 
         begin
           unless pending
-            with_around_hooks do
-              begin
-                run_before_each
-                @in_block = true
-                with_pending_capture &@example_block 
-              rescue Exception => e
-                set_exception(e)
-              ensure
-                @in_block = false
-                run_after_each
+            with_pending_capture do
+              with_around_hooks do
+                begin
+                  run_before_each
+                  @in_block = true
+                  @example_group_instance.instance_eval(&@example_block)
+                rescue Exception => e
+                  set_exception(e)
+                ensure
+                  @in_block = false
+                  run_after_each
+                end
               end
-              # FUCKME (DC): I really want to move the call below to the end of
-              # the with_around_hooks method, but it adds 4% to the run time.
-              # Why? (footnote - Dan North made me write this comment)
-            end.call
+            end
           end
         rescue Exception => e
           set_exception(e)
@@ -75,15 +75,15 @@ module RSpec
 
     private
 
-      def with_pending_capture
+      def with_pending_capture(&block)
         @pending_declared_in_example = catch(:pending_declared_in_example) do
-          @example_group_instance.instance_eval(&@example_block)
+          block.call
           throw :pending_declared_in_example, false
         end
       end
 
       def with_around_hooks(&wrapped_example)
-        @example_group_class.eval_around_eachs(@example_group_instance, wrapped_example)
+        @example_group_class.eval_around_eachs(@example_group_instance, wrapped_example).call
       end
 
       def start(reporter)
@@ -117,20 +117,20 @@ module RSpec
       end
 
       def run_before_each
-        @example_group_instance._setup_mocks if @example_group_instance.respond_to?(:_setup_mocks)
+        @example_group_instance.setup_mocks_for_rspec if @example_group_instance.respond_to?(:setup_mocks_for_rspec)
         @example_group_class.eval_before_eachs(@example_group_instance)
       end
 
       def run_after_each
         @example_group_class.eval_after_eachs(@example_group_instance)
-        @example_group_instance._verify_mocks if @example_group_instance.respond_to?(:_verify_mocks)
+        @example_group_instance.verify_mocks_for_rspec if @example_group_instance.respond_to?(:verify_mocks_for_rspec)
       ensure
-        @example_group_instance._teardown_mocks if @example_group_instance.respond_to?(:_teardown_mocks)
+        @example_group_instance.teardown_mocks_for_rspec if @example_group_instance.respond_to?(:teardown_mocks_for_rspec)
       end
 
       def assign_auto_description
         if description.empty?
-          metadata[:description] = RSpec::Matchers.generated_description 
+          metadata[:description] = RSpec::Matchers.generated_description
           RSpec::Matchers.clear_generated_description
         end
       end

data/lib/rspec/core/example_group.rb

@@ -59,16 +59,28 @@ module RSpec
       alias_example_to :focused, :focused => true
       alias_example_to :pending, :pending => true
 
-      def self.it_should_behave_like(*names)
-        names.each do |name|
-          begin
-            module_eval &RSpec.world.shared_example_groups[name]
-          rescue ArgumentError
-            raise "Could not find shared example group named #{name.inspect}"
+      def self.define_shared_group_method(new_name, report_label=nil)
+        report_label = "it should behave like" unless report_label
+        module_eval(<<-END_RUBY, __FILE__, __LINE__)
+          def self.#{new_name}(name, &customization_block)
+            shared_block = world.shared_example_groups[name]
+            raise "Could not find shared example group named \#{name.inspect}" unless shared_block
+
+            shared_group = describe("#{report_label} \#{name}", &shared_block)
+            shared_group.class_eval(&customization_block) if customization_block
+            shared_group
           end
-        end
+        END_RUBY
       end
 
+      define_shared_group_method :it_should_behave_like
+
+      class << self
+        alias_method :alias_it_should_behave_like_to, :define_shared_group_method
+      end
+
+      alias_it_should_behave_like_to :it_behaves_like, "behaves like"
+
       def self.examples
         @examples ||= []
       end
@@ -82,7 +94,7 @@ module RSpec
       end
 
       def self.metadata
-        @metadata 
+        @metadata if defined?(@metadata)
       end
 
       def self.superclass_metadata
@@ -111,7 +123,7 @@ module RSpec
 
       def self.subclass(parent, args, &example_group_block)
         subclass = Class.new(parent)
-        subclass.set_it_up(*args) 
+        subclass.set_it_up(*args)
         subclass.module_eval(&example_group_block) if example_group_block
         subclass
       end
@@ -128,6 +140,10 @@ module RSpec
         @_ancestors ||= super().select {|a| a < RSpec::Core::ExampleGroup}
       end
 
+      def self.top_level?
+        ancestors.size == 1
+      end
+
       def self.set_it_up(*args)
         @metadata = RSpec::Core::Metadata.new(superclass_metadata).process(*args)
 
@@ -143,7 +159,7 @@ module RSpec
       def self.eval_before_alls(example)
         return if descendant_filtered_examples.empty?
         superclass.before_all_ivars.each { |ivar, val| example.instance_variable_set(ivar, val) }
-        world.run_hook_filtered(:before, :all, self, example)
+        world.run_hook_filtered(:before, :all, self, example) if top_level?
 
         run_hook!(:before, :all, example)
         example.instance_variables.each { |ivar| before_all_ivars[ivar] = example.instance_variable_get(ivar) }
@@ -173,13 +189,14 @@ module RSpec
       def self.eval_after_alls(example)
         return if descendant_filtered_examples.empty?
         before_all_ivars.each { |ivar, val| example.instance_variable_set(ivar, val) }
-        ancestors.each {|ancestor| ancestor.run_hook!(:after, :all, example) }
-        world.run_hook_filtered(:after, :all, self, example)
+        run_hook!(:after, :all, example)
+        world.run_hook_filtered(:after, :all, self, example) if top_level?
       end
 
       def self.run(reporter)
+        @reporter = reporter
         example_group_instance = new
-        reporter.add_example_group(self)
+        reporter.example_group_started(self)
         begin
           eval_before_alls(example_group_instance)
           result_for_this_group = run_examples(example_group_instance, reporter)
@@ -248,7 +265,6 @@ module RSpec
           :extend => extended_modules
         }
       end
-
     end
   end
 end

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

@@ -35,9 +35,12 @@ module RSpec
             start(count)
             begin
               yield self
-            ensure
               stop
-              dump(@duration)
+              start_dump
+              dump_summary(duration, example_count, failure_count, pending_count)
+              dump_pending
+              dump_failures
+            ensure
               close
             end
           end
@@ -47,15 +50,25 @@ module RSpec
         # they have all been collected. This can be useful for special
         # formatters that need to provide progress on feedback (graphical ones)
         #
-        # This method will only be invoked once, and the next one to be invoked
-        # is #add_example_group
+        # This will only be invoked once, and the next one to be invoked
+        # is #example_group_started
         def start(example_count)
-          @start = Time.now
           @example_count = example_count
+          @start = Time.now
         end
 
-        def stop
-          @duration = Time.now - @start
+        # This method is invoked at the beginning of the execution of each example group.
+        # +example_group+ is the example_group.
+        #
+        # The next method to be invoked after this is +example_passed+,
+        # +example_pending+, or +example_finished+
+        def example_group_started(example_group)
+          @example_group = example_group
+        end
+
+        def add_example_group(example_group)
+          RSpec.deprecate("add_example_group", "example_group_started")
+          example_group_started(example_group)
         end
 
         def example_started(example)
@@ -74,26 +87,13 @@ module RSpec
         def message(message)
         end
 
-        # This method is invoked at the beginning of the execution of each example group.
-        # +example_group+ is the example_group.
-        #
-        # The next method to be invoked after this is +example_passed+,
-        # +example_pending+, or +example_finished+
-        def add_example_group(example_group)
-          @example_group = example_group
-        end
-
-        def dump(duration)
-          start_dump(duration)
-          dump_failures
-          dump_summary
-          dump_pending
+        def stop
+          @duration = Time.now - @start
         end
 
         # This method is invoked after all of the examples have executed. The next method
         # to be invoked after this one is #dump_failure (once for each failed example),
-        def start_dump(duration)
-          @duration = duration
+        def start_dump
         end
 
         # Dumps detailed information about each example failure.
@@ -101,7 +101,7 @@ module RSpec
         end
 
         # This method is invoked after the dumping of examples and failures.
-        def dump_summary
+        def dump_summary(duration, example_count, failure_count, pending_count)
         end
 
         # This gets invoked after the summary if option is set to do so.
@@ -118,7 +118,7 @@ module RSpec
 
           cleansed = backtrace.select { |line| backtrace_line(line) }
           # Kick the describe stack info off the list, just keep the line the problem happened on from that file
-          # cleansed = [cleansed.detect { |line| line.split(':').first == example.metadata[:caller].split(':').first }] if cleansed.size > 1 
+          # cleansed = [cleansed.detect { |line| line.split(':').first == example.metadata[:caller].split(':').first }] if cleansed.size > 1
           cleansed.empty? ? backtrace : cleansed
         end
 

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

@@ -14,10 +14,10 @@ module RSpec
             exception = failed_example.execution_result[:exception_encountered]
             padding = '    '
             if exception.is_a?(RSpec::Core::PendingExampleFixedError)
-              output.puts "#{index.next}) #{failed_example} FIXED"
+              output.puts "#{index.next}) #{failed_example.full_description} FIXED"
               output.puts "#{padding}Expected pending '#{failed_example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised."
             else
-              output.puts "#{index.next}) #{failed_example}"
+              output.puts "#{index.next}) #{failed_example.full_description}"
               output.puts "#{padding}Failure/Error: #{read_failed_line(exception, failed_example).strip}"
               exception.message.split("\n").each do |line|
                 output.puts "#{padding}#{red(line)}"
@@ -28,7 +28,7 @@ module RSpec
               output.puts grey("#{padding}# #{backtrace_info}")
             end
 
-            output.puts 
+            output.puts
           end
         end
 
@@ -43,8 +43,8 @@ module RSpec
             red(summary)
           end
         end
-        
-        def dump_summary
+
+        def dump_summary(duration, example_count, failure_count, pending_count)
           output.puts "\nFinished in #{format_seconds(duration)} seconds\n"
 
           output.puts colorise_summary(summary_line(example_count, failure_count, pending_count))
@@ -52,7 +52,7 @@ module RSpec
           # Don't print out profiled info if there are failures, it just clutters the output
           if profile_examples? && failure_count == 0
             sorted_examples = examples.sort_by { |example| example.execution_result[:run_time] }.reverse.first(10)
-            output.puts "\nTop #{sorted_examples.size} slowest examples:\n"        
+            output.puts "\nTop #{sorted_examples.size} slowest examples:\n"
             sorted_examples.each do |example|
               output.puts "  (#{format_seconds(example.execution_result[:run_time])} seconds) #{example}"
               output.puts grey("   # #{format_caller(example.metadata[:location])}")
@@ -63,7 +63,7 @@ module RSpec
         def summary_line(example_count, failure_count, pending_count)
           summary = pluralize(example_count, "example")
           summary << ", " << pluralize(failure_count, "failure")
-          summary << ", #{pending_count} pending" if pending_count > 0  
+          summary << ", #{pending_count} pending" if pending_count > 0
           summary
         end
 
@@ -72,8 +72,9 @@ module RSpec
             output.puts
             output.puts "Pending:"
             pending_examples.each do |pending_example|
-              output.puts "  #{pending_example} (#{pending_example.metadata[:execution_result][:pending_message]})"
-              output.puts grey("   # #{format_caller(pending_example.metadata[:location])}")
+              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])}")
             end
           end
         end
@@ -127,7 +128,7 @@ module RSpec
         end
 
         def format_caller(caller_info)
-          caller_info.to_s.split(':in `block').first
+          backtrace_line(caller_info.to_s.split(':in `block').first)
         end
 
       end

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

@@ -9,7 +9,7 @@ module RSpec
           @previous_nested_example_groups = []
         end
 
-        def add_example_group(example_group)
+        def example_group_started(example_group)
           super
 
           example_group_chain.each_with_index do |nested_example_group, i|
@@ -21,7 +21,7 @@ module RSpec
 
           @previous_nested_example_groups = example_group_chain
         end
-        
+
         def example_passed(example)
           super
           output.puts passed_output(example)