rspec 1.1.0 → 1.1.1

data/CHANGES

@@ -1,3 +1,10 @@
+== Version 1.1.1
+
+Bug fix release.
+
+* Fix regression in 1.1.0 that caused transactions to not get rolled back between examples.
+* Applied patch from Bob Cotton to reintroduce ExampleGroup.description_options. Closes LH[#186]
+
 == Version 1.1.0
 
 The "tell me a story and go nest yourself" release.
@@ -39,6 +46,7 @@ rspec_on_rails users - don't forget to run script/generate rspec
 * Applied LH[#134] Only load spec inside spec_helper.rb (Patch from Mark Van Holstyn)
 * RSpec now bails immediately if there are examples with identical names.
 * Applied LH[#132]  Plain Text stories should support Given and Given: (Patch from Jarkko Laine)
+* Applied patch from Pat Maddox: Story Mediator - the glue that binds the plain text story parser with the rest of the system
 * Applied LH[#16] Have SimpleMatchers expose their description for specdocs (Patch from Bryan Helmkamp)
 * Stories now support --colour
 * Changed the DSL modules to Example (i.e. Spec::Example instead of Spec::DSL)

data/Rakefile

@@ -126,7 +126,7 @@ task :clobber do
   core.clobber
 end
 
-task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
+task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news]
 
 desc "Verifies that there is no uncommitted code"
 task :verify_committed do

data/examples/pure/shared_example_group_example.rb

@@ -19,9 +19,9 @@ module SharedExampleGroupExample
     end
   end
   
-  # A SharedExampleGroup is a module, so you can assign
-  # it to a constant if you want ....
-  AllThings = shared_examples_for "All Things" do
+  # A SharedExampleGroup is an example group that doesn't get run.
+  # You can create one like this:
+  share_examples_for "most things" do
     def helper_method
       "helper method"
     end
@@ -30,17 +30,24 @@ module SharedExampleGroupExample
       @thing.what_things_do.should == "stuff"
     end
   end
-  
-  # TODO - it would be nice to be able to say this instead of the above:
-  
-  # class AllThings < Spec::SharedExampleGroup
-  #   ...
-  # end
 
+  # A SharedExampleGroup is also module. If you create one like this
+  # it gets assigned to the constant AllThings
+  share_as :MostThings do
+    def helper_method
+      "helper method"
+    end
+    
+    it "should do what things do" do
+      @thing.what_things_do.should == "stuff"
+    end
+  end
+  
   describe OneThing do
-    # ... then you can include the example group like this, which 
+    # Now you can include the shared example group like this, which 
     # feels more like what you might say ...
-    it_should_behave_like "All Things"
+    it_should_behave_like "most things"
+    
     before(:each) { @thing = OneThing.new }
     
     it "should have access to helper methods defined in the shared example group" do
@@ -51,16 +58,24 @@ module SharedExampleGroupExample
   describe AnotherThing do
     # ... or you can include the example group like this, which
     # feels more like the programming language we love.
-    it_should_behave_like AllThings
+    it_should_behave_like MostThings
     
     before(:each) { @thing = AnotherThing.new }
+
+    it "should have access to helper methods defined in the shared example group" do
+      helper_method.should == "helper method"
+    end
   end
 
   describe YetAnotherThing do
     # ... or you can include the example group like this, which
     # feels more like the programming language we love.
-    include AllThings
+    include MostThings
     
     before(:each) { @thing = AnotherThing.new }
+
+    it "should have access to helper methods defined in the shared example group" do
+      helper_method.should == "helper method"
+    end
   end
 end

data/lib/spec/example/example_group_methods.rb

@@ -11,7 +11,7 @@ module Spec
         end
       end
 
-      attr_reader :description_text, :description_args, :spec_path
+      attr_reader :description_text, :description_args, :description_options, :spec_path
 
       def inherited(klass)
         super
@@ -122,7 +122,12 @@ module Spec
       end
 
       def description
-        ExampleGroupMethods.description_text(*description_parts)
+        result = ExampleGroupMethods.description_text(*description_parts)
+        if result.nil? || result == ""
+          return to_s
+        else
+          result
+        end
       end
 
       def described_type
@@ -140,6 +145,7 @@ module Spec
       def set_description(*args)
         args, options = args_and_options(*args)
         @description_args = args
+        @description_options = options
         @description_text = ExampleGroupMethods.description_text(*args)
         @spec_path = File.expand_path(options[:spec_path]) if options[:spec_path]
         if described_type.class == Module
@@ -409,4 +415,4 @@ module Spec
     end
 
   end
-end
+end

data/lib/spec/extensions/main.rb

@@ -2,7 +2,7 @@ module Spec
   module Extensions
     module Main
       # Creates and returns a class that includes the ExampleGroupMethods
-      # module. The ExampleGroup sub-class depends on the directory of the file
+      # module. Which ExampleGroup type is created depends on the directory of the file
       # calling this method. For example, Spec::Rails will use different
       # classes for specs living in <tt>spec/models</tt>,
       # <tt>spec/helpers</tt>, <tt>spec/views</tt> and
@@ -28,10 +28,58 @@ module Spec
       end
       alias :context :describe
       
-      # Shortcut for creating a shared example group
-      def shared_examples_for(name, &block)
+      # Creates an example group that can be shared by other example groups
+      #
+      # == Examples
+      #
+      #  share_examples_for "All Editions" do
+      #    it "all editions behaviour" ...
+      #  end
+      #
+      #  describe SmallEdition do
+      #    it_should_behave_like "All Editions"
+      #  
+      #    it "should do small edition stuff" do
+      #      ...
+      #    end
+      #  end
+      def share_examples_for(name, &block)
         describe(name, :shared => true, &block)
       end
+      
+      alias :shared_examples_for :share_examples_for
+      
+      # Creates a Shared Example Group and assigns it to a constant
+      #
+      #  share_as :AllEditions do
+      #    it "should do all editions stuff" ...
+      #  end
+      #
+      #  describe SmallEdition do
+      #    it_should_behave_like AllEditions
+      #  
+      #    it "should do small edition stuff" do
+      #      ...
+      #    end
+      #  end
+      #
+      # And, for those of you who prefer to use something more like Ruby, you
+      # can just include the module directly
+      #
+      #  describe SmallEdition do
+      #    include AllEditions
+      #  
+      #    it "should do small edition stuff" do
+      #      ...
+      #    end
+      #  end
+      def share_as(name, &block)
+        begin
+          Object.const_set(name, share_examples_for(name, &block))
+        rescue NameError => e
+          raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n")
+        end
+      end
 
     private
     

data/lib/spec/runner.rb

@@ -9,12 +9,12 @@ require 'spec/runner/spec_parser'
 require 'spec/runner/class_and_arguments_parser'
 
 module Spec
-  # == Behaviours and Examples
+  # == ExampleGroups and Examples
   # 
-  # Rather than expressing examples in classes, RSpec uses a custom domain specific language to 
-  # describe Behaviours and Examples of those behaviours.
+  # Rather than expressing examples in classes, RSpec uses a custom DSLL (DSL light) to 
+  # describe groups of examples.
   # 
-  # A Example is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context
+  # A ExampleGroup is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context
   # in which you will run your executable example - a set of known objects in a known starting state.
   # We begin be describing
   # 
@@ -123,11 +123,11 @@ module Spec
   #     end
   #   end
   # 
-  # == Shared behaviour
+  # == Shared Example Groups
   # 
-  # You can define a shared behaviour, that may be used on other behaviours
+  # You can define a shared Example Group, that may be used on other groups
   #
-  #  describe "All Editions", :shared => true do
+  #  share_examples_for "All Editions" do
   #    it "all editions behaviour" ...
   #  end
   #
@@ -139,9 +139,9 @@ module Spec
   #    end
   #  end
   #
-  # You can also assign the shared behaviour to a module and include that
+  # You can also assign the shared group to a module and include that
   #
-  #  AllEditions = describe "All Editions", :shared => true do
+  #  share_as :AllEditions do
   #    it "should do all editions stuff" ...
   #  end
   #

data/lib/spec/runner/formatter/specdoc_formatter.rb

@@ -7,11 +7,7 @@ module Spec
         def add_example_group(example_group)
           super
           output.puts
-          if example_group.description.nil? || example_group.description == ""
-            output.puts example_group.to_s
-          else
-            output.puts example_group.description
-          end
+          output.puts example_group.description
           output.flush
         end
       

data/lib/spec/version.rb

@@ -3,10 +3,10 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 0
+      TINY   = 1
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20071214045307
+      BUILD_TIME_UTC = 20071217181808
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/example/configuration_spec.rb

@@ -2,288 +2,280 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Example
-    ConfigurationSpec =
-      describe Configuration, :shared => true do
-        before(:each) do
-          @config = Configuration.new
-          @example_group = mock("example_group")
-        end
-      end
     
-    describe Configuration, "#mock_with" do
-      include ConfigurationSpec
-      it "should default mock framework to rspec" do
-        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+    describe Configuration do
+      before(:each) do
+        @config = Configuration.new
+        @example_group = mock("example_group")
       end
+      
+      describe "#mock_with" do
 
-      it "should let you set rspec mocking explicitly" do
-        @config.mock_with(:rspec)
-        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
-      end
+        it "should default mock framework to rspec" do
+          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+        end
 
-      it "should let you set mocha" do
-        @config.mock_with(:mocha)
-        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/mocha$/
-      end
+        it "should let you set rspec mocking explicitly" do
+          @config.mock_with(:rspec)
+          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+        end
 
-      it "should let you set flexmock" do
-        @config.mock_with(:flexmock)
-        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/flexmock$/
-      end
+        it "should let you set mocha" do
+          @config.mock_with(:mocha)
+          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/mocha$/
+        end
 
-      it "should let you set rr" do
-        @config.mock_with(:rr)
-        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rr$/
-      end
+        it "should let you set flexmock" do
+          @config.mock_with(:flexmock)
+          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/flexmock$/
+        end
 
-      it "should let you set an arbitrary adapter module" do
-        adapter = Module.new
-        @config.mock_with(adapter)
-        @config.mock_framework.should == adapter
+        it "should let you set rr" do
+          @config.mock_with(:rr)
+          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rr$/
+        end
+
+        it "should let you set an arbitrary adapter module" do
+          adapter = Module.new
+          @config.mock_with(adapter)
+          @config.mock_framework.should == adapter
+        end
       end
-    end
 
-    describe Configuration, "#include" do
-      include ConfigurationSpec
+      describe "#include" do
 
-      before do
-        @original_configuration = Spec::Runner.configuration
-        spec_configuration = @config
-        Spec::Runner.instance_eval {@configuration = spec_configuration}
-        @example_group_class = Class.new(ExampleGroup) do
-          class << self
-            def this_class_has_special_methods
+        before do
+          @original_configuration = Spec::Runner.configuration
+          spec_configuration = @config
+          Spec::Runner.instance_eval {@configuration = spec_configuration}
+          @example_group_class = Class.new(ExampleGroup) do
+            class << self
+              def this_class_has_special_methods
+              end
             end
           end
+          ExampleGroupFactory.register(:foobar, @example_group_class)
         end
-        ExampleGroupFactory.register(:foobar, @example_group_class)
-      end
 
-      after do
-        original_configuration = @original_configuration
-        Spec::Runner.instance_eval {@configuration = original_configuration}
-        ExampleGroupFactory.reset
-      end
+        after do
+          original_configuration = @original_configuration
+          Spec::Runner.instance_eval {@configuration = original_configuration}
+          ExampleGroupFactory.reset
+        end
 
-      it "should include the submitted module in ExampleGroup subclasses" do
-        mod = Module.new
-        @config.include mod
-        Class.new(@example_group_class).included_modules.should include(mod)
-      end
+        it "should include the submitted module in ExampleGroup subclasses" do
+          mod = Module.new
+          @config.include mod
+          Class.new(@example_group_class).included_modules.should include(mod)
+        end
 
-      it "should let you define modules to be included for a specific type" do
-        mod = Module.new
-        @config.include mod, :type => :foobar
-        Class.new(@example_group_class).included_modules.should include(mod)
-      end
+        it "should let you define modules to be included for a specific type" do
+          mod = Module.new
+          @config.include mod, :type => :foobar
+          Class.new(@example_group_class).included_modules.should include(mod)
+        end
 
-      it "should not include modules in a type they are not intended for" do
-        mod = Module.new
-        @other_example_group_class = Class.new(ExampleGroup)
-        ExampleGroupFactory.register(:baz, @other_example_group_class)
+        it "should not include modules in a type they are not intended for" do
+          mod = Module.new
+          @other_example_group_class = Class.new(ExampleGroup)
+          ExampleGroupFactory.register(:baz, @other_example_group_class)
 
-        @config.include mod, :type => :foobar
+          @config.include mod, :type => :foobar
+
+          Class.new(@other_example_group_class).included_modules.should_not include(mod)
+        end
 
-        Class.new(@other_example_group_class).included_modules.should_not include(mod)
-      end
-      
-      it "should not extend the ExampleGroup baseclass (to enable the included hook to work properly)" do
-        pending("need to figure out how to best express this one")
       end
+    
     end
 
-    ConfigurationCallbacksSpec =
-      describe Configuration, "callbacks", :shared => true do
-        before do
-          @config = Configuration.new
-          @special_example_group = Class.new(ExampleGroup)
-          @special_child_example_group = Class.new(@special_example_group)
-          @nonspecial_example_group = Class.new(ExampleGroup)
-          ExampleGroupFactory.register(:special, @special_example_group)
-          ExampleGroupFactory.register(:special_child, @special_child_example_group)
-          ExampleGroupFactory.register(:non_special, @nonspecial_example_group)
-          @example_group = @special_child_example_group.describe "Special Example Group"
-          @unselected_example_group = Class.new(@nonspecial_example_group).describe "Non Special Example Group"
-        end
-
-        after do
-          ExampleGroupFactory.reset
-        end
+    describe Configuration do
+      
+      before(:each) do
+        @config = Configuration.new
+        @special_example_group = Class.new(ExampleGroup)
+        @special_child_example_group = Class.new(@special_example_group)
+        @nonspecial_example_group = Class.new(ExampleGroup)
+        ExampleGroupFactory.register(:special, @special_example_group)
+        ExampleGroupFactory.register(:special_child, @special_child_example_group)
+        ExampleGroupFactory.register(:non_special, @nonspecial_example_group)
+        @example_group = @special_child_example_group.describe "Special Example Group"
+        @unselected_example_group = Class.new(@nonspecial_example_group).describe "Non Special Example Group"
       end
 
-    describe Configuration, "#prepend_before" do
-      include ConfigurationCallbacksSpec
+      after(:each) do
+        ExampleGroupFactory.reset
+      end
 
-      it "prepends the before block on all instances of the passed in type" do
-        order = []
-        @config.prepend_before(:all) do
-          order << :prepend__before_all
-        end
-        @config.prepend_before(:all, :type => :special) do
-          order << :special_prepend__before_all
-        end
-        @config.prepend_before(:all, :type => :special_child) do
-          order << :special_child_prepend__before_all
-        end
-        @config.prepend_before(:each) do
-          order << :prepend__before_each
-        end
-        @config.prepend_before(:each, :type => :special) do
-          order << :special_prepend__before_each
-        end
-        @config.prepend_before(:each, :type => :special_child) do
-          order << :special_child_prepend__before_each
-        end
-        @config.prepend_before(:all, :type => :non_special) do
-          order << :special_prepend__before_all
-        end
-        @config.prepend_before(:each, :type => :non_special) do
-          order << :special_prepend__before_each
-        end
-        @example_group.it "calls prepend_before" do
-        end
+      describe "#prepend_before" do
+        it "prepends the before block on all instances of the passed in type" do
+          order = []
+          @config.prepend_before(:all) do
+            order << :prepend__before_all
+          end
+          @config.prepend_before(:all, :type => :special) do
+            order << :special_prepend__before_all
+          end
+          @config.prepend_before(:all, :type => :special_child) do
+            order << :special_child_prepend__before_all
+          end
+          @config.prepend_before(:each) do
+            order << :prepend__before_each
+          end
+          @config.prepend_before(:each, :type => :special) do
+            order << :special_prepend__before_each
+          end
+          @config.prepend_before(:each, :type => :special_child) do
+            order << :special_child_prepend__before_each
+          end
+          @config.prepend_before(:all, :type => :non_special) do
+            order << :special_prepend__before_all
+          end
+          @config.prepend_before(:each, :type => :non_special) do
+            order << :special_prepend__before_each
+          end
+          @example_group.it "calls prepend_before" do
+          end
         
-        @example_group.run
-        order.should == [
-          :prepend__before_all,
-          :special_prepend__before_all,
-          :special_child_prepend__before_all,
-          :prepend__before_each,
-          :special_prepend__before_each,
-          :special_child_prepend__before_each
-        ]
+          @example_group.run
+          order.should == [
+            :prepend__before_all,
+            :special_prepend__before_all,
+            :special_child_prepend__before_all,
+            :prepend__before_each,
+            :special_prepend__before_each,
+            :special_child_prepend__before_each
+          ]
+        end
       end
-    end
 
-    describe Configuration, "#append_before" do
-      include ConfigurationCallbacksSpec
+      describe "#append_before" do
 
-      it "calls append_before on the type" do
-        order = []
-        @config.append_before(:all) do
-          order << :append_before_all
-        end
-        @config.append_before(:all, :type => :special) do
-          order << :special_append_before_all
-        end
-        @config.append_before(:all, :type => :special_child) do
-          order << :special_child_append_before_all
-        end
-        @config.append_before(:each) do
-          order << :append_before_each
-        end
-        @config.append_before(:each, :type => :special) do
-          order << :special_append_before_each
-        end
-        @config.append_before(:each, :type => :special_child) do
-          order << :special_child_append_before_each
-        end
-        @config.append_before(:all, :type => :non_special) do
-          order << :special_append_before_all
-        end
-        @config.append_before(:each, :type => :non_special) do
-          order << :special_append_before_each
-        end
-        @example_group.it "calls append_before" do
-        end
+        it "calls append_before on the type" do
+          order = []
+          @config.append_before(:all) do
+            order << :append_before_all
+          end
+          @config.append_before(:all, :type => :special) do
+            order << :special_append_before_all
+          end
+          @config.append_before(:all, :type => :special_child) do
+            order << :special_child_append_before_all
+          end
+          @config.append_before(:each) do
+            order << :append_before_each
+          end
+          @config.append_before(:each, :type => :special) do
+            order << :special_append_before_each
+          end
+          @config.append_before(:each, :type => :special_child) do
+            order << :special_child_append_before_each
+          end
+          @config.append_before(:all, :type => :non_special) do
+            order << :special_append_before_all
+          end
+          @config.append_before(:each, :type => :non_special) do
+            order << :special_append_before_each
+          end
+          @example_group.it "calls append_before" do
+          end
 
-        @example_group.run
-        order.should == [
-          :append_before_all,
-          :special_append_before_all,
-          :special_child_append_before_all,
-          :append_before_each,
-          :special_append_before_each,
-          :special_child_append_before_each
-        ]
+          @example_group.run
+          order.should == [
+            :append_before_all,
+            :special_append_before_all,
+            :special_child_append_before_all,
+            :append_before_each,
+            :special_append_before_each,
+            :special_child_append_before_each
+          ]
+        end
       end
-    end
 
-    describe Configuration, "#prepend_after" do
-      include ConfigurationCallbacksSpec
+      describe "#prepend_after" do
 
-      it "prepends the after block on all instances of the passed in type" do
-        order = []
-        @config.prepend_after(:all) do
-          order << :prepend__after_all
-        end
-        @config.prepend_after(:all, :type => :special) do
-          order << :special_prepend__after_all
-        end
-        @config.prepend_after(:all, :type => :special) do
-          order << :special_child_prepend__after_all
-        end
-        @config.prepend_after(:each) do
-          order << :prepend__after_each
-        end
-        @config.prepend_after(:each, :type => :special) do
-          order << :special_prepend__after_each
-        end
-        @config.prepend_after(:each, :type => :special) do
-          order << :special_child_prepend__after_each
-        end
-        @config.prepend_after(:all, :type => :non_special) do
-          order << :special_prepend__after_all
-        end
-        @config.prepend_after(:each, :type => :non_special) do
-          order << :special_prepend__after_each
-        end
-        @example_group.it "calls prepend_after" do
-        end
+        it "prepends the after block on all instances of the passed in type" do
+          order = []
+          @config.prepend_after(:all) do
+            order << :prepend__after_all
+          end
+          @config.prepend_after(:all, :type => :special) do
+            order << :special_prepend__after_all
+          end
+          @config.prepend_after(:all, :type => :special) do
+            order << :special_child_prepend__after_all
+          end
+          @config.prepend_after(:each) do
+            order << :prepend__after_each
+          end
+          @config.prepend_after(:each, :type => :special) do
+            order << :special_prepend__after_each
+          end
+          @config.prepend_after(:each, :type => :special) do
+            order << :special_child_prepend__after_each
+          end
+          @config.prepend_after(:all, :type => :non_special) do
+            order << :special_prepend__after_all
+          end
+          @config.prepend_after(:each, :type => :non_special) do
+            order << :special_prepend__after_each
+          end
+          @example_group.it "calls prepend_after" do
+          end
 
-        @example_group.run
-        order.should == [
-          :special_child_prepend__after_each,
-          :special_prepend__after_each,
-          :prepend__after_each,
-          :special_child_prepend__after_all,
-          :special_prepend__after_all,
-          :prepend__after_all
-        ]
+          @example_group.run
+          order.should == [
+            :special_child_prepend__after_each,
+            :special_prepend__after_each,
+            :prepend__after_each,
+            :special_child_prepend__after_all,
+            :special_prepend__after_all,
+            :prepend__after_all
+          ]
+        end
       end
-    end
 
-    describe Configuration, "#append_after" do
-      include ConfigurationCallbacksSpec
+      describe "#append_after" do
 
-      it "calls append_after on the type" do
-        order = []
-        @config.append_after(:all) do
-          order << :append__after_all
-        end
-        @config.append_after(:all, :type => :special) do
-          order << :special_append__after_all
-        end
-        @config.append_after(:all, :type => :special_child) do
-          order << :special_child_append__after_all
-        end
-        @config.append_after(:each) do
-          order << :append__after_each
-        end
-        @config.append_after(:each, :type => :special) do
-          order << :special_append__after_each
-        end
-        @config.append_after(:each, :type => :special_child) do
-          order << :special_child_append__after_each
-        end
-        @config.append_after(:all, :type => :non_special) do
-          order << :non_special_append_after_all
-        end
-        @config.append_after(:each, :type => :non_special) do
-          order << :non_special_append_after_each
-        end
-        @example_group.it "calls append_after" do
-        end
+        it "calls append_after on the type" do
+          order = []
+          @config.append_after(:all) do
+            order << :append__after_all
+          end
+          @config.append_after(:all, :type => :special) do
+            order << :special_append__after_all
+          end
+          @config.append_after(:all, :type => :special_child) do
+            order << :special_child_append__after_all
+          end
+          @config.append_after(:each) do
+            order << :append__after_each
+          end
+          @config.append_after(:each, :type => :special) do
+            order << :special_append__after_each
+          end
+          @config.append_after(:each, :type => :special_child) do
+            order << :special_child_append__after_each
+          end
+          @config.append_after(:all, :type => :non_special) do
+            order << :non_special_append_after_all
+          end
+          @config.append_after(:each, :type => :non_special) do
+            order << :non_special_append_after_each
+          end
+          @example_group.it "calls append_after" do
+          end
 
-        @example_group.run
-        order.should == [
-          :special_child_append__after_each,
-          :special_append__after_each,
-          :append__after_each,
-          :special_child_append__after_all,
-          :special_append__after_all,
-          :append__after_all
-        ]
+          @example_group.run
+          order.should == [
+            :special_child_append__after_each,
+            :special_append__after_each,
+            :append__after_each,
+            :special_child_append__after_all,
+            :special_append__after_all,
+            :append__after_all
+          ]
+        end
       end
     end
   end

data/spec/spec/example/example_group_methods_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 module Spec
   module Example
-    describe ExampleGroupMethods do
+    describe 'ExampleGroupMethods' do
       it_should_behave_like "sandboxed rspec_options"
       attr_reader :example_group, :result, :reporter
       before(:each) do
@@ -294,6 +294,11 @@ module Spec
           it ".spec_path should expand the passed in :spec_path option passed into the constructor" do
             example_group.spec_path.should == File.expand_path("blah")
           end
+
+          it ".description_options should return all the options passed in" do
+            example_group.description_options.should == {:a => "b", :spec_path => "blah"}
+          end
+
         end
       end
 
@@ -315,6 +320,16 @@ module Spec
           end
           child_example_group.description.should == "ExampleGroup.foobar Does something"
         end
+        
+        it "should return the class name if nil" do
+          example_group.set_description(nil)
+          example_group.description.should =~ /Class:/
+        end
+        
+        it "should return the class name if nil" do
+          example_group.set_description("")
+          example_group.description.should =~ /Class:/
+        end
       end
 
       describe "#description_parts" do
@@ -340,7 +355,7 @@ module Spec
           ]
         end
       end
-      
+
       describe "#described_type" do
         it "should return passed in type" do
           child_example_group = Class.new(example_group) do

data/spec/spec/extensions/main_spec.rb

@@ -41,10 +41,36 @@ module Spec
         rspec_options.example_groups.should_not include(example_group)
       end
       
-      it "should create a shared ExampleGroup with shared_examples_for" do
-        group = @main.shared_examples_for "all things" do end
+      it "should create a shared ExampleGroup with share_examples_for" do
+        group = @main.share_examples_for "all things" do end
         group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
       end
+      
+      describe "#share_as" do
+        before(:each) do
+          $share_as_examples_example_module_number ||= 1
+          $share_as_examples_example_module_number += 1
+          t = Time.new.to_i
+          @group_name = "Group#{$share_as_examples_example_module_number}"
+        end
+
+        it "should create a shared ExampleGroup" do
+          group = @main.share_as @group_name do end
+          group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
+        end
+        
+        it "should create a constant that points to a Module" do
+          group = @main.share_as @group_name do end
+          Object.const_get(@group_name).should equal(group)
+        end
+        
+        it "should bark if you pass it something not-constantizable" do
+          lambda do
+            @group = @main.share_as "Non Constant" do end
+          end.should raise_error(NameError, /The first argument to share_as must be a legal name for a constant/)
+        end
+        
+      end
     end
   end
 end

data/spec/spec/runner/drb_command_line_spec.rb

@@ -43,17 +43,17 @@ module Spec
           DRb.stop_service
         end
 
-        xit "should run against local server" do
+        it "should run against local server" do
           out = run_spec_via_druby(['--version'])
           out.should =~ /RSpec/n
         end
 
-        xit "should output green colorized text when running with --colour option" do
+        it "should output green colorized text when running with --colour option" do
           out = run_spec_via_druby(["--colour", @dummy_spec_filename])
           out.should =~ /\e\[32m/n
         end
 
-        xit "should output red colorized text when running with -c option" do
+        it "should output red colorized text when running with -c option" do
           out = run_spec_via_druby(["-c", @dummy_spec_filename])
           out.should =~ /\e\[31m/n
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire: spec
 bindir: bin
 cert_chain: []
 
-date: 2007-12-13 00:00:00 -06:00
+date: 2007-12-17 00:00:00 -06:00
 default_executable: spec
 dependencies: []
 
@@ -385,6 +385,6 @@ rubyforge_project: rspec
 rubygems_version: 0.9.5
 signing_key: 
 specification_version: 2
-summary: RSpec-1.1.0 (build 20071214045307) - BDD for Ruby http://rspec.rubyforge.org/
+summary: RSpec-1.1.1 (build 20071217181808) - BDD for Ruby http://rspec.rubyforge.org/
 test_files: []