dchelimsky-rspec 1.1.11.1 → 1.1.11.2

data/History.txt

@@ -5,25 +5,33 @@
   * deprecated ExampleMethods#implementation_backtrace - use ExampleMethods#backtrace instead
   * deprecated ExampleGroupMethods#example_group_backtrace - use ExampleGroupMethods#backtrace instead
 
-* 3 major enhancements
+* 6 major enhancements
 
   * it { should matcher } - support for implicit receiver of #should (Joe Ferris of thoughtbot)
   * subject { ... } - works in conjunction with implicit receiver of #should
   * wrap_expectation (for wrapping multiple expectations and/or t/u assertions)
+  * added array.should =~ [1,2,3] # passes if array contains exactly the same elements in any order (Jeff Dean and Pat Maddox)
+  * hash_including mock argument matcher can now accept just keys, key/value pairs, or both (David Krmpotic)
+  * added hash_not_including mock argument matcher (David Krmpotic). Closes #634.
 
-* 4 minor enhancements
+* 6 minor enhancements
 
   * should throw_symbol accepts an optional argument: should throw_symbol(:sym, arg)
   * fixed --line for jruby (Zach Moazeni)
   * assorted small changes to support Ruby 1.9 (got a way to go)
   * removed all instances of class << self - I do know who I am
+  * SpecParser can't handle backtrace paths with colons (John-Mason P. Shackelford). Closes #505.
+  * html formatter (and subsequently the textmate formatter) header fills in completely when running a single example
   
-* 4 bug fixes
+* 7 bug fixes
 
   * fixed bug where {:a => 1, :b => 2}.should include(:a, :b) failed (Yossef Mendelssohn)
   * only try to load Test::Unit if Test::Unit is defined (not just Test)
   * Allow stubs on parent and child classes simultaneously (Jim Lindley). Fixes #600.
   * BaseTextFormatter will now create the directory in a WHERE string (Adam Anderson). Fixes #616.
+  * Removed incorrect -S flag on autospec commands. Added explicit spec command for ruby to run, guarantee running rspec (raggi). Closes #507.
+  * Check whether test/unit has really been loaded before calling a method it defines (Brian Donovan). Closes #503.
+  * Fix spec_path for shared groups (Zach Dennis). Closes #615.
   
 === Version 1.1.11 / 2008-10-24
 

data/Manifest.txt

@@ -52,14 +52,28 @@ examples/passing/stack_spec.rb
 examples/passing/stack_spec_with_nested_example_groups.rb
 examples/passing/stubbing_example.rb
 examples/passing/yielding_example.rb
+features/configuration/before_blocks.feature
+features/example_groups/autogenerated_docstrings.feature
+features/example_groups/example_group_with_should_methods.feature
+features/example_groups/nested_groups.feature
+features/example_groups/output.feature
+features/interop/examples_and_tests_together.feature
+features/interop/test_but_not_test_unit.feature
+features/interop/test_case_with_should_methods.feature
+features/mock_framework_integration/use_flexmock.feature
+features/step_definitions/running_rspec.rb
+features/support/env.rb
+features/support/helpers/cmdline.rb
+features/support/helpers/story_helper.rb
+features/support/matchers/smart_match.rb
 init.rb
+lib/adapters/mock_frameworks/flexmock.rb
+lib/adapters/mock_frameworks/mocha.rb
+lib/adapters/mock_frameworks/rr.rb
+lib/adapters/mock_frameworks/rspec.rb
 lib/autotest/discover.rb
 lib/autotest/rspec.rb
 lib/spec.rb
-lib/spec/adapters.rb
-lib/spec/adapters/ruby_engine.rb
-lib/spec/adapters/ruby_engine/mri.rb
-lib/spec/adapters/ruby_engine/rubinius.rb
 lib/spec/dsl.rb
 lib/spec/dsl/main.rb
 lib/spec/example.rb
@@ -82,8 +96,6 @@ lib/spec/expectations/extensions/object.rb
 lib/spec/expectations/extensions/string_and_symbol.rb
 lib/spec/expectations/handler.rb
 lib/spec/expectations/wrap_expectation.rb
-lib/spec/extensions.rb
-lib/spec/extensions/class.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
 lib/spec/interop/test/unit/testcase.rb
@@ -103,6 +115,7 @@ lib/spec/matchers/has.rb
 lib/spec/matchers/have.rb
 lib/spec/matchers/include.rb
 lib/spec/matchers/match.rb
+lib/spec/matchers/match_array.rb
 lib/spec/matchers/method_missing.rb
 lib/spec/matchers/operator_matcher.rb
 lib/spec/matchers/raise_error.rb
@@ -173,14 +186,17 @@ lib/spec/story/step_mother.rb
 lib/spec/story/story.rb
 lib/spec/story/world.rb
 lib/spec/version.rb
-plugins/mock_frameworks/flexmock.rb
-plugins/mock_frameworks/mocha.rb
-plugins/mock_frameworks/rr.rb
-plugins/mock_frameworks/rspec.rb
-rake_tasks/examples.rake
-rake_tasks/examples_with_rcov.rake
-rake_tasks/failing_examples_with_html.rake
-rake_tasks/verify_rcov.rake
+resources/rake/examples.rake
+resources/rake/examples_with_rcov.rake
+resources/rake/failing_examples_with_html.rake
+resources/rake/verify_rcov.rake
+resources/spec/before_blocks_example.rb
+resources/spec/example_group_with_should_methods.rb
+resources/spec/simple_spec.rb
+resources/spec/spec_with_flexmock.rb
+resources/test/spec_and_test_together.rb
+resources/test/spec_including_test_but_not_unit.rb
+resources/test/test_case_with_should_methods.rb
 rspec.gemspec
 spec/README.jruby
 spec/autotest/autotest_helper.rb
@@ -191,7 +207,6 @@ spec/autotest/rspec_spec.rb
 spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
-spec/spec/adapters/ruby_engine_spec.rb
 spec/spec/dsl/main_spec.rb
 spec/spec/example/configuration_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
@@ -201,6 +216,7 @@ spec/spec/example/example_group_spec.rb
 spec/spec/example/example_matcher_spec.rb
 spec/spec/example/example_methods_spec.rb
 spec/spec/example/example_runner_spec.rb
+spec/spec/example/helper_method_spec.rb
 spec/spec/example/nested_example_group_spec.rb
 spec/spec/example/pending_module_spec.rb
 spec/spec/example/predicate_matcher_spec.rb
@@ -233,6 +249,7 @@ spec/spec/matchers/handler_spec.rb
 spec/spec/matchers/has_spec.rb
 spec/spec/matchers/have_spec.rb
 spec/spec/matchers/include_spec.rb
+spec/spec/matchers/match_array_spec.rb
 spec/spec/matchers/match_spec.rb
 spec/spec/matchers/matcher_methods_spec.rb
 spec/spec/matchers/mock_constraint_matchers_spec.rb
@@ -258,6 +275,7 @@ spec/spec/mocks/bug_report_8165_spec.rb
 spec/spec/mocks/bug_report_8302_spec.rb
 spec/spec/mocks/failing_mock_argument_constraints_spec.rb
 spec/spec/mocks/hash_including_matcher_spec.rb
+spec/spec/mocks/hash_not_including_matcher_spec.rb
 spec/spec/mocks/mock_ordering_spec.rb
 spec/spec/mocks/mock_space_spec.rb
 spec/spec/mocks/mock_spec.rb
@@ -314,6 +332,7 @@ spec/spec/runner/reporter_spec.rb
 spec/spec/runner/resources/a_bar.rb
 spec/spec/runner/resources/a_foo.rb
 spec/spec/runner/resources/a_spec.rb
+spec/spec/runner/resources/custom_example_group_runner.rb
 spec/spec/runner/spec.opts
 spec/spec/runner/spec_drb.opts
 spec/spec/runner/spec_parser/spec_parser_fixture.rb
@@ -321,6 +340,7 @@ spec/spec/runner/spec_parser_spec.rb
 spec/spec/runner/spec_spaced.opts
 spec/spec/runner_spec.rb
 spec/spec/spec_classes.rb
+spec/spec/spec_spec.rb
 spec/spec/story/builders.rb
 spec/spec/story/extensions/main_spec.rb
 spec/spec/story/extensions_spec.rb
@@ -340,37 +360,6 @@ spec/spec/story/story_helper.rb
 spec/spec/story/story_spec.rb
 spec/spec/story/world_spec.rb
 spec/spec_helper.rb
-stories/all.rb
-stories/configuration/before_blocks.story
-stories/configuration/stories.rb
-stories/example_groups/autogenerated_docstrings
-stories/example_groups/example_group_with_should_methods
-stories/example_groups/nested_groups
-stories/example_groups/output
-stories/example_groups/stories.rb
-stories/helper.rb
-stories/interop/examples_and_tests_together
-stories/interop/stories.rb
-stories/interop/test_but_not_test_unit
-stories/interop/test_case_with_should_methods
-stories/mock_framework_integration/stories.rb
-stories/mock_framework_integration/use_flexmock.story
-stories/pending_stories/README
-stories/resources/helpers/cmdline.rb
-stories/resources/helpers/story_helper.rb
-stories/resources/matchers/smart_match.rb
-stories/resources/spec/before_blocks_example.rb
-stories/resources/spec/example_group_with_should_methods.rb
-stories/resources/spec/simple_spec.rb
-stories/resources/spec/spec_with_flexmock.rb
-stories/resources/steps/running_rspec.rb
-stories/resources/stories/failing_story.rb
-stories/resources/test/spec_and_test_together.rb
-stories/resources/test/spec_including_test_but_not_unit.rb
-stories/resources/test/test_case_with_should_methods.rb
-stories/stories/multiline_steps.story
-stories/stories/steps/multiline_steps.rb
-stories/stories/stories.rb
 story_server/prototype/javascripts/builder.js
 story_server/prototype/javascripts/controls.js
 story_server/prototype/javascripts/dragdrop.js

data/README.txt

@@ -1,31 +1,49 @@
 = RSpec
 
 * http://rspec.info
-* http://rspec.info/rdoc/
 * http://rubyforge.org/projects/rspec
 * http://github.com/dchelimsky/rspec/wikis
 * mailto:rspec-devel@rubyforge.org
 
 == DESCRIPTION:
 
-RSpec is a Behaviour Driven Development framework with tools to express User
-Stories with Executable Scenarios and Executable Examples at the code level.
+RSpec is a Behaviour Driven Development framework for writing executable code
+examples.
 
 == FEATURES:
 
-* Spec::Story provides a framework for expressing User Stories and Scenarios
-* Spec::Example provides a framework for expressing Isolated Examples
-* Spec::Matchers provides Expression Matchers for use with Spec::Expectations and Spec::Mocks.
+* Spec::Example provides a framework for expressing executable code examples
+* Spec::Expectations adds #should and #should_not to every object
+* Spec::Matchers provides Expression Matchers for use with #should and #should_not
+* Spec::Mocks is a full featured mocking/stubbing library
 
 == SYNOPSIS:
 
-Spec::Expectations supports setting expectations on your objects so you
-can do things like:
-
-  result.should equal(expected_result)
+  describe Account do
+    context "transfering money" do
+      it "deposits transfer amount to the other account" do
+        source = Account.new(50, :USD)
+        target = mock('target account')
+        target.should_receive(:deposit).with(Money.new(5, :USD))
+        source.transfer(5, :USD).to(target)
+      end
+
+      it "reduces its balance by the transfer amount" do
+        source = Account.new(50, :USD)
+        target = stub('target account')
+        source.transfer(5, :USD).to(target)
+        source.balance.should == Money.new(45, :USD)
+      end
+    end
+  end
   
-Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub
-behaviour to your existing objects.
+  $ spec spec/account_spec.rb --format nested
+  Account
+    transfering money
+      deposits transfer amount to the other account
+      reduces its balance by the transfer amount
+    
+  2 examples, 0 failures
 
 == INSTALL:
 

data/Rakefile

@@ -5,6 +5,7 @@ require 'rubygems'
 require 'hoe'
 require 'spec/version'
 require 'spec/rake/spectask'
+require 'cucumber/rake/task'
 
 class Hoe
   def extra_deps
@@ -19,6 +20,7 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
+  p.extra_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
 end
 
@@ -26,14 +28,14 @@ end
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 
-task :verify_rcov => [:spec, :stories]
+task :verify_rcov => [:spec, :features]
 task :default => :verify_rcov
 
 # # Some of the tasks are in separate files since they are also part of the website documentation
-load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
-load File.dirname(__FILE__) + '/rake_tasks/examples_with_rcov.rake'
-load File.dirname(__FILE__) + '/rake_tasks/failing_examples_with_html.rake'
-load File.dirname(__FILE__) + '/rake_tasks/verify_rcov.rake'
+load File.dirname(__FILE__) + '/resources/rake/examples.rake'
+load File.dirname(__FILE__) + '/resources/rake/examples_with_rcov.rake'
+load File.dirname(__FILE__) + '/resources/rake/failing_examples_with_html.rake'
+load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake'
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
@@ -46,10 +48,8 @@ Spec::Rake::SpecTask.new do |t|
   end
 end
 
-desc "Run all stories"
-task :stories do
-  ruby "stories/all.rb --colour --format plain"
-end
+desc "Run Cucumber features"
+Cucumber::Rake::Task.new do; end
 
 desc "Run failing examples (see failure output)"
 Spec::Rake::SpecTask.new('failing_examples') do |t|

data/{stories/configuration/before_blocks.story → features/configuration/before_blocks.feature}

@@ -5,7 +5,7 @@ Story: before suite
 	
 	Scenario: running with ruby
 	
-		Given the file ../resources/spec/before_blocks_example.rb
+		Given the file ../../resources/spec/before_blocks_example.rb
 		
     When I run it with the ruby interpreter
 
@@ -13,7 +13,7 @@ Story: before suite
 		
 	Scenario: running with spec
 
-		Given the file ../resources/spec/before_blocks_example.rb
+		Given the file ../../resources/spec/before_blocks_example.rb
 
     When I run it with the spec script
 

data/{stories/example_groups/autogenerated_docstrings → features/example_groups/autogenerated_docstrings.feature}

@@ -1,4 +1,4 @@
-Story: autogenerated docstrings
+Feature: autogenerated docstrings
 
   As an RSpec user
   I want examples to generate their own names

data/{stories/example_groups/example_group_with_should_methods → features/example_groups/example_group_with_should_methods.feature}

@@ -1,17 +1,17 @@
-Story: Spec::ExampleGroup with should methods
+Feature: Spec::ExampleGroup with should methods
 
   As an RSpec adopter accustomed to classes and methods
   I want to use should_* methods in an ExampleGroup
   So that I use RSpec with classes and methods that look more like RSpec examples
 
   Scenario: Run with ruby
-    Given the file spec/example_group_with_should_methods.rb
+    Given the file ../../resources/spec/example_group_with_should_methods.rb
     When I run it with the ruby interpreter
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"
 
   Scenario: Run with spec
-  Given the file spec/example_group_with_should_methods.rb
+  Given the file ../../resources/spec/example_group_with_should_methods.rb
     When I run it with the spec script
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"

data/{stories/example_groups/nested_groups → features/example_groups/nested_groups.feature}

@@ -1,4 +1,4 @@
-Story: Nested example groups
+Feature: Nested example groups
 
   As an RSpec user
   I want to nest examples groups

data/{stories/example_groups/output → features/example_groups/output.feature}

@@ -1,25 +1,20 @@
-Story: Getting correct output
+Feature: Getting correct output
 
   As an RSpec user
   I want to see output only once
   So that I don't get confused
 
   Scenario: Run with ruby
-    Given the file spec/simple_spec.rb
+    Given the file ../../resources/spec/simple_spec.rb
     When I run it with the ruby interpreter
     Then the exit code should be 0
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
 
   Scenario: Run with CommandLine object
-    Given the file spec/simple_spec.rb
+    Given the file ../../resources/spec/simple_spec.rb
     When I run it with the CommandLine object
     Then the exit code should be 0
     And the stdout should not match "Loaded suite"
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
-
-  Scenario: Tweak backtrace
-    Given the file stories/failing_story.rb
-    When I run it with the ruby interpreter
-    Then the stdout should not match /\/lib\/spec\//

data/{stories/interop/examples_and_tests_together → features/interop/examples_and_tests_together.feature}

@@ -1,11 +1,11 @@
-Story: Spec and test together
+Feature: Spec and test together
 
   As an RSpec adopter with existing Test::Unit tests
   I want to run a few specs alongside my existing Test::Unit tests
   So that I can experience a smooth, gradual migration path
 
   Scenario: Run with ruby
-    Given the file test/spec_and_test_together.rb
+    Given the file ../../resources/test/spec_and_test_together.rb
 
     When I run it with the ruby interpreter -fs
 
@@ -16,13 +16,14 @@ Story: Spec and test together
     And the stdout should match "10 examples, 6 failures"
     And the stdout should match /expected: 40,\s*got: 4/m
     And the stdout should match /expected: 50,\s*got: 5/m
+    
   Scenario: Run with spec
-    Given the file test/spec_and_test_together.rb
+    Given the file ../../resources/test/spec_and_test_together.rb
 
     When I run it with the spec script -fs
 
     Then the exit code should be 256
-    Ands the stdout should match "ATest"
+    And the stdout should match "ATest"
     And the stdout should match "Test::Unit::AssertionFailedError in 'An Example should fail with assert'"
     And the stdout should match "'An Example should fail with should' FAILED"
     And the stdout should match "10 examples, 6 failures"

data/{stories/interop/test_but_not_test_unit → features/interop/test_but_not_test_unit.feature}

@@ -4,11 +4,11 @@ Story: Test is defined, but not Test::Unit
   I want to run examples without getting Test::Unit NameErrors
 
   Scenario: Run with ruby
-    Given the file test/spec_including_test_but_not_unit.rb
+    Given the file ../../resources/test/spec_including_test_but_not_unit.rb
     When I run it with the ruby interpreter
     Then the stderr should not match "Test::Unit"
 
   Scenario: Run with spec
-    Given the file test/spec_including_test_but_not_unit.rb
+    Given the file ../../resources/test/spec_including_test_but_not_unit.rb
     When I run it with the spec script
     Then the stderr should not match "Test::Unit"

data/{stories/interop/test_case_with_should_methods → features/interop/test_case_with_should_methods.feature}

@@ -5,13 +5,13 @@ Story: Test::Unit::TestCase extended by rspec with should methods
   So that I use RSpec with classes and methods that look more like RSpec examples
 
   Scenario: Run with ruby
-    Given the file test/test_case_with_should_methods.rb
+    Given the file ../../resources/test/test_case_with_should_methods.rb
     When I run it with the ruby interpreter
     Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"
 
   Scenario: Run with spec
-    Given the file test/test_case_with_should_methods.rb
+    Given the file ../../resources/test/test_case_with_should_methods.rb
     When I run it with the spec script
     Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"

data/{stories/mock_framework_integration/use_flexmock.story → features/mock_framework_integration/use_flexmock.feature}

@@ -4,6 +4,6 @@ Story: Getting correct output with flexmock
   I want to be able to use flexmock without rspec mocks interfering
 
   Scenario: Mock with flexmock
-    Given the file spec/spec_with_flexmock.rb
+    Given the file ../../resources/spec/spec_with_flexmock.rb
     When I run it with the ruby interpreter
     Then the exit code should be 0

data/features/step_definitions/running_rspec.rb

@@ -0,0 +1,48 @@
+Given /^the file (.*)$/ do |relative_path|
+  @path = File.expand_path(File.join(File.dirname(__FILE__), "..", "support", relative_path))
+  unless File.exist?(@path)
+    raise "could not find file at #{@path}"
+  end
+end
+
+When /^I run it with the (.*)$/ do |interpreter|
+  stderr_file = Tempfile.new('rspec')
+  stderr_file.close
+  @stdout = case(interpreter)
+    when /^ruby interpreter/
+      args = interpreter.gsub('ruby interpreter','')
+      ruby("#{@path}#{args}", stderr_file.path)
+    when /^spec script/
+      args = interpreter.gsub('spec script','')
+      spec("#{@path}#{args}", stderr_file.path)
+    when 'CommandLine object' then cmdline(@path, stderr_file.path)
+    else raise "Unknown interpreter: #{interpreter}"
+  end
+  @stderr = IO.read(stderr_file.path)
+  @exit_code = $?.to_i
+end
+
+Then /^the (.*) should match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then @stdout
+    when 'stderr' then @stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should smart_match(string_or_regex)
+end
+
+Then /^the (.*) should not match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then @stdout
+    when 'stderr' then @stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should_not smart_match(string_or_regex)
+end
+
+
+Then /^the exit code should be (\d+)$/ do |exit_code|
+  if @exit_code != exit_code.to_i
+    raise "Did not exit with #{exit_code}, but with #{@exit_code}. Standard error:\n#{@stderr}"
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,25 @@
+require 'tempfile'
+require File.dirname(__FILE__) + '/../../spec/ruby_forker'
+require File.dirname(__FILE__) + '/matchers/smart_match'
+
+require 'spec/expectations'
+require 'spec/matchers'
+
+module RspecWorld
+  include Spec::Expectations
+  include Spec::Matchers
+  include RubyForker
+
+  def spec(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/../../bin/spec'} #{args}", stderr)
+  end
+
+  def cmdline(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/helpers/cmdline.rb'} #{args}", stderr)
+  end
+end
+
+World do |world|
+  world.extend(RspecWorld)
+  world
+end

data/{plugins → lib/adapters}/mock_frameworks/rspec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec", "mocks"))
 require 'spec/mocks/framework'
 require 'spec/mocks/extensions'
 

data/lib/autotest/rspec.rb

@@ -28,7 +28,7 @@ class Autotest::Rspec < Autotest
   def consolidate_failures(failed)
     filters = new_hash_of_arrays
     failed.each do |spec, trace|
-      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:\Z?/
+      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/
         filters[$2] << spec
       end
     end
@@ -37,7 +37,8 @@ class Autotest::Rspec < Autotest
 
   def make_test_cmd(files_to_test)
     return '' if files_to_test.empty?
-    return "#{ruby} -S #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
+    spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
+    return "#{ruby} #{spec_program} #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
   end
   
   def add_options_if_present # :nodoc:

data/lib/spec/dsl/main.rb

@@ -20,6 +20,7 @@ module Spec
       # register special implementations.
       #
       def describe(*args, &block)
+        Spec::Example::add_spec_path_to(args)
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
       alias :context :describe
@@ -39,11 +40,12 @@ module Spec
       #      ...
       #    end
       #  end
-      def share_examples_for(name, &block)
-        Spec::Example::SharedExampleGroup.register(name, &block)
+      def share_examples_for(*args, &block)
+        Spec::Example::add_spec_path_to(args)
+        Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block)
       end
       alias :shared_examples_for :share_examples_for
-    
+      
       # Creates a Shared Example Group and assigns it to a constant
       #
       #  share_as :AllEditions do
@@ -70,7 +72,9 @@ module Spec
       #  end
       def share_as(name, &block)
         begin
-          Object.const_set(name, Spec::Example::SharedExampleGroup.register(name, &block))
+          args = [name]
+          Spec::Example::add_spec_path_to(args)
+          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")
         end

data/lib/spec/example/configuration.rb

@@ -160,7 +160,7 @@ module Spec
       end
     
       def mock_framework_path(framework_name)
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name))
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "adapters", "mock_frameworks", framework_name))
       end
     end
   end

data/lib/spec/example/example_group_factory.rb

@@ -52,12 +52,16 @@ module Spec
         def create_example_group(*args, &block)
           raise ArgumentError if args.empty?
           raise ArgumentError unless block
-          args << {} unless Hash === args.last
-          args.last[:spec_path] ||= File.expand_path(caller(0)[2])
+          Spec::Example::add_spec_path_to(args)
           superclass = determine_superclass(args.last)
           superclass.describe(*args, &block)
         end
         
+        def create_shared_example_group(*args, &block)
+          Spec::Example::add_spec_path_to(args)
+          SharedExampleGroup.register(*args, &block)
+        end
+        
       protected
 
         def determine_superclass(opts)