mspec 1.5.14 → 1.5.15

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2010-01-05}
+  s.date                      = %q{2010-02-04}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/commands/mspec-ci.rb

@@ -66,8 +66,11 @@ class MSpecCI < MSpecScript
   def run
     MSpec.register_tags_patterns config[:tags_patterns]
     MSpec.register_files @files
-    filter = TagFilter.new(:exclude,
-        "fails", "critical", "unstable", "incomplete", "unsupported")
+
+    tags = ["fails", "critical", "unstable", "incomplete", "unsupported"]
+    tags += Array(config[:ci_xtags])
+
+    filter = TagFilter.new(:exclude, *tags)
     filter.register
 
     MSpec.process

data/lib/mspec/guards.rb

@@ -5,6 +5,7 @@ require 'mspec/guards/compliance'
 require 'mspec/guards/conflict'
 require 'mspec/guards/endian'
 require 'mspec/guards/extensions'
+require 'mspec/guards/feature'
 require 'mspec/guards/guard'
 require 'mspec/guards/noncompliance'
 require 'mspec/guards/platform'

data/lib/mspec/guards/conflict.rb

@@ -2,12 +2,17 @@ require 'mspec/guards/guard'
 
 class ConflictsGuard < SpecGuard
   def match?
-    constants = Object.constants
-    @args.any? { |mod| constants.include? mod.to_s }
+    # Always convert constants to symbols regardless of version.
+    constants = Object.constants.map { |x| x.to_sym }
+    @args.any? { |mod| constants.include? mod }
   end
 end
 
 class Object
+  # In some cases, libraries will modify another Ruby method's
+  # behavior. The specs for the method's behavior will then fail
+  # if that library is loaded. This guard will not run if any of
+  # the specified constants exist in Object.constants.
   def conflicts_with(*modules)
     g = ConflictsGuard.new(*modules)
     g.name = :conflicts_with

data/lib/mspec/guards/feature.rb

@@ -0,0 +1,47 @@
+require 'mspec/guards/guard'
+
+class FeatureGuard < SpecGuard
+  def self.enabled?(*features)
+    new(*features).match?
+  end
+
+  def match?
+    @parameters.all? { |f| MSpec.feature_enabled? f }
+  end
+end
+
+class Object
+  # Provides better documentation in the specs by
+  # naming sets of features that work together as
+  # a whole. Examples include :encoding, :fiber,
+  # :continuation, :fork.
+  #
+  # Usage example:
+  #
+  #   with_feature :encoding do
+  #     # specs for a method that provides aspects
+  #     # of the encoding feature
+  #   end
+  #
+  # Multiple features must all be enabled for the
+  # guard to run:
+  #
+  #   with_feature :one, :two do
+  #     # these specs will run if features :one AND
+  #     # :two are enabled.
+  #   end
+  #
+  # The implementation must explicitly enable a feature
+  # by adding code like the following to the .mspec
+  # configuration file:
+  #
+  #   MSpec.enable_feature :encoding
+  #
+  def with_feature(*features)
+    g = FeatureGuard.new(*features)
+    g.name = :with_feature
+    yield if g.yield?
+  ensure
+    g.unregister
+  end
+end

data/lib/mspec/guards/guard.rb

@@ -1,6 +1,8 @@
 require 'mspec/runner/mspec'
 require 'mspec/runner/actions/tally'
 
+require 'rbconfig'
+
 class SpecGuard
   def self.report
     @report ||= Hash.new { |h,k| h[k] = [] }
@@ -56,10 +58,6 @@ class SpecGuard
     version.split('.')[0,n].join('.')
   end
 
-  def self.windows?(key = RUBY_PLATFORM)
-    !!key.match(/(mswin|mingw)/)
-  end
-
   attr_accessor :name, :parameters
 
   def initialize(*args)
@@ -136,7 +134,7 @@ class SpecGuard
   end
 
   def windows?(sym, key)
-    sym == :windows && SpecGuard.windows?(key)
+    sym == :windows && !key.match(/(mswin|mingw)/).nil?
   end
 
   def platform?(*args)
@@ -154,7 +152,6 @@ class SpecGuard
   end
 
   def os?(*oses)
-    require 'rbconfig'
     oses.any? do |os|
       host_os = Config::CONFIG['host_os'] || RUBY_PLATFORM
       host_os.downcase!

data/lib/mspec/guards/platform.rb

@@ -1,6 +1,10 @@
 require 'mspec/guards/guard'
 
 class PlatformGuard < SpecGuard
+  def self.windows?
+    PlatformGuard.new(:os => :windows).match?
+  end
+
   def initialize(*args)
     if args.last.is_a?(Hash)
       @options, @platforms = args.last, args[0..-2]

data/lib/mspec/helpers.rb

@@ -2,6 +2,7 @@ require 'mspec/helpers/argv'
 require 'mspec/helpers/bignum'
 require 'mspec/helpers/const_lookup'
 require 'mspec/helpers/ducktype'
+require 'mspec/helpers/encode'
 require 'mspec/helpers/enumerator_class'
 require 'mspec/helpers/environment'
 require 'mspec/helpers/fixture'

data/lib/mspec/helpers/encode.rb

@@ -0,0 +1,21 @@
+require 'mspec/guards/feature'
+
+class Object
+  # Helper to handle String encodings. The +str+ and +encoding+ parameters
+  # must be Strings and an ArgumentError will be raised if not. This ensures
+  # that the encode() helper can be used regardless of whether Encoding exits.
+  # The helper is a no-op (i.e. passes through +str+ unmodified) if the
+  # :encoding feature is not enabled (see with_feature guard).  If the
+  # :encoding feature is enabled, +str+.force_encoding(+encoding+) is called.
+  def encode(str, encoding)
+    unless str.is_a? String and encoding.is_a? String
+      raise ArgumentError, "encoding name must be a String"
+    end
+
+    if FeatureGuard.enabled? :encoding
+      str.force_encoding encoding
+    end
+
+    str
+  end
+end

data/lib/mspec/helpers/environment.rb

@@ -3,7 +3,7 @@ require 'mspec/guards/guard'
 class Object
   def env
     env = ""
-    if SpecGuard.windows?
+    if PlatformGuard.windows?
       env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
     else
       env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
@@ -17,7 +17,7 @@ class Object
 
   def username
     user = ""
-    if SpecGuard.windows?
+    if PlatformGuard.windows?
       user = windows_env_echo('USERNAME')
     else
       user = `whoami`.strip
@@ -26,7 +26,7 @@ class Object
   end
 
   def home_directory
-    return ENV['HOME'] unless SpecGuard.windows?
+    return ENV['HOME'] unless PlatformGuard.windows?
     windows_env_echo('HOMEDRIVE') + windows_env_echo('HOMEPATH')
   end  
 end

data/lib/mspec/helpers/ruby_exe.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/ruby_name'
-require 'mspec/guards/guard'
+require 'mspec/guards/platform'
 
 # The ruby_exe helper provides a wrapper for invoking the
 # same Ruby interpreter as the one running the specs and
@@ -99,7 +99,7 @@ class Object
       # It has been reported that File.executable is not reliable
       # on Windows platforms (see commit 56bc555c). So, we check the
       # platform. 
-      if File.exists?(exe) and (SpecGuard.windows? or File.executable?(exe))
+      if File.exists?(exe) and (PlatformGuard.windows? or File.executable?(exe))
         return cmd
       end
     end

data/lib/mspec/matchers/equal_utf16.rb

@@ -1,19 +1,17 @@
+require 'mspec/helpers/encode'
+
 class EqualUtf16Matcher
   def initialize(expected)
-    @expected = expected
+    @expected = Array(expected).map { |x| encode x, "binary" }
   end
 
   def matches?(actual)
-    @actual = actual
+    @actual = Array(actual).map { |x| encode x, "binary" }
     @actual == @expected || @actual == expected_swapped
   end
 
   def expected_swapped
-    if @expected.respond_to?(:to_str)
-      @expected_swapped ||= @expected.to_str.gsub(/(.)(.)/, '\2\1')
-    else
-      @expected_swapped ||= @expected.collect { |s| s.to_str.gsub(/(.)(.)/, '\2\1') }
-    end
+    @expected_swapped ||= @expected.map { |x| x.to_str.gsub(/(.)(.)/, '\2\1') }
   end
 
   def failure_message

data/lib/mspec/mocks/mock.rb

@@ -38,6 +38,11 @@ module Mock
     has_key?(mocks.keys, sym) or has_key?(stubs.keys, sym)
   end
 
+  def self.clear_replaced(key)
+    mocks.delete key
+    stubs.delete key
+  end
+
   def self.mock_respond_to?(obj, sym)
     name = replaced_name(obj, :respond_to?)
     if replaced? name
@@ -176,7 +181,10 @@ module Mock
       else
         meta.__send__ :remove_method, sym
       end
+
+      clear_replaced key
     end
+  ensure
     reset
   end
 end

data/lib/mspec/runner/context.rb

@@ -37,6 +37,12 @@ class ContextState
     @expectation_missing = Proc.new { raise SpecExpectationNotFoundError }
   end
 
+  # Remove caching when a ContextState is dup'd for shared specs.
+  def initialize_copy(other)
+    @pre  = {}
+    @post = {}
+  end
+
   # Returns true if this is a shared +ContextState+. Essentially, when
   # created with: describe "Something", :shared => true { ... }
   def shared?
@@ -47,28 +53,51 @@ class ContextState
   # the +parents+ list.
   def parent=(parent)
     @description = nil
-    @parent = parent
-    parent.child self if parent and not shared?
 
-    state = parent
-    while state
-      parents.unshift state
-      state = state.parent
+    if shared?
+      @parent = nil
+    else
+      @parent = parent
+      parent.child self if parent
+
+      @parents = [self]
+      state = parent
+      while state
+        @parents.unshift state
+        state = state.parent
+      end
     end
   end
 
-  def replace_parent(parent)
-    @parents[0] = parent
-
-    children.each { |child| child.replace_parent parent }
-  end
-
   # Add the ContextState instance +child+ to the list of nested
   # describe blocks.
   def child(child)
     @children << child
   end
 
+  # Adds a nested ContextState in a shared ContextState to a containing
+  # ContextState.
+  #
+  # Normal adoption is from the parent's perspective. But adopt is a good
+  # verb and it's reasonable for the child to adopt the parent as well. In
+  # this case, manipulating state from inside the child avoids needlessly
+  # exposing the state to manipulate it externally in the dup. (See
+  # #it_should_behave_like)
+  def adopt(parent)
+    self.parent = parent
+
+    @examples = @examples.map do |example|
+      example = example.dup
+      example.context = self
+      example
+    end
+
+    children = @children
+    @children = []
+
+    children.each { |child| child.dup.adopt self }
+  end
+
   # Returns a list of all before(+what+) blocks from self and any parents.
   def pre(what)
     @pre[what] ||= parents.inject([]) { |l, s| l.push(*s.before(what)) }
@@ -113,7 +142,7 @@ class ContextState
 
   # Returns a description string generated from self and all parents
   def description
-    @description ||= parents.map { |p| p.to_s }.join(" ")
+    @description ||= parents.map { |p| p.to_s }.compact.join(" ")
   end
 
   # Injects the before/after blocks and examples from the shared
@@ -125,18 +154,19 @@ class ContextState
       raise Exception, "Unable to find shared 'describe' for #{desc}"
     end
 
-    state.examples.each { |ex| ex.context = self; @examples << ex }
     state.before(:all).each { |b| before :all, &b }
     state.before(:each).each { |b| before :each, &b }
     state.after(:each).each { |b| after :each, &b }
     state.after(:all).each { |b| after :all, &b }
 
-    # There is a potential race here if mspec ever implements concurrency
-    # in process. Right now, the only way to run specs concurrently is
-    # with multiple processes, so we ignore this for the sake of simplicity.
+    state.examples.each do |example|
+      example = example.dup
+      example.context = self
+      @examples << example
+    end
+
     state.children.each do |child|
-      child.replace_parent self
-      @children << child
+      child.dup.adopt self
     end
   end
 

data/lib/mspec/runner/mspec.rb

@@ -21,6 +21,7 @@ module MSpec
   @modes   = []
   @shared  = {}
   @guarded = []
+  @features     = {}
   @exception    = nil
   @randomize    = nil
   @expectation  = nil
@@ -162,6 +163,18 @@ module MSpec
     retrieve(:modes).include? mode
   end
 
+  def self.enable_feature(feature)
+    retrieve(:features)[feature] = true
+  end
+
+  def self.disable_feature(feature)
+    retrieve(:features)[feature] = false
+  end
+
+  def self.feature_enabled?(feature)
+    retrieve(:features)[feature] || false
+  end
+
   def self.retrieve(symbol)
     instance_variable_get :"@#{symbol}"
   end

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.5.14"
+  VERSION = SpecVersion.new "1.5.15"
 end

data/spec/commands/mspec_ci_spec.rb

@@ -107,6 +107,8 @@ describe MSpecCI, "#run" do
     TagFilter.stub!(:new).and_return(@filter)
     @filter.stub!(:register)
 
+    @tags = ["fails", "critical", "unstable", "incomplete", "unsupported"]
+
     @config = { :ci_files => ["one", "two"] }
     @script = MSpecCI.new
     @script.stub!(:exit)
@@ -127,9 +129,25 @@ describe MSpecCI, "#run" do
   end
 
   it "registers a tag filter for 'fails', 'unstable', 'incomplete', 'critical', 'unsupported'" do
+    filter = mock("fails filter")
+    TagFilter.should_receive(:new).with(:exclude, *@tags).and_return(filter)
+    filter.should_receive(:register)
+    @script.run
+  end
+
+  it "registers an additional exclude tag specified by :ci_xtags" do
+    @config[:ci_xtags] = "windows"
+    filter = mock("fails filter")
+    TagFilter.should_receive(:new).with(:exclude, *(@tags + ["windows"])).and_return(filter)
+    filter.should_receive(:register)
+    @script.run
+  end
+
+  it "registers additional exclude tags specified by a :ci_xtags array" do
+    @config[:ci_xtags] = ["windows", "windoze"]
     filter = mock("fails filter")
     TagFilter.should_receive(:new).with(:exclude,
-        "fails", "critical", "unstable", "incomplete", "unsupported").and_return(filter)
+        *(@tags + ["windows", "windoze"])).and_return(filter)
     filter.should_receive(:register)
     @script.run
   end

data/spec/guards/conflict_spec.rb

@@ -12,11 +12,23 @@ describe Object, "#conflicts_with" do
     ScratchPad.recorded.should_not == :yield
   end
 
+  it "does not yield if Object.constants (as Symbols) includes any of the arguments" do
+    Object.stub!(:constants).and_return([:SomeClass, :OtherClass])
+    conflicts_with(:SomeClass, :AClass, :BClass) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "yields if Object.constants does not include any of the arguments" do
     Object.stub!(:constants).and_return(["SomeClass", "OtherClass"])
     conflicts_with(:AClass, :BClass) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "yields if Object.constants (as Symbols) does not include any of the arguments" do
+    Object.stub!(:constants).and_return([:SomeClass, :OtherClass])
+    conflicts_with(:AClass, :BClass) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
 end
 
 describe Object, "#conflicts_with" do

data/spec/guards/feature_spec.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/guards/feature'
+
+describe FeatureGuard, ".enabled?" do
+  it "returns true if the feature is enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(true)
+    FeatureGuard.enabled?(:encoding).should be_true
+  end
+
+  it "returns false if the feature is not enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(false)
+    FeatureGuard.enabled?(:encoding).should be_false
+  end
+
+  it "returns true if all the features are enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
+    MSpec.should_receive(:feature_enabled?).with(:two).and_return(true)
+    FeatureGuard.enabled?(:one, :two).should be_true
+  end
+
+  it "returns false if any of the features are not enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
+    MSpec.should_receive(:feature_enabled?).with(:two).and_return(false)
+    FeatureGuard.enabled?(:one, :two).should be_false
+  end
+end
+
+describe Object, "#with_feature" do
+  before :each do
+    ScratchPad.clear
+
+    @guard = FeatureGuard.new :encoding
+    FeatureGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :with_feature" do
+    with_feature(:encoding) { }
+    @guard.name.should == :with_feature
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      with_feature { raise Exception }
+    end.should raise_error(Exception)
+  end
+end
+
+describe Object, "#with_feature" do
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "yields if the feature is enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(true)
+    with_feature(:encoding) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+
+  it "yields if all the features are enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
+    MSpec.should_receive(:feature_enabled?).with(:two).and_return(true)
+    with_feature(:one, :two) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+
+  it "does not yield if the feature is not enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(false)
+    with_feature(:encoding) { ScratchPad.record :yield }
+    ScratchPad.recorded.should be_nil
+  end
+
+  it "does not yield if any of the features are not enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
+    MSpec.should_receive(:feature_enabled?).with(:two).and_return(false)
+    with_feature(:one, :two) { ScratchPad.record :yield }
+    ScratchPad.recorded.should be_nil
+  end
+end

data/spec/guards/guard_spec.rb

@@ -47,33 +47,6 @@ describe SpecGuard, ".ruby_version" do
   end
 end
 
-describe SpecGuard, ".windows?" do
-  before :all do
-    @ruby_platform = Object.const_get :RUBY_PLATFORM
-  end
-
-  after :all do
-    Object.const_set :RUBY_PLATFORM, @ruby_platform
-  end
-
-  it "returns true if key is mswin32" do
-    SpecGuard.windows?("mswin32").should be_true
-  end
-
-  it "returns true if key is mingw" do
-    SpecGuard.windows?("mingw").should be_true
-  end
-
-  it "returns false for non-windows" do
-    SpecGuard.windows?("notwindows").should be_false
-  end
-
-  it "uses RUBY_PLATFORM by default" do
-    Object.const_set :RUBY_PLATFORM, "mswin32"
-    SpecGuard.windows?.should be_true
-  end
-end
-
 describe SpecGuard, "#yield?" do
   before :each do
     MSpec.clear_modes
@@ -367,7 +340,7 @@ describe SpecGuard, "#os?" do
   end
 end
 
-describe SpecGuard, "windows?" do
+describe SpecGuard, "#windows?" do
   before :each do
     @guard = SpecGuard.new
   end

data/spec/helpers/encode_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/encode'
+
+describe Object, "#encode" do
+  it "raises an ArgumentError if the str parameter is not a String" do
+    lambda { encode(Object.new, "utf-8") }.should raise_error(ArgumentError)
+  end
+
+  it "raises an ArgumentError if the encoding parameter is not a String" do
+    lambda { encode("some str", Object.new) }.should raise_error(ArgumentError)
+  end
+
+  it "calls #force_encoding if the :encoding feature is enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(true)
+    str = "some text"
+    str.should_receive(:force_encoding).with("utf-8")
+    encode(str, "utf-8")
+  end
+
+  it "does not call #force_encoding if the :encoding feature is not enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(false)
+    str = "some text"
+    str.should_not_receive(:force_encoding)
+    encode(str, "utf-8")
+  end
+end

data/spec/helpers/environment_spec.rb

@@ -1,43 +1,30 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/guards/platform'
 require 'mspec/helpers/environment'
 
 describe "#env" do
-  before(:all) do
-    @ruby_platform = Object.const_get :RUBY_PLATFORM
-  end
-
-  after(:all) do
-    Object.const_set :RUBY_PLATFORM, @ruby_platform
-  end
-
   it "returns a hash of variables" do
     env.class.should == Hash
   end
-  
+
   it "calls `env` on non-Windows" do
-    Object.const_set :RUBY_PLATFORM, "notwindows"
+    PlatformGuard.stub!(:windows?).and_return(false)
     should_receive(:`).with("env").and_return("one=two\nthree=four")
     env
   end
 
-  it "calls `cmd.exe /C set` on Windows (mswin32)" do
-    Object.const_set :RUBY_PLATFORM, "mswin32"
-    should_receive(:`).with("cmd.exe /C set").and_return("one=two\nthree=four")
-    env
-  end
-
-  it "calls `cmd.exe /C set` on Windows (mingw)" do
-    Object.const_set :RUBY_PLATFORM, "mingw"
+  it "calls `cmd.exe /C set` on Windows" do
+    PlatformGuard.stub!(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C set").and_return("one=two\nthree=four")
     env
   end
 
   it "returns the current user's environment variables" do
-    Object.const_set :RUBY_PLATFORM, "notwindows"
+    PlatformGuard.stub!(:windows?).and_return(false)
     should_receive(:`).with("env").and_return("one=two\nthree=four")
     env.should == {"one" => "two", "three" => "four"}
 
-    Object.const_set :RUBY_PLATFORM, "mswin32"
+    PlatformGuard.stub!(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C set").and_return("five=six\nseven=eight")
     env.should == {"five" => "six", "seven" => "eight"}
   end
@@ -52,30 +39,24 @@ describe "#username" do
     Object.const_set :RUBY_PLATFORM, @ruby_platform
   end
 
-  it "calls `cmd.exe /C ECHO %USERNAME%` on Windows (mswin32)" do
-    Object.const_set :RUBY_PLATFORM, "mswin32"
-    should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("john")
-    username
-  end
-
-  it "calls `cmd.exe /C ECHO %USERNAME%` on Windows (mingw)" do
-    Object.const_set :RUBY_PLATFORM, "mingw"
+  it "calls `cmd.exe /C ECHO %USERNAME%` on Windows" do
+    PlatformGuard.stub!(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("john")
     username
   end
 
   it "calls `env` on non-Windows" do
-    Object.const_set :RUBY_PLATFORM, "notwindows"
+    PlatformGuard.stub!(:windows?).and_return(false)
     should_receive(:`).with("whoami").and_return("john")
     username
   end
 
   it "returns the user's username" do
-    Object.const_set :RUBY_PLATFORM, "mswin32"
+    PlatformGuard.stub!(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("johnonwin")
     username.should == "johnonwin"
 
-    Object.const_set :RUBY_PLATFORM, "notwindows"
+    PlatformGuard.stub!(:windows?).and_return(false)
     should_receive(:`).with("whoami").and_return("john")
     username.should == "john"
   end

data/spec/helpers/ruby_exe_spec.rb

@@ -73,21 +73,15 @@ describe "#resolve_ruby_exe" do
   end
 
   before :each do
-    @ruby_platform = Object.const_get :RUBY_PLATFORM
-
     @script = RubyExeSpecs.new
   end
 
-  after :each do
-    Object.const_set :RUBY_PLATFORM, @ruby_platform
-  end
-
   after :all do
     $VERBOSE = @verbose
   end
 
   it "returns the value returned by #ruby_exe_options if it exists and is executable" do
-    Object.const_set :RUBY_PLATFORM, "notwindows"
+    PlatformGuard.stub!(:windows?).and_return(false)
     @script.should_receive(:ruby_exe_options).and_return(@name)
     File.should_receive(:exists?).with(@name).and_return(true)
     File.should_receive(:executable?).with(@name).and_return(true)
@@ -95,7 +89,7 @@ describe "#resolve_ruby_exe" do
   end
 
   it "returns the value returned by #ruby_exe_options if it exists on Windows platforms" do
-    Object.const_set :RUBY_PLATFORM, "mswin"
+    PlatformGuard.stub!(:windows?).and_return(true)
     @script.should_receive(:ruby_exe_options).and_return(@name)
     File.should_receive(:exists?).with(@name).and_return(true)
     File.should_not_receive(:executable?)

data/spec/matchers/equal_utf16_spec.rb

@@ -43,15 +43,15 @@ describe EqualUtf16Matcher do
     matcher = EqualUtf16Matcher.new("a\0b\0")
     matcher.matches?("a\0b\0c\0")
     matcher.failure_message.should == [
-      "Expected \"a#{@null}b#{@null}c#{@null}\"\n",
-      "to equal \"a#{@null}b#{@null}\"\n or \"#{@null}a#{@null}b\"\n"]
+      "Expected [\"a#{@null}b#{@null}c#{@null}\"]\n",
+      "to equal [\"a#{@null}b#{@null}\"]\n or [\"#{@null}a#{@null}b\"]\n"]
   end
 
   it "provides a useful negative failure message" do
     matcher = EqualUtf16Matcher.new("a\0b\0")
     matcher.matches?("\0a\0b")
     matcher.negative_failure_message.should == [
-      "Expected \"#{@null}a#{@null}b\"\n",
-      "not to equal \"a#{@null}b#{@null}\"\n nor \"#{@null}a#{@null}b\"\n"]
+      "Expected [\"#{@null}a#{@null}b\"]\n",
+      "not to equal [\"a#{@null}b#{@null}\"]\n nor [\"#{@null}a#{@null}b\"]\n"]
   end
 end

data/spec/mocks/mock_spec.rb

@@ -446,4 +446,15 @@ describe Mock, ".cleanup" do
     Mock.cleanup
     Mock.stubs.should == {}
   end
+
+  it "removes the replaced name for mocks" do
+    replaced_key = Mock.replaced_key(@mock, :method_call)
+    Mock.should_receive(:clear_replaced).with(replaced_key)
+
+    replaced_name = Mock.replaced_name(@mock, :method_call)
+    Mock.replaced?(replaced_name).should be_true
+
+    Mock.cleanup
+    Mock.replaced?(replaced_name).should be_false
+  end
 end

data/spec/runner/context_spec.rb

@@ -262,6 +262,12 @@ describe ContextState, "#parent=" do
     state.parent = @parent
   end
 
+  it "does not set parents if shared" do
+    state = ContextState.new "", :shared => true
+    state.parent = @parent
+    state.parents.should == [state]
+  end
+
   it "sets self as a child of parent" do
     @parent.should_receive(:child).with(@state)
     @state.parent = @parent
@@ -910,11 +916,11 @@ end
 
 describe ContextState, "#it_should_behave_like" do
   before :each do
-    @shared_desc = "shared context"
+    @shared_desc = :shared_context
     @shared = ContextState.new(@shared_desc, :shared => true)
     MSpec.stub!(:retrieve_shared).and_return(@shared)
 
-    @state = ContextState.new ""
+    @state = ContextState.new "Top level"
     @a = lambda { }
     @b = lambda { }
   end
@@ -926,36 +932,57 @@ describe ContextState, "#it_should_behave_like" do
 
   describe "for nested ContextState instances" do
     before :each do
-      @nested = ContextState.new ""
+      @nested = ContextState.new "nested context"
       @nested.parents.unshift @shared
+
       @shared.children << @nested
+
+      @nested_dup = @nested.dup
+      @nested.stub!(:dup).and_return(@nested_dup)
     end
 
-    it "adds nested describe blocks to the invoking ContextState" do
+    it "duplicates the nested ContextState" do
       @state.it_should_behave_like @shared_desc
-      @shared.children.should_not be_empty
-      @state.children.should include(*@shared.children)
+      @state.children.first.should equal(@nested_dup)
     end
 
-    it "changes the parent ContextState" do
-      @shared.children.first.parents.first.should equal(@shared)
+    it "sets the parent of the nested ContextState to the containing ContextState" do
       @state.it_should_behave_like @shared_desc
-      @shared.children.first.parents.first.should equal(@state)
+      @nested_dup.parent.should equal(@state)
+    end
+
+    it "sets the context for nested examples to the nested ContextState's dup" do
+      @shared.it "an example", &@a
+      @shared.it "another example", &@b
+      @state.it_should_behave_like @shared_desc
+      @nested_dup.examples.each { |x| x.context.should equal(@nested_dup) }
+    end
+
+    it "omits the shored ContextState's description" do
+      @nested.it "an example", &@a
+      @nested.it "another example", &@b
+      @state.it_should_behave_like @shared_desc
+
+      @nested_dup.description.should == "Top level nested context"
+      @nested_dup.examples.first.description.should == "Top level nested context an example"
+      @nested_dup.examples.last.description.should == "Top level nested context another example"
     end
   end
 
-  it "adds examples from the shared ContextState" do
-    @shared.it "some", &@a
-    @shared.it "thing", &@b
+  it "adds duped examples from the shared ContextState" do
+    @shared.it "some method", &@a
+    ex_dup = @shared.examples.first.dup
+    @shared.examples.first.stub!(:dup).and_return(ex_dup)
+
     @state.it_should_behave_like @shared_desc
-    @state.examples.should include(*@shared.examples)
+    @state.examples.should == [ex_dup]
   end
 
-  it "sets the containing ContextState for the examples" do
-    @shared.it "some", &@a
-    @shared.it "thing", &@b
-    @shared.examples.each { |ex| ex.should_receive(:context=).with(@state) }
+  it "sets the context for examples to the containing ContextState" do
+    @shared.it "an example", &@a
+    @shared.it "another example", &@b
     @state.it_should_behave_like @shared_desc
+    @state.examples.each { |x| x.context.should equal(@state) }
   end
 
   it "adds before(:all) blocks from the shared ContextState" do

data/spec/runner/example_spec.rb

@@ -71,6 +71,11 @@ describe ExampleState, "#filtered?" do
     @filter = mock("filter")
   end
 
+  after :each do
+    MSpec.store :include, nil
+    MSpec.store :exclude, nil
+  end
+
   it "returns false if MSpec include filters list is empty" do
     @state.filtered?.should == false
   end

data/spec/runner/formatters/dotted_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/dotted'
 require 'mspec/runner/mspec'
 require 'mspec/runner/example'
+require 'mspec/utils/script'
 
 describe DottedFormatter, "#initialize" do
   it "permits zero arguments" do
@@ -16,10 +17,10 @@ end
 describe DottedFormatter, "#register" do
   before :each do
     @formatter = DottedFormatter.new
+    MSpec.stub!(:register)
   end
 
   it "registers self with MSpec for appropriate actions" do
-    MSpec.stub!(:register)
     MSpec.should_receive(:register).with(:exception, @formatter)
     MSpec.should_receive(:register).with(:before, @formatter)
     MSpec.should_receive(:register).with(:after, @formatter)

data/spec/runner/formatters/file_spec.rb

@@ -6,17 +6,17 @@ require 'mspec/runner/example'
 describe FileFormatter, "#register" do
   before :each do
     @formatter = FileFormatter.new
+    MSpec.stub!(:register)
+    MSpec.stub!(:unregister)
   end
 
   it "registers self with MSpec for :load, :unload actions" do
-    MSpec.stub!(:register)
     MSpec.should_receive(:register).with(:load, @formatter)
     MSpec.should_receive(:register).with(:unload, @formatter)
     @formatter.register
   end
 
   it "unregisters self with MSpec for :before, :after actions" do
-    MSpec.stub!(:unregister)
     MSpec.should_receive(:unregister).with(:before, @formatter)
     MSpec.should_receive(:unregister).with(:after, @formatter)
     @formatter.register

data/spec/runner/formatters/html_spec.rb

@@ -4,6 +4,7 @@ require 'mspec/guards/guard'
 require 'mspec/runner/formatters/html'
 require 'mspec/runner/mspec'
 require 'mspec/runner/example'
+require 'mspec/utils/script'
 
 describe HtmlFormatter do
   before :each do

data/spec/runner/formatters/method_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/method'
 require 'mspec/runner/mspec'
 require 'mspec/runner/example'
+require 'mspec/utils/script'
 
 describe MethodFormatter, "#method_type" do
   before :each do

data/spec/runner/formatters/spinner_spec.rb

@@ -16,10 +16,10 @@ end
 describe SpinnerFormatter, "#register" do
   before :each do
     @formatter = SpinnerFormatter.new
+    MSpec.stub!(:register)
   end
 
   it "registers self with MSpec for appropriate actions" do
-    MSpec.stub!(:register)
     MSpec.should_receive(:register).with(:start, @formatter)
     MSpec.should_receive(:register).with(:load, @formatter)
     MSpec.should_receive(:register).with(:after, @formatter)

data/spec/runner/formatters/unit_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/unit'
 require 'mspec/runner/example'
+require 'mspec/utils/script'
 
 describe UnitdiffFormatter, "#finish" do
   before :each do

data/spec/runner/shared_spec.rb

@@ -1,27 +1,78 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/runner/shared'
+require 'mspec/runner/context'
+require 'mspec/runner/example'
 
 describe Object, "#it_behaves_like" do
   before :each do
-    @recv = Object.new
-    def @recv.before(what)
-      yield
-    end
-    @recv.stub!(:it_should_behave_like)
+    ScratchPad.clear
+
+    @state = ContextState.new "Top level"
+    @state.instance_variable_set :@parsed, true
+
+    @shared = ContextState.new :shared_spec, :shared => true
+    MSpec.stub!(:retrieve_shared).and_return(@shared)
   end
 
   it "creates @method set to the name of the aliased method" do
-    @recv.it_behaves_like "something", :some_method
-    @recv.instance_variable_get(:@method).should == :some_method
+    @shared.it("an example") { ScratchPad.record @method }
+    @state.it_behaves_like :shared_spec, :some_method
+    @state.process
+    ScratchPad.recorded.should == :some_method
   end
 
-  it "creates @object if the passed object is not nil" do
-    @recv.it_behaves_like "something", :some_method, :some_object
-    @recv.instance_variable_get(:@object).should == :some_object
+  it "creates @object if the passed object" do
+    object = Object.new
+    @shared.it("an example") { ScratchPad.record @object }
+    @state.it_behaves_like :shared_spec, :some_method, object
+    @state.process
+    ScratchPad.recorded.should == object
   end
 
   it "sends :it_should_behave_like" do
-    @recv.should_receive(:it_should_behave_like)
-    @recv.it_behaves_like "something", :some_method
+    @state.should_receive(:it_should_behave_like)
+    @state.it_behaves_like :shared_spec, :some_method
+  end
+
+  describe "with multiple shared contexts" do
+    before :each do
+      @obj = Object.new
+      @obj2 = Object.new
+
+      @state2 = ContextState.new "Second top level"
+      @state2.instance_variable_set :@parsed, true
+    end
+
+    it "ensures the shared spec state is distinct" do
+      @shared.it("an example") { ScratchPad.record [@method, @object] }
+
+      @state.it_behaves_like :shared_spec, :some_method, @obj
+
+      @state.process
+      ScratchPad.recorded.should == [:some_method, @obj]
+
+      @state2.it_behaves_like :shared_spec, :another_method, @obj2
+
+      @state2.process
+      ScratchPad.recorded.should == [:another_method, @obj2]
+    end
+
+    it "ensures the shared spec state is distinct for nested shared specs" do
+      nested = ContextState.new "nested context"
+      nested.instance_variable_set :@parsed, true
+      nested.parent = @shared
+
+      nested.it("another example") { ScratchPad.record [:shared, @method, @object] }
+
+      @state.it_behaves_like :shared_spec, :some_method, @obj
+
+      @state.process
+      ScratchPad.recorded.should == [:shared, :some_method, @obj]
+
+      @state2.it_behaves_like :shared_spec, :another_method, @obj2
+
+      @state2.process
+      ScratchPad.recorded.should == [:shared, :another_method, @obj2]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.14
+  version: 1.5.15
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -08:00
+date: 2010-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/mspec/guards/conflict.rb
 - lib/mspec/guards/endian.rb
 - lib/mspec/guards/extensions.rb
+- lib/mspec/guards/feature.rb
 - lib/mspec/guards/guard.rb
 - lib/mspec/guards/noncompliance.rb
 - lib/mspec/guards/platform.rb
@@ -56,6 +57,7 @@ files:
 - lib/mspec/helpers/bignum.rb
 - lib/mspec/helpers/const_lookup.rb
 - lib/mspec/helpers/ducktype.rb
+- lib/mspec/helpers/encode.rb
 - lib/mspec/helpers/enumerator_class.rb
 - lib/mspec/helpers/environment.rb
 - lib/mspec/helpers/fixture.rb
@@ -170,6 +172,7 @@ files:
 - spec/guards/conflict_spec.rb
 - spec/guards/endian_spec.rb
 - spec/guards/extensions_spec.rb
+- spec/guards/feature_spec.rb
 - spec/guards/guard_spec.rb
 - spec/guards/noncompliance_spec.rb
 - spec/guards/platform_spec.rb
@@ -184,6 +187,7 @@ files:
 - spec/helpers/bignum_spec.rb
 - spec/helpers/const_lookup_spec.rb
 - spec/helpers/ducktype_spec.rb
+- spec/helpers/encode_spec.rb
 - spec/helpers/enumerator_class_spec.rb
 - spec/helpers/environment_spec.rb
 - spec/helpers/fixture_spec.rb