mspec 1.0.0 → 1.1.0

data/lib/mspec/utils/options.rb

@@ -122,13 +122,6 @@ class MSpecOptions
     end
   end
 
-  def add_tags_dir
-    on("-X", "--tags-dir DIR", String,
-       "Use DIR as the path prefix for locating spec tag files") do |d|
-      @config[:tags_dir] = d
-    end
-  end
-
   def add_formatters
     on("-f", "--format FORMAT", String,
        "Formatter for reporting, where FORMAT is one of:") do |o|

data/lib/mspec/utils/script.rb

@@ -4,7 +4,10 @@ require 'mspec/runner/formatters/dotted'
 
 class MSpecScript
   def self.config
-    @config ||= { :path => ['.', 'spec'] }
+    @config ||= {
+      :path => ['.', 'spec'],
+      :config_ext => '.mspec'
+    }
   end
 
   def self.set(key, value)
@@ -32,11 +35,18 @@ class MSpecScript
   end
 
   def load(name)
-    return Kernel.load(name) if File.exist?(File.expand_path(name))
+    names = [name]
+    unless name[-6..-1] == config[:config_ext]
+      names << name + config[:config_ext]
+    end
+
+    names.each do |name|
+      return Kernel.load(name) if File.exist?(File.expand_path(name))
 
-    config[:path].each do |dir|
-      file = File.join dir, name
-      return Kernel.load(file) if File.exist? file
+      config[:path].each do |dir|
+        file = File.join dir, name
+        return Kernel.load(file) if File.exist? file
+      end
     end
   end
 

data/lib/mspec/version.rb

@@ -1,3 +1,3 @@
 module MSpec
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/commands/mspec_ci_spec.rb

@@ -27,11 +27,6 @@ describe MSpecCI, "#options" do
     @script.options
   end
 
-  it "enables the tags dir option" do
-    @options.should_receive(:add_tags_dir)
-    @script.options
-  end
-
   it "enables the dry run option" do
     @options.should_receive(:add_pretend)
     @script.options
@@ -94,9 +89,9 @@ describe MSpecCI, "#run" do
     @script.options
   end
 
-  it "registers the tags directory path" do
-    @config[:tags_dir] = "tags_dir"
-    MSpec.should_receive(:register_tags_path).with("tags_dir")
+  it "registers the tags patterns" do
+    @config[:tags_patterns] = [/spec/, "tags"]
+    MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"])
     @script.run
   end
 

data/spec/commands/mspec_run_spec.rb

@@ -38,11 +38,6 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
-  it "enables the tags dir option" do
-    @options.should_receive(:add_tags_dir)
-    @script.options @argv
-  end
-
   it "enables the randomize option to runs specs in random order" do
     @options.should_receive(:add_randomize)
     @script.options @argv
@@ -122,9 +117,9 @@ describe MSpecRun, "#run" do
     @script.options
   end
 
-  it "registers the tags directory path" do
-    @config[:tags_dir] = "tags_dir"
-    MSpec.should_receive(:register_tags_path).with("tags_dir")
+  it "registers the tags patterns" do
+    @config[:tags_patterns] = [/spec/, "tags"]
+    MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"])
     @script.run
   end
 

data/spec/commands/mspec_tag_spec.rb

@@ -38,11 +38,6 @@ describe MSpecTag, "#options" do
     @script.options @argv
   end
 
-  it "enables the tags dir option" do
-    @options.should_receive(:add_tags_dir)
-    @script.options @argv
-  end
-
   it "enables the dry run option" do
     @options.should_receive(:add_pretend)
     @script.options @argv
@@ -107,9 +102,9 @@ describe MSpecTag, "#run" do
     @script.options
   end
 
-  it "registers the tags directory path" do
-    @config[:tags_dir] = "tags_dir"
-    MSpec.should_receive(:register_tags_path).with("tags_dir")
+  it "registers the tags patterns" do
+    @config[:tags_patterns] = [/spec/, "tags"]
+    MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"])
     @script.run
   end
 

data/spec/helpers/const_lookup_spec.rb

@@ -1,9 +1,20 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/helpers/const_lookup'
 
+CONST = 2
+
 module ConstLookupSpecs
   class A
     class B
+      CONST = 1
+    end
+
+    class C; end
+
+    class D
+      def self.const_missing(const)
+        A::B::CONST
+      end
     end
   end
 end
@@ -16,4 +27,22 @@ describe Kernel, "#const_lookup" do
   it "returns a regular constant specified without scoping" do
     const_lookup("ConstLookupSpecs").should == ConstLookupSpecs
   end
+
+  it "returns an explicit toplevel constant" do
+    const_lookup("::ConstLookupSpecs").should == ConstLookupSpecs
+  end
+
+  it "returns the constant from the proper scope" do
+    const_lookup("ConstLookupSpecs::A::B::CONST").should == 1
+  end
+
+  it "raises NameError if the constant is not contained within the module's scope" do
+    lambda {
+      const_lookup("ConstLookupSpecs::A::C::CONST")
+    }.should raise_error(NameError)
+  end
+
+  it "returns the value of #const_missing" do
+    const_lookup("ConstLookupSpecs::A::D::CONST").should == 1
+  end
 end

data/spec/matchers/base_spec.rb

@@ -7,13 +7,16 @@ describe PositiveOperatorMatcher, "== operator" do
   it "raises an ExpectationNotMetError when expected == actual returns false" do
     lambda {
       PositiveOperatorMatcher.new(1) == 2
-    }.should raise_error(ExpectationNotMetError, "Expected 1 to equal 2")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x to equal y'" do
+    Expectation.should_receive(:fail_with).with("Expected 1\n", "to equal 2\n")
+    PositiveOperatorMatcher.new(1) == 2
   end
 
   it "does not raise an exception when expected == actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new(1) == 1
-    }.should_not raise_error
+    PositiveOperatorMatcher.new(1) == 1
   end
 end
 
@@ -21,13 +24,16 @@ describe PositiveOperatorMatcher, "=~ operator" do
   it "raises an ExpectationNotMetError when expected =~ actual returns false" do
     lambda {
       PositiveOperatorMatcher.new('real') =~ /fake/
-    }.should raise_error(ExpectationNotMetError, %(Expected "real" to match /fake/))
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected \"x\" to match y'" do
+    Expectation.should_receive(:fail_with).with("Expected \"real\"\n", "to match /fake/\n")
+    PositiveOperatorMatcher.new('real') =~ /fake/
   end
 
   it "does not raise an exception when expected =~ actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new('real') =~ /real/
-    }.should_not raise_error
+    PositiveOperatorMatcher.new('real') =~ /real/
   end
 end
 
@@ -35,13 +41,16 @@ describe PositiveOperatorMatcher, "> operator" do
   it "raises an ExpectationNotMetError when expected > actual returns false" do
     lambda {
       PositiveOperatorMatcher.new(4) > 5
-    }.should raise_error(ExpectationNotMetError, "Expected 4 to be greater than 5")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x to be greater than y'" do
+    Expectation.should_receive(:fail_with).with("Expected 4\n", "to be greater than 5\n")
+    PositiveOperatorMatcher.new(4) > 5
   end
 
   it "does not raise an exception when expected > actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new(5) > 4
-    }.should_not raise_error
+    PositiveOperatorMatcher.new(5) > 4
   end
 end
 
@@ -49,14 +58,17 @@ describe PositiveOperatorMatcher, ">= operator" do
   it "raises an ExpectationNotMetError when expected >= actual returns false" do
     lambda {
       PositiveOperatorMatcher.new(4) >= 5
-    }.should raise_error(ExpectationNotMetError, "Expected 4 to be greater than or equal to 5")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x to be greater than or equal to y'" do
+    Expectation.should_receive(:fail_with).with("Expected 4\n", "to be greater than or equal to 5\n")
+    PositiveOperatorMatcher.new(4) >= 5
   end
 
   it "does not raise an exception when expected > actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new(5) >= 4
-      PositiveOperatorMatcher.new(5) >= 5
-    }.should_not raise_error
+    PositiveOperatorMatcher.new(5) >= 4
+    PositiveOperatorMatcher.new(5) >= 5
   end
 end
 
@@ -64,13 +76,16 @@ describe PositiveOperatorMatcher, "< operater" do
   it "raises an ExpectationNotMetError when expected < actual returns false" do
     lambda {
       PositiveOperatorMatcher.new(5) < 4
-    }.should raise_error(ExpectationNotMetError, "Expected 5 to be less than 4")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x to be less than y'" do
+    Expectation.should_receive(:fail_with).with("Expected 5\n", "to be less than 4\n")
+    PositiveOperatorMatcher.new(5) < 4
   end
 
   it "does not raise an exception when expected < actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new(4) < 5
-    }.should_not raise_error
+    PositiveOperatorMatcher.new(4) < 5
   end
 end
 
@@ -78,14 +93,17 @@ describe PositiveOperatorMatcher, "<= operater" do
   it "raises an ExpectationNotMetError when expected < actual returns false" do
     lambda {
       PositiveOperatorMatcher.new(5) <= 4
-    }.should raise_error(ExpectationNotMetError, "Expected 5 to be less than or equal to 4")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x to be less than or equal to y'" do
+    Expectation.should_receive(:fail_with).with("Expected 5\n", "to be less than or equal to 4\n")
+    PositiveOperatorMatcher.new(5) <= 4
   end
 
   it "does not raise an exception when expected < actual returns true" do
-    lambda {
-      PositiveOperatorMatcher.new(4) <= 5
-      PositiveOperatorMatcher.new(4) <= 4
-    }.should_not raise_error
+    PositiveOperatorMatcher.new(4) <= 5
+    PositiveOperatorMatcher.new(4) <= 4
   end
 end
 
@@ -93,13 +111,16 @@ describe NegativeOperatorMatcher, "== operator" do
   it "raises an ExpectationNotMetError when expected == actual returns true" do
     lambda {
       NegativeOperatorMatcher.new(1) == 1
-    }.should raise_error(ExpectationNotMetError, "Expected 1 not to equal 1")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x not to equal y'" do
+    Expectation.should_receive(:fail_with).with("Expected 1\n", "not to equal 1\n")
+    NegativeOperatorMatcher.new(1) == 1
   end
 
   it "does not raise an exception when expected == actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new(1) == 2
-    }.should_not raise_error
+    NegativeOperatorMatcher.new(1) == 2
   end
 end
 
@@ -107,13 +128,16 @@ describe NegativeOperatorMatcher, "=~ operator" do
   it "raises an ExpectationNotMetError when expected =~ actual returns true" do
     lambda {
       NegativeOperatorMatcher.new('real') =~ /real/
-    }.should raise_error(ExpectationNotMetError, %(Expected "real" not to match /real/))
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected \"x\" not to match /y/'" do
+    Expectation.should_receive(:fail_with).with("Expected \"real\"\n", "not to match /real/\n")
+    NegativeOperatorMatcher.new('real') =~ /real/
   end
 
   it "does not raise an exception when expected =~ actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new('real') =~ /fake/
-    }.should_not raise_error
+    NegativeOperatorMatcher.new('real') =~ /fake/
   end
 end
 
@@ -121,13 +145,16 @@ describe NegativeOperatorMatcher, "< operator" do
   it "raises an ExpectationNotMetError when expected < actual returns true" do
     lambda {
       NegativeOperatorMatcher.new(4) < 5
-    }.should raise_error(ExpectationNotMetError, "Expected 4 not to be less than 5")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x not to be less than y'" do
+    Expectation.should_receive(:fail_with).with("Expected 4\n", "not to be less than 5\n")
+    NegativeOperatorMatcher.new(4) < 5
   end
 
   it "does not raise an exception when expected < actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new(5) < 4
-    }.should_not raise_error
+    NegativeOperatorMatcher.new(5) < 4
   end
 end
 
@@ -135,16 +162,19 @@ describe NegativeOperatorMatcher, "<= operator" do
   it "raises an ExpectationNotMetError when expected <= actual returns true" do
     lambda {
       NegativeOperatorMatcher.new(4) <= 5
-    }.should raise_error(ExpectationNotMetError, "Expected 4 not to be less than or equal to 5")
+    }.should raise_error(ExpectationNotMetError)
     lambda {
       NegativeOperatorMatcher.new(5) <= 5
-    }.should raise_error(ExpectationNotMetError, "Expected 5 not to be less than or equal to 5")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x not to be less than or equal to y'" do
+    Expectation.should_receive(:fail_with).with("Expected 4\n", "not to be less than or equal to 5\n")
+    NegativeOperatorMatcher.new(4) <= 5
   end
 
   it "does not raise an exception when expected <= actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new(5) <= 4
-    }.should_not raise_error
+    NegativeOperatorMatcher.new(5) <= 4
   end
 end
 
@@ -152,13 +182,16 @@ describe NegativeOperatorMatcher, "> operator" do
   it "raises an ExpectationNotMetError when expected > actual returns true" do
     lambda {
       NegativeOperatorMatcher.new(5) > 4
-    }.should raise_error(ExpectationNotMetError, "Expected 5 not to be greater than 4")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x not to be greater than y'" do
+    Expectation.should_receive(:fail_with).with("Expected 5\n", "not to be greater than 4\n")
+    NegativeOperatorMatcher.new(5) > 4
   end
 
   it "does not raise an exception when expected > actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new(4) > 5
-    }.should_not raise_error
+    NegativeOperatorMatcher.new(4) > 5
   end
 end
 
@@ -166,15 +199,18 @@ describe NegativeOperatorMatcher, ">= operator" do
   it "raises an ExpectationNotMetError when expected >= actual returns true" do
     lambda {
       NegativeOperatorMatcher.new(5) >= 4
-    }.should raise_error(ExpectationNotMetError, "Expected 5 not to be greater than or equal to 4")
+    }.should raise_error(ExpectationNotMetError)
     lambda {
       NegativeOperatorMatcher.new(5) >= 5
-    }.should raise_error(ExpectationNotMetError, "Expected 5 not to be greater than or equal to 5")
+    }.should raise_error(ExpectationNotMetError)
+  end
+
+  it "provides a failure message that 'Expected x not to be greater than or equal to y'" do
+    Expectation.should_receive(:fail_with).with("Expected 5\n", "not to be greater than or equal to 4\n")
+    NegativeOperatorMatcher.new(5) >= 4
   end
 
   it "does not raise an exception when expected >= actual returns false" do
-    lambda {
-      NegativeOperatorMatcher.new(4) >= 5
-    }.should_not raise_error
+    NegativeOperatorMatcher.new(4) >= 5
   end
 end

data/spec/matchers/eql_spec.rb

@@ -22,12 +22,12 @@ describe EqlMatcher do
   it "provides a useful failure message" do
     matcher = EqlMatcher.new("red")
     matcher.matches?("red")
-    matcher.failure_message.should == ["Expected \"red\"", "to have same value and type as \"red\""]
+    matcher.failure_message.should == ["Expected \"red\"\n", "to have same value and type as \"red\"\n"]
   end
 
   it "provides a useful negative failure message" do
     matcher = EqlMatcher.new(1)
     matcher.matches?(1.0)
-    matcher.negative_failure_message.should == ["Expected 1.0", "not to have same value or type as 1"]
+    matcher.negative_failure_message.should == ["Expected 1.0\n", "not to have same value or type as 1\n"]
   end
 end