rspec 1.2.0 → 1.2.1

data/features/pending/pending_examples.feature

@@ -14,7 +14,7 @@ Feature: pending examples
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures, 1 pending"
     And the stdout should match "Not Yet Implemented"
-    And the stdout should match "current_example.rb:2"
+    And the stdout should match "current_example.rb:3"
     
   Scenario: pending implementation with spec/test/unit
     Given the following spec:
@@ -28,7 +28,7 @@ Feature: pending examples
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures, 1 pending"
     And the stdout should match "Not Yet Implemented"
-    And the stdout should match "current_example.rb:3"
+    And the stdout should match "current_example.rb:4"
 
   Scenario: pending any arbitary reason, with no block
     Given the following spec:
@@ -43,7 +43,7 @@ Feature: pending examples
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures, 1 pending"
     And the stdout should match "(something else getting finished)"
-    And the stdout should match "current_example.rb:3"
+    And the stdout should match "current_example.rb:4"
 
   Scenario: pending any arbitary reason, with a block
     Given the following spec:
@@ -60,7 +60,7 @@ Feature: pending examples
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures, 1 pending"
     And the stdout should match "(something else getting finished)"
-    And the stdout should match "current_example.rb:3"
+    And the stdout should match "current_example.rb:4"
 
   Scenario: pending any arbitary reason, with a block that passes
     Given the following spec:
@@ -78,4 +78,4 @@ Feature: pending examples
     And the stdout should match "1 example, 1 failure"
     And the stdout should match "FIXED"
     And the stdout should match "Expected pending 'something else getting finished' to fail. No Error was raised."
-    And the stdout should match "current_example.rb:3"
+    And the stdout should match "current_example.rb:4"

data/features/step_definitions/running_rspec.rb

@@ -10,10 +10,23 @@ Given /^the following spec:$/ do |spec|
   FileUtils.mkdir(dir) unless test ?d, dir
   @path = "#{dir}/current_example.rb"
   File.open(@path, "w") do |f|
+    f.write %Q[$:.unshift File.join(File.dirname(__FILE__), "/../lib")]
+    f.write "\n"
     f.write spec
   end
 end
 
+Given /^a file named (.*) with:$/ do |filename, code|
+  dir = File.join(File.dirname(__FILE__), "/../../tmp")
+  FileUtils.mkdir(dir) unless test ?d, dir
+  @path = "#{dir}/#{filename}"
+  File.open(@path, "w") do |f|
+    f.write %Q[$:.unshift File.join(File.dirname(__FILE__), "/../lib")]
+    f.write "\n"
+    f.write code
+  end
+end
+
 When /^I run it with the (.*)$/ do |interpreter|
   stderr_file = Tempfile.new('rspec')
   stderr_file.close

data/features/subject/explicit_subject.feature

@@ -0,0 +1,31 @@
+Feature: explicit subject
+
+  You can override the implicit subject using the subject() method.
+  
+  Scenario: subject in top level group
+    Given the following spec:
+      """
+      describe Array, "with some elements" do
+        subject { [1,2,3] }
+        it "should have the prescribed elements" do
+          subject.should == [1,2,3]
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the stdout should match "1 example, 0 failures"
+
+  Scenario: subject in a nested group
+    Given the following spec:
+      """
+      describe Array do
+        subject { [1,2,3] }
+        describe "with some elements" do
+          it "should have the prescribed elements" do
+            subject.should == [1,2,3]
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the stdout should match "1 example, 0 failures"

data/features/subject/implicit_subject.feature

@@ -0,0 +1,31 @@
+Feature: implicit subject
+
+  The first argument to the outermost example group block is
+  made available to each example as an implicit subject of
+  that example.
+  
+  Scenario: subject in top level group
+    Given the following spec:
+      """
+      describe Array, "when first created" do
+        it "should be empty" do
+          subject.should == []
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the stdout should match "1 example, 0 failures"
+
+  Scenario: subject in a nested group
+    Given the following spec:
+      """
+      describe Array do
+        describe "when first created" do
+          it "should be empty" do
+            subject.should == []
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the stdout should match "1 example, 0 failures"

data/lib/spec/adapters/mock_frameworks/flexmock.rb

@@ -3,6 +3,7 @@
 #  Created by Jim Weirich on 2007-04-10.
 #  Copyright (c) 2007. All rights reserved.
 
+require 'rubygems' unless ENV['NO_RUBYGEMS']
 require 'flexmock/rspec'
 
 module Spec

data/lib/spec/adapters/mock_frameworks/mocha.rb

@@ -1,3 +1,4 @@
+require 'rubygems' unless ENV['NO_RUBYGEMS']
 require 'mocha/standalone'
 require 'mocha/object'
 

data/lib/spec/adapters/mock_frameworks/rr.rb

@@ -1,3 +1,4 @@
+require 'rubygems' unless ENV['NO_RUBYGEMS']
 require 'rr'
 
 patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS

data/lib/spec/adapters/mock_frameworks/rspec.rb

@@ -3,16 +3,18 @@ require 'spec/mocks/extensions'
 
 module Spec
   module Adapters
-    module MockFramework
-      include Spec::Mocks::ExampleMethods
-      def setup_mocks_for_rspec
-        $rspec_mocks ||= Spec::Mocks::Space.new
-      end
-      def verify_mocks_for_rspec
-        $rspec_mocks.verify_all
-      end
-      def teardown_mocks_for_rspec
-        $rspec_mocks.reset_all
+    unless defined?(MockFramework)
+      module MockFramework
+        include Spec::Mocks::ExampleMethods
+        def setup_mocks_for_rspec
+          $rspec_mocks ||= Spec::Mocks::Space.new
+        end
+        def verify_mocks_for_rspec
+          $rspec_mocks.verify_all
+        end
+        def teardown_mocks_for_rspec
+          $rspec_mocks.reset_all
+        end
       end
     end
   end

data/lib/spec/dsl.rb

@@ -1,3 +1,2 @@
 require 'spec/dsl/main'
-require 'spec/dsl/matchers'
 

data/lib/spec/dsl/main.rb

@@ -20,7 +20,7 @@ module Spec
       # register special implementations.
       #
       def describe(*args, &block)
-        Spec::Example::add_spec_path_to(args)
+        Spec::Example::set_location(args, caller(0)[1])
         Spec::Example::ExampleGroupFactory.assign_scope(self, args)
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
@@ -42,7 +42,7 @@ module Spec
       #    end
       #  end
       def share_examples_for(*args, &block)
-        Spec::Example::add_spec_path_to(args)
+        Spec::Example::set_location(args, caller(0)[1])
         Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block)
       end
       alias :shared_examples_for :share_examples_for
@@ -74,7 +74,7 @@ module Spec
       def share_as(name, &block)
         begin
           args = [name]
-          Spec::Example::add_spec_path_to(args)
+          Spec::Example::set_location(args, caller(0)[1])
           Object.const_set(name, Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block))
         rescue NameError => e
           raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n")

data/lib/spec/example.rb

@@ -158,9 +158,9 @@ module Spec
         return scope_from(*args), options
       end
 
-      def add_spec_path_to(args) # :nodoc:
+      def set_location(args, location) # :nodoc:
         args << {} unless Hash === args.last
-        args.last[:spec_path] ||= caller(0)[2]
+        args.last[:location] ||= location
       end
 
     private
@@ -174,7 +174,8 @@ end
 
 require 'timeout'
 require 'spec/example/predicate_matchers'
-require 'spec/example/example_description'
+require 'spec/example/example_group_proxy'
+require 'spec/example/example_proxy'
 require 'spec/example/subject'
 require 'spec/example/before_and_after_hooks'
 require 'spec/example/pending'

data/lib/spec/example/example_group_factory.rb

@@ -19,14 +19,12 @@ module Spec
         end
 
         def create_shared_example_group(*args, &example_group_block) # :nodoc:
-          ::Spec::Example::add_spec_path_to(args)
           ::Spec::Example::SharedExampleGroup.register(*args, &example_group_block)
         end
         
         def create_example_group(*args, &block)
           raise ArgumentError if args.empty?
           raise ArgumentError unless block
-          Spec::Example::add_spec_path_to(args)
           superclass = determine_superclass(args.last)
           superclass.describe(*args, &block)
         end
@@ -71,7 +69,7 @@ module Spec
         def determine_superclass(opts)
           if type = opts[:type]
             self[type]
-          elsif opts[:spec_path] =~ /spec(\\|\/)(#{@example_group_types.keys.sort_by{|k| k.to_s.length}.reverse.join('|')})/
+          elsif opts[:location] =~ /spec(\\|\/)(#{@example_group_types.keys.sort_by{|k| k.to_s.length}.reverse.join('|')})/
             self[$2 == '' ? nil : $2.to_sym]
           else
             self[nil]

data/lib/spec/example/example_group_methods.rb

@@ -10,7 +10,7 @@ module Spec
       include Spec::Example::Subject::ExampleGroupMethods
       include Spec::Example::PredicateMatchers
 
-      attr_reader :options, :spec_path
+      attr_reader :options, :location
       
       def inherited(klass) # :nodoc:
         super
@@ -19,7 +19,7 @@ module Spec
       
       # Provides the backtrace up to where this example_group was declared.
       def backtrace
-        @backtrace
+        defined?(@backtrace) ? @backtrace : nil
       end
 
       # Deprecated - use +backtrace()+
@@ -47,7 +47,7 @@ WARNING
       #
       def describe(*args, &example_group_block)
         if example_group_block
-          Spec::Example::add_spec_path_to(args)
+          Spec::Example::set_location(args, caller(0)[1])
           options = args.last
           if options[:shared]
             ExampleGroupFactory.create_shared_example_group(*args, &example_group_block)
@@ -70,10 +70,10 @@ WARNING
       # Creates an instance of the current example group class and adds it to
       # a collection of examples of the current example group.
       def example(description=nil, options={}, backtrace=nil, &implementation)
-        example_description = ExampleDescription.new(description, options, backtrace || caller(0)[1])
-        example_descriptions << example_description
-        example_implementations[example_description] = implementation || pending_implementation
-        example_description
+        example_proxy = ExampleProxy.new(description, options, backtrace || caller(0)[1])
+        example_proxies << example_proxy
+        example_implementations[example_proxy] = implementation || pending_implementation
+        example_proxy
       end
       
       def pending_implementation
@@ -108,12 +108,12 @@ WARNING
       def set_description(*args)
         @description_args, @options = Spec::Example.args_and_options(*args)
         @backtrace = caller(1)
-        @spec_path = File.expand_path(options[:spec_path]) if options[:spec_path]
+        @location = File.expand_path(options[:location]) if options[:location]
         self
       end
       
       def notify(listener) # :nodoc:
-        listener.add_example_group(self)
+        listener.add_example_group(ExampleGroupProxy.new(self))
       end
 
       def description
@@ -138,8 +138,8 @@ WARNING
         end
       end
       
-      def example_descriptions # :nodoc:
-        @example_descriptions ||= []
+      def example_proxies # :nodoc:
+        @example_proxies ||= []
       end
       
       def example_implementations # :nodoc:
@@ -147,25 +147,17 @@ WARNING
       end
             
       def examples(run_options=nil) #:nodoc:
-        (run_options && run_options.reverse) ? example_descriptions.reverse : example_descriptions
+        (run_options && run_options.reverse) ? example_proxies.reverse : example_proxies
       end
 
       def number_of_examples #:nodoc:
-        example_descriptions.length
+        example_proxies.length
       end
 
       def example_group_hierarchy
         @example_group_hierarchy ||= ExampleGroupHierarchy.new(self)
       end
       
-      def filtered_description(filter)
-        build_description_from(
-          *nested_descriptions.collect do |description|
-            description =~ filter ? $1 : description
-          end
-        )
-      end
-      
       def nested_descriptions
         example_group_hierarchy.nested_descriptions
       end
@@ -195,12 +187,13 @@ WARNING
 
       def run_before_all(run_options)
         return [true,{}] if example_group_hierarchy.before_all_parts.empty?
-        before_all = new("before(:all)")
+        example_proxy = ExampleProxy.new("before(:all)")
+        before_all = new(example_proxy)
         begin
           example_group_hierarchy.run_before_all(before_all)
           return [true, before_all.instance_variable_hash]
         rescue Exception => e
-          run_options.reporter.example_failed(ExampleDescription.new("before(:all)"), e)
+          run_options.reporter.example_failed(example_proxy, e)
           return [false, before_all.instance_variable_hash]
         end
       end
@@ -211,7 +204,7 @@ WARNING
         after_all_instance_variables = instance_variables
         
         examples.each do |example|
-          example_group_instance = new(example.description,example.options,&example_implementations[example])
+          example_group_instance = new(example, &example_implementations[example])
           success &= example_group_instance.execute(run_options, instance_variables)
           after_all_instance_variables = example_group_instance.instance_variable_hash
         end
@@ -221,18 +214,19 @@ WARNING
       
       def run_after_all(success, instance_variables, run_options)
         return success if example_group_hierarchy.after_all_parts.empty?
-        after_all = new("after(:all)")
+        example_proxy = ExampleProxy.new("after(:all)")
+        after_all = new(example_proxy)
         after_all.set_instance_variables_from_hash(instance_variables)
         example_group_hierarchy.run_after_all(after_all)
         return success
       rescue Exception => e
-        run_options.reporter.example_failed(ExampleDescription.new("after(:all)"), e)
+        run_options.reporter.example_failed(example_proxy, e)
         return false
       end
       
       def examples_to_run(run_options)
-        return example_descriptions unless specified_examples?(run_options)
-        example_descriptions.reject do |example|
+        return example_proxies unless specified_examples?(run_options)
+        example_proxies.reject do |example|
           matcher = ExampleGroupMethods.matcher_class.
             new(description.to_s, example.description)
           !matcher.matches?(run_options.examples)

data/lib/spec/example/example_group_proxy.rb

@@ -0,0 +1,64 @@
+module Spec
+  module Example
+    # Lightweight representation of an example group. This is the object
+    # that is passed to Spec::Runner::Formatter::BaseFormatter#add_example_group
+    class ExampleGroupProxy
+      
+      def initialize(example_group) # :nodoc:
+        @description         = example_group.description
+        @nested_descriptions = example_group.nested_descriptions
+        @examples            = example_group.example_proxies
+        @location            = example_group.location
+        @backtrace           = example_group.backtrace
+      end
+      
+      # This is the docstring passed to the <tt>describe()</tt> method or any
+      # of its aliases
+      attr_reader :description
+      
+      # Used by Spec::Runner::Formatter::NestedTextFormatter to access the
+      # docstrings for each example group in a nested group.
+      attr_reader :nested_descriptions
+      
+      # A collection of ExampleGroupProxy instances, one for each example
+      # declared in this group.
+      attr_reader :examples
+      
+      # The file and line number at which the represented example group
+      # was declared. This is extracted from <tt>caller</tt>, and is therefore
+      # formatted as an individual line in a backtrace.
+      attr_reader :location
+      
+      # Deprecated - use location() instead
+      def backtrace
+        @backtrace
+      end
+  
+      # Returns the nested_descriptions collection with any descriptions
+      # matching the submitted regexp removed.
+      def filtered_description(regexp)
+        build_description_from(
+          *nested_descriptions.collect do |description|
+            description =~ regexp ? $1 : description
+          end
+        )
+      end
+      
+      def ==(other) # :nodoc:
+        other.description == description
+      end
+      
+    private
+    
+      # FIXME - this is duplicated from ExampleGroupMethods
+      def build_description_from(*args)
+        text = args.inject("") do |description, arg|
+          description << " " unless (description == "" || arg.to_s =~ /^(\s|\.|#)/)
+          description << arg.to_s
+        end
+        text == "" ? nil : text
+      end
+    end
+  end
+end
+