rspec-expectations 2.0.0.a6 → 2.0.0.a7

data/.gitignore

@@ -4,3 +4,4 @@ coverage
 rdoc
 pkg
 doc
+tmp

data/Rakefile

@@ -9,11 +9,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-expectations"
     gem.version = Rspec::Expectations::Version::STRING
-    gem.summary = "rspec expectations (should[_not] and matchers)"
+    gem.summary = "rspec-expectations-#{Rspec::Expectations::Version::STRING}"
+    gem.description = "rspec expectations (should[_not] and matchers)"
     gem.rubyforge_project = "rspec"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/expectations"
     gem.authors = ["David Chelimsky", "Chad Humphries"]    
+    gem.add_development_dependency('cucumber', ">= 0.6.2")
+    gem.add_development_dependency('aruba', ">= 0.1.1")
     gem.add_development_dependency('rspec-core', ">= #{Rspec::Expectations::Version::STRING}")
     gem.add_development_dependency('rspec-mocks', ">= #{Rspec::Expectations::Version::STRING}")
   end
@@ -31,7 +34,14 @@ rescue LoadError
   puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
 end
 
-task :default => [:check_dependencies, :spec]
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format progress}
+end
+
+
+task :default => [:check_dependencies, :spec, :cucumber]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -0,0 +1 @@
+2.0.0.a7

data/features/expectations/customized_message.feature

@@ -0,0 +1,56 @@
+Feature: customized message
+
+  In order to get the feedback I want
+  As an RSpec user
+  I want to customize the failure message per example
+  
+  Scenario: one additional method
+    Given a file named "node_spec.rb" with:
+      """
+      require "rspec/expectations"
+
+      class Node
+        def initialize(state=:waiting)
+          @state = state
+        end
+        def state
+          @state
+        end
+        def waiting?
+          @state == :waiting
+        end
+        def started?
+          @state == :started
+        end
+        def start
+          @state = :started
+        end
+      end
+
+      describe "a new Node" do
+        it "should be waiting" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          node.should be_waiting, "node.state: #{node.state} (first example)"
+        end
+
+        it "should not be started" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          node.should_not be_started, "node.state: #{node.state} (second example)"
+        end
+      end
+
+      describe "node.start" do
+        it "should change the state" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          lambda {node.start}.should change{node.state}, "expected a change"
+        end
+      end
+
+      """
+    When I run "rspec node_spec.rb --format n"
+    Then I should see "3 examples, 3 failures"
+    And  I should not see "to return true, got false"
+    And  I should not see "to return false, got true"
+    And  I should see "node.state: started (first example)"
+    And  I should see "node.state: started (second example)"
+    And  I should see "expected a change"

data/features/matchers/define_matcher.feature

@@ -0,0 +1,193 @@
+Feature: define matcher
+
+  In order to express my domain clearly in my code examples
+  As an RSpec user
+  I want a shortcut to define custom matchers
+
+  Scenario: define a matcher with default messages
+    Given a file named "matcher_with_default_message_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+      end
+
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+
+      """
+    When I run "rspec matcher_with_default_message_spec.rb --format specdoc"
+    Then the exit status should not be 0
+
+    And I should see "should be a multiple of 3"
+    And I should see "should not be a multiple of 4"
+    And I should see "Failure/Error: it {should be_a_multiple_of(4)}"
+    And I should see "Failure/Error: it {should_not be_a_multiple_of(3)}"
+
+    And I should see "4 examples, 2 failures"
+    And I should see "expected 9 to be a multiple of 4"
+    And I should see "expected 9 not to be a multiple of 3"
+
+  Scenario: overriding the failure_message_for_should
+    Given a file named "matcher_with_failure_message_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should do |actual|
+          "expected that #{actual} would be a multiple of #{expected}"
+        end
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+      """
+    When I run "rspec matcher_with_failure_message_spec.rb"
+    Then the exit status should not be 0
+    And the stdout should contain "1 example, 1 failure"
+    And the stdout should contain "expected that 9 would be a multiple of 4"
+
+  Scenario: overriding the failure_message_for_should_not
+    Given a file named "matcher_with_failure_for_message_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should_not do |actual|
+          "expected that #{actual} would not be a multiple of #{expected}"
+        end
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+      """
+    When I run "rspec matcher_with_failure_for_message_spec.rb"
+    Then the exit status should not be 0
+    And the stdout should contain "1 example, 1 failure"
+    And the stdout should contain "expected that 9 would not be a multiple of 3"
+
+  Scenario: overriding the description
+    Given a file named "matcher_overriding_description_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        description do
+          "be multiple of #{expected}"
+        end
+      end
+
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+      """
+    When I run "rspec matcher_overriding_description_spec.rb --format specdoc"
+    Then the exit status should be 0
+    And the stdout should contain "2 examples, 0 failures"
+    And the stdout should contain "should be multiple of 3"
+    And the stdout should contain "should not be multiple of 4"
+
+  Scenario: with no args
+    Given a file named "matcher_with_no_args_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :have_7_fingers do
+        match do |thing|
+          thing.fingers.length == 7
+        end
+      end
+
+      class Thing
+        def fingers; (1..7).collect {"finger"}; end
+      end
+
+      describe Thing do
+        it {should have_7_fingers}
+      end
+      """
+    When I run "rspec matcher_with_no_args_spec.rb --format specdoc"
+    Then the exit status should be 0
+    And the stdout should contain "1 example, 0 failures"
+    And the stdout should contain "should have 7 fingers"
+
+  Scenario: with multiple args
+    Given a file named "matcher_with_multiple_args_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :be_the_sum_of do |a,b,c,d|
+        match do |sum|
+          a + b + c + d == sum
+        end
+      end
+
+      describe 10 do
+        it {should be_the_sum_of(1,2,3,4)}
+      end
+      """
+    When I run "rspec matcher_with_multiple_args_spec.rb --format specdoc"
+    Then the exit status should be 0
+    And the stdout should contain "1 example, 0 failures"
+    And the stdout should contain "should be the sum of 1, 2, 3, and 4"
+
+  Scenario: with helper methods
+    Given a file named "matcher_with_internal_helper_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      Rspec::Matchers.define :have_same_elements_as do |sample|
+        match do |actual|
+          similar?(sample, actual)
+        end
+
+        def similar?(a, b)
+          a.sort == b.sort
+        end
+      end
+
+      describe "these two arrays" do
+        specify "should be similar" do
+          [1,2,3].should have_same_elements_as([2,3,1])
+        end
+      end
+      """
+    When I run "rspec matcher_with_internal_helper_spec.rb"
+    Then the exit status should be 0
+    And the stdout should contain "1 example, 0 failures"
+

data/features/matchers/define_matcher_outside_rspec.feature

@@ -0,0 +1,38 @@
+Feature: define matcher outside rspec
+
+  In order to express my domain clearly in my code examples
+  As a non-rspec user
+  I want a shortcut to define custom matchers
+
+  Scenario: define a matcher with default messages
+    Given a file named "test_multiples.rb" with:
+      """
+      require "rspec/expectations"
+      require "test/unit"
+      
+      Rspec::Matchers.define :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+      end
+      
+      class Test::Unit::TestCase
+        include Rspec::Matchers
+      end
+      
+      class TestMultiples < Test::Unit::TestCase
+      
+        def test_9_should_be_a_multiple_of_3
+          9.should be_a_multiple_of(3)
+        end
+
+        def test_9_should_be_a_multiple_of_4
+          9.should be_a_multiple_of(4)
+        end
+        
+      end
+      """
+    When I run "ruby test_multiples.rb"
+    Then the exit status should not be 0 
+    And I should see "expected 9 to be a multiple of 4"
+    And I should see "2 tests, 0 assertions, 0 failures, 1 errors"

data/features/support/env.rb

@@ -0,0 +1,5 @@
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+require 'rspec/expectations'
+require 'aruba'
+
+

data/lib/rspec/expectations/version.rb

@@ -1,16 +1,7 @@
 module Rspec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
-      unless defined?(MAJOR)
-        MAJOR  = 2
-        MINOR  = 0
-        TINY   = 0
-        PRE    = 'a6'
-
-        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-
-        SUMMARY = "rspec-expectations " + STRING
-      end
+      STRING = File.read(File.expand_path('../../../../VERSION', __FILE__))
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -190,5 +190,10 @@ module Rspec
   #     config.include(CustomGameMatchers)
   #   end
   #
-  module Matchers; end
+  module Matchers
+    if Rspec.respond_to?(:configure)
+      Rspec.configure {|c| c.include self}
+    end
+  end
 end
+

data/rspec-expectations.gemspec

@@ -5,11 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.a6"
+  s.version = "2.0.0.a7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-20}
+  s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -21,6 +22,11 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "Upgrade.markdown",
+     "VERSION",
+     "features/expectations/customized_message.feature",
+     "features/matchers/define_matcher.feature",
+     "features/matchers/define_matcher_outside_rspec.feature",
+     "features/support/env.rb",
      "lib/rspec/expectations.rb",
      "lib/rspec/expectations/differs/default.rb",
      "lib/rspec/expectations/differs/load-diff-lcs.rb",
@@ -97,7 +103,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{rspec expectations (should[_not] and matchers)}
+  s.summary = %q{rspec-expectations-2.0.0.a7}
   s.test_files = [
     "spec/rspec/expectations/differs/default_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -137,15 +143,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
+      s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a7"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
     else
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+      s.add_dependency(%q<cucumber>, [">= 0.6.2"])
+      s.add_dependency(%q<aruba>, [">= 0.1.1"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a7"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
     end
   else
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a6"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+    s.add_dependency(%q<cucumber>, [">= 0.6.2"])
+    s.add_dependency(%q<aruba>, [">= 0.1.1"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a7"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
   end
 end
 

data/spec/spec_helper.rb

@@ -38,6 +38,5 @@ end
 Rspec::configure do |config|
   config.mock_with(:rspec)
   config.include Rspec::Mocks::Methods
-  config.include Rspec::Matchers
   config.color_enabled = true
 end

data/spec/support/classes.rb

@@ -1,12 +1,6 @@
 # This file contains various classes used by the specs.
 module Rspec
   module Expectations
-    # class ClassWithMultiWordPredicate
-    #   def multi_word_predicate?
-    #     true 
-    #   end
-    # end
-    # 
     module Helper
       class CollectionWithSizeMethod
         def initialize; @list = []; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a6
+  version: 2.0.0.a7
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,9 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -04:00
+date: 2010-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-core
   type: :development
@@ -21,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a6
+        version: 2.0.0.a7
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,9 +51,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a6
+        version: 2.0.0.a7
     version: 
-description: 
+description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
 
@@ -48,6 +68,11 @@ files:
 - README.markdown
 - Rakefile
 - Upgrade.markdown
+- VERSION
+- features/expectations/customized_message.feature
+- features/matchers/define_matcher.feature
+- features/matchers/define_matcher_outside_rspec.feature
+- features/support/env.rb
 - lib/rspec/expectations.rb
 - lib/rspec/expectations/differs/default.rb
 - lib/rspec/expectations/differs/load-diff-lcs.rb
@@ -145,7 +170,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec expectations (should[_not] and matchers)
+summary: rspec-expectations-2.0.0.a7
 test_files: 
 - spec/rspec/expectations/differs/default_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb