mspec 1.5.11 → 1.5.12

data/spec/matchers/have_protected_instance_method_spec.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_protected_instance_method'
+
+class HPIMMSpecs
+  protected
+
+  def protected_method
+  end
+
+  class Subclass < HPIMMSpecs
+    protected
+
+    def protected_sub_method
+    end
+  end
+end
+
+describe HaveProtectedInstanceMethodMatcher do
+  it "inherits from MethodMatcher" do
+    HaveProtectedInstanceMethodMatcher.new(:m).should be_kind_of(MethodMatcher)
+  end
+
+  it "matches when mod has the protected instance method" do
+    matcher = HaveProtectedInstanceMethodMatcher.new :protected_method
+    matcher.matches?(HPIMMSpecs).should be_true
+    matcher.matches?(HPIMMSpecs::Subclass).should be_true
+  end
+
+  it "does not match when mod does not have the protected instance method" do
+    matcher = HaveProtectedInstanceMethodMatcher.new :another_method
+    matcher.matches?(HPIMMSpecs).should be_false
+  end
+
+  it "does not match if the method is in a superclass and include_super is false" do
+    matcher = HaveProtectedInstanceMethodMatcher.new :protected_method, false
+    matcher.matches?(HPIMMSpecs::Subclass).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveProtectedInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.failure_message.should == [
+      "Expected HPIMMSpecs to have protected instance method 'some_method'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveProtectedInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HPIMMSpecs NOT to have protected instance method 'some_method'",
+      "but it does"
+    ]
+  end
+end

data/spec/matchers/have_public_instance_method_spec.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_public_instance_method'
+
+class HPIMMSpecs
+  def public_method
+  end
+
+  class Subclass < HPIMMSpecs
+    def public_sub_method
+    end
+  end
+end
+
+describe HavePublicInstanceMethodMatcher do
+  it "inherits from MethodMatcher" do
+    HavePublicInstanceMethodMatcher.new(:m).should be_kind_of(MethodMatcher)
+  end
+
+  it "matches when mod has the public instance method" do
+    matcher = HavePublicInstanceMethodMatcher.new :public_method
+    matcher.matches?(HPIMMSpecs).should be_true
+    matcher.matches?(HPIMMSpecs::Subclass).should be_true
+  end
+
+  it "does not match when mod does not have the public instance method" do
+    matcher = HavePublicInstanceMethodMatcher.new :another_method
+    matcher.matches?(HPIMMSpecs).should be_false
+  end
+
+  it "does not match if the method is in a superclass and include_super is false" do
+    matcher = HavePublicInstanceMethodMatcher.new :public_method, false
+    matcher.matches?(HPIMMSpecs::Subclass).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HavePublicInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.failure_message.should == [
+      "Expected HPIMMSpecs to have public instance method 'some_method'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HavePublicInstanceMethodMatcher.new :some_method
+    matcher.matches?(HPIMMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HPIMMSpecs NOT to have public instance method 'some_method'",
+      "but it does"
+    ]
+  end
+end

data/spec/matchers/stringsymboladapter_spec.rb

@@ -2,11 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/expectations/expectations'
 require 'mspec/matchers/stringsymboladapter'
 
-class StringSymbolSpecs
+describe StringSymbolAdapter, "#convert_name" do
   include StringSymbolAdapter
-end
 
-describe StringSymbolAdapter, "#convert_name" do
   before :all do
     @verbose = $VERBOSE
     $VERBOSE = nil
@@ -18,8 +16,6 @@ describe StringSymbolAdapter, "#convert_name" do
 
   before :each do
     @ruby_version = Object.const_get :RUBY_VERSION
-
-    @name = mock("name")
   end
 
   after :each do
@@ -28,13 +24,15 @@ describe StringSymbolAdapter, "#convert_name" do
 
   it "converts the name to a string if RUBY_VERSION < 1.9" do
     Object.const_set :RUBY_VERSION, "1.8.6"
-    @name.should_receive(:to_s).and_return("method_name")
-    StringSymbolSpecs.new.convert_name @name
+
+    convert_name("name").should == "name"
+    convert_name(:name).should  == "name"
   end
 
-  it "does not convert the name to a string if RUBY_VERSION >= 1.9" do
+  it "converts the name to a symbol if RUBY_VERSION >= 1.9" do
     Object.const_set :RUBY_VERSION, "1.9.0"
-    @name.should_not_receive(:to_s)
-    StringSymbolSpecs.new.convert_name @name
+
+    convert_name("name").should == :name
+    convert_name(:name).should  == :name
   end
 end

data/spec/mocks/mock_spec.rb

@@ -23,7 +23,7 @@ describe Mock, ".replaced_name" do
   it "returns the name for a method that is being replaced by a mock method" do
     m = mock('a fake id')
     m.stub!(:__id__).and_return(42)
-    Mock.replaced_name(m, :method_call).should == :__ms_42_method_call__
+    Mock.replaced_name(m, :method_call).should == :__mspec_42_method_call__
   end
 end
 
@@ -31,7 +31,7 @@ describe Mock, ".replaced_key" do
   it "returns a key used internally by Mock" do
     m = mock('a fake id')
     m.stub!(:__id__).and_return(42)
-    Mock.replaced_key(m, :method_call).should == [:__ms_42_method_call__, m, :method_call]
+    Mock.replaced_key(m, :method_call).should == [:__mspec_42_method_call__, :method_call]
   end
 end
 
@@ -44,16 +44,16 @@ describe Mock, ".replaced?" do
 
   it "returns true if a method has been stubbed on an object" do
     Mock.install_method @mock, :method_call
-    Mock.replaced?(Mock.replaced_key(@mock, :method_call)).should be_true
+    Mock.replaced?(Mock.replaced_name(@mock, :method_call)).should be_true
   end
 
   it "returns true if a method has been mocked on an object" do
     Mock.install_method @mock, :method_call, :stub
-    Mock.replaced?(Mock.replaced_key(@mock, :method_call)).should be_true
+    Mock.replaced?(Mock.replaced_name(@mock, :method_call)).should be_true
   end
 
   it "returns false if a method has not been stubbed or mocked" do
-    Mock.replaced?(Mock.replaced_key(@mock, :method_call)).should be_false
+    Mock.replaced?(Mock.replaced_name(@mock, :method_call)).should be_false
   end
 end
 

data/spec/runner/exception_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/expectations/expectations'
 require 'mspec/runner/example'
 require 'mspec/runner/exception'
+require 'mspec/utils/script'
 
 describe ExceptionState, "#initialize" do
   it "takes a state, location (e.g. before :each), and exception" do
@@ -110,25 +111,31 @@ end
 
 describe ExceptionState, "#backtrace" do
   before :each do
-    @action = mock("action")
-    def @action.exception(exc)
-      ScratchPad.record exc.exception
+    begin
+      raise Exception
+    rescue Exception => @exception
+      @exc = ExceptionState.new @state, "", @exception
     end
-    MSpec.register :exception, @action
-
-    ScratchPad.clear
-    MSpec.protect("") { raise Exception }
+  end
 
-    @exc = ExceptionState.new @state, "", ScratchPad.recorded
+  after :each do
+    $MSPEC_DEBUG = nil
   end
 
   it "returns a string representation of the exception backtrace" do
     @exc.backtrace.should be_kind_of(String)
   end
 
-  it "strips MSpec files from the backtrace" do
+  it "does not filter files from the backtrace if $MSPEC_DEBUG is true" do
+    $MSPEC_DEBUG = true
+    @exc.backtrace.should == @exception.backtrace.join("\n")
+  end
+
+  it "filters files matching config[:backtrace_filter]" do
+    MSpecScript.set :backtrace_filter, %r[mspec/lib]
+    $MSPEC_DEBUG = nil
     @exc.backtrace.split("\n").each do |line|
-      line.should_not =~ ExceptionState::PATH
+      line.should_not =~ %r[mspec/lib]
     end
   end
 end

data/spec/utils/options_spec.rb

@@ -1290,3 +1290,29 @@ describe "The --spec-gdb option" do
     @config[:gdb].should == true
   end
 end
+
+describe "The -d, --debug option" do
+  before :each do
+    @options, @config = new_option
+    @options.debug
+  end
+
+  after :each do
+    $MSPEC_DEBUG = nil
+  end
+
+  it "is enabled with #debug" do
+    @options.stub!(:on)
+    @options.should_receive(:on).with("-d", "--debug", an_instance_of(String))
+    @options.debug
+  end
+
+  it "sets $MSPEC_DEBUG to true" do
+    ["-d", "--debug"].each do |opt|
+      $MSPEC_DEBUG.should_not be_true
+      @options.parse opt
+      $MSPEC_DEBUG.should be_true
+      $MSPEC_DEBUG = nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.11
+  version: 1.5.12
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-30 00:00:00 -07:00
+date: 2009-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,11 +54,15 @@ files:
 - lib/mspec/helpers/argv.rb
 - lib/mspec/helpers/bignum.rb
 - lib/mspec/helpers/const_lookup.rb
+- lib/mspec/helpers/ducktype.rb
+- lib/mspec/helpers/enumerator_class.rb
 - lib/mspec/helpers/environment.rb
 - lib/mspec/helpers/fixture.rb
 - lib/mspec/helpers/flunk.rb
+- lib/mspec/helpers/hash.rb
 - lib/mspec/helpers/io.rb
 - lib/mspec/helpers/language_version.rb
+- lib/mspec/helpers/metaclass.rb
 - lib/mspec/helpers/ruby_exe.rb
 - lib/mspec/helpers/scratch.rb
 - lib/mspec/helpers/tmp.rb
@@ -77,10 +81,14 @@ files:
 - lib/mspec/matchers/equal.rb
 - lib/mspec/matchers/equal_element.rb
 - lib/mspec/matchers/equal_utf16.rb
+- lib/mspec/matchers/have_class_variable.rb
 - lib/mspec/matchers/have_constant.rb
 - lib/mspec/matchers/have_instance_method.rb
+- lib/mspec/matchers/have_instance_variable.rb
 - lib/mspec/matchers/have_method.rb
 - lib/mspec/matchers/have_private_instance_method.rb
+- lib/mspec/matchers/have_protected_instance_method.rb
+- lib/mspec/matchers/have_public_instance_method.rb
 - lib/mspec/matchers/include.rb
 - lib/mspec/matchers/match_yaml.rb
 - lib/mspec/matchers/method.rb
@@ -89,6 +97,7 @@ files:
 - lib/mspec/matchers/raise_error.rb
 - lib/mspec/matchers/respond_to.rb
 - lib/mspec/matchers/stringsymboladapter.rb
+- lib/mspec/matchers/variable.rb
 - lib/mspec/matchers.rb
 - lib/mspec/mocks/mock.rb
 - lib/mspec/mocks/object.rb
@@ -168,9 +177,12 @@ files:
 - spec/helpers/argv_spec.rb
 - spec/helpers/bignum_spec.rb
 - spec/helpers/const_lookup_spec.rb
+- spec/helpers/ducktype_spec.rb
+- spec/helpers/enumerator_class_spec.rb
 - spec/helpers/environment_spec.rb
 - spec/helpers/fixture_spec.rb
 - spec/helpers/flunk_spec.rb
+- spec/helpers/hash_spec.rb
 - spec/helpers/io_spec.rb
 - spec/helpers/language_version_spec.rb
 - spec/helpers/ruby_exe_spec.rb
@@ -190,10 +202,14 @@ files:
 - spec/matchers/equal_element_spec.rb
 - spec/matchers/equal_spec.rb
 - spec/matchers/equal_utf16_spec.rb
+- spec/matchers/have_class_variable_spec.rb
 - spec/matchers/have_constant_spec.rb
 - spec/matchers/have_instance_method_spec.rb
+- spec/matchers/have_instance_variable_spec.rb
 - spec/matchers/have_method_spec.rb
 - spec/matchers/have_private_instance_method_spec.rb
+- spec/matchers/have_protected_instance_method_spec.rb
+- spec/matchers/have_public_instance_method_spec.rb
 - spec/matchers/include_spec.rb
 - spec/matchers/match_yaml_spec.rb
 - spec/matchers/output_spec.rb