expectations 1.0.0 → 1.1.0

data/lib/expectations/mock_recorder.rb

@@ -20,10 +20,6 @@ module Expectations::MockRecorder
     subject
   end
   
-  def verify
-    subject.verify
-  end
-  
   def mocha_error_message(ex)
     ex.message
   end

data/lib/expectations/recorded_expectation.rb

@@ -6,7 +6,7 @@ module Expectations::RecordedExpectation
       warn_for_expects do
         instance_exec(expected.subject, &block) if block
       end
-      if expected.verify! && mocha_verify
+      if mocha_verify
         self.extend(Expectations::Results::Fulfilled)
       else
         self.extend(Expectations::Results::StateBasedFailure)

data/lib/expectations/standard_error.rb

@@ -1,12 +1,22 @@
 class Expectations::StandardError
+  class << self
+    attr_accessor :outlet
+  end
+  
+  self.outlet = STDERR
+  
+  def self.silence
+    self.outlet = Silent
+  end
+  
   def self.print(string)
     print_suggestion
-    STDERR.print string
+    outlet.print string
   end
   
   def self.print_suggestion
     return if @suggestion_printed
     @suggestion_printed = true
-    STDERR.print "Expectations allows you to to create multiple mock expectations, but suggests that you write another test instead.\n"
+    outlet.print "Expectations allows you to to create multiple mock expectations, but suggests that you write another test instead.\n"
   end
 end

data/lib/expectations/suite.rb

@@ -1,6 +1,9 @@
 class Expectations::Suite
   
   include Mocha::Standalone
+  class << self
+    attr_accessor :silent
+  end
   
   def initialize
     @do_not_run = false
@@ -21,7 +24,7 @@ class Expectations::Suite
   end
   
   def expect(expected, &block)
-    expectations << Expectations::Expectation.new(expected, *caller.first.split(/:/)[0..1], &block)
+    expectations << Expectations::Expectation.new(expected, *caller.first.match(/\A(.+):(\d+)\Z/)[1..2], &block)
   end
   
   def do_not_run

data/rakefile.rb

@@ -46,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-  s.version = "1.0.0"
+  s.version = "1.1.0"
   s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

data/test/expectations/results_test.rb

@@ -1,69 +1,20 @@
 require File.dirname(__FILE__) + "/../test_helper"
 
 Expectations do
-
-  expect "." do
-    Object.new.extend(Expectations::Results::Fulfilled).char
-  end
-
-  expect "F" do
-    Object.new.extend(Expectations::Results::StateBasedFailure).char
-  end
-
-  expect "F" do
-    Object.new.extend(Expectations::Results::BehaviorBasedFailure).char
-  end
-
-  expect "E" do
-    Object.new.extend(Expectations::Results::Error).char
-  end
-
-  expect Object.new.to.be.fulfilled? do |instance|
-    instance.extend(Expectations::Results::Fulfilled)
-  end
-
-  expect Object.new.not.to.be.fulfilled? do |instance|
-    instance.extend(Expectations::Results::StateBasedFailure)
-  end
-
-  expect Object.new.not.to.be.fulfilled? do |instance|
-    instance.extend(Expectations::Results::BehaviorBasedFailure)
-  end
-
-  expect Object.new.not.to.be.fulfilled? do |instance|
-    instance.extend(Expectations::Results::Error)
-  end
-
-  expect Object.new.not.to.be.error? do |instance|
-    instance.extend(Expectations::Results::Fulfilled)
-  end
-
-  expect Object.new.not.to.be.error? do |instance|
-    instance.extend(Expectations::Results::StateBasedFailure)
-  end
-
-  expect Object.new.not.to.be.error? do |instance|
-    instance.extend(Expectations::Results::BehaviorBasedFailure)
-  end
-
-  expect Object.new.to.be.error? do |instance|
-    instance.extend(Expectations::Results::Error)
-  end
-
-  expect Object.new.not.to.be.failure? do |instance|
-    instance.extend(Expectations::Results::Fulfilled)
-  end
-
-  expect Object.new.to.be.failure? do |instance|
-    instance.extend(Expectations::Results::StateBasedFailure)
-  end
-
-  expect Object.new.to.be.failure? do |instance|
-    instance.extend(Expectations::Results::BehaviorBasedFailure)
-  end
-
-  expect Object.new.not.to.be.failure? do |instance|
-    instance.extend(Expectations::Results::Error)
-  end
-
+  expect Object.new.extend(Expectations::Results::Fulfilled).to.have.char == "."
+  expect Object.new.extend(Expectations::Results::StateBasedFailure).to.have.char == "F"
+  expect Object.new.extend(Expectations::Results::BehaviorBasedFailure).to.have.char == "F"
+  expect Object.new.extend(Expectations::Results::Error).to.have.char == "E"
+  expect Object.new.extend(Expectations::Results::Fulfilled).to.be.fulfilled?
+  expect Object.new.extend(Expectations::Results::StateBasedFailure).not.to.be.fulfilled?
+  expect Object.new.extend(Expectations::Results::BehaviorBasedFailure).not.to.be.fulfilled?
+  expect Object.new.extend(Expectations::Results::Error).not.to.be.fulfilled?
+  expect Object.new.extend(Expectations::Results::Fulfilled).not.to.be.error?
+  expect Object.new.extend(Expectations::Results::StateBasedFailure).not.to.be.error?
+  expect Object.new.extend(Expectations::Results::BehaviorBasedFailure).not.to.be.error?
+  expect Object.new.extend(Expectations::Results::Error).to.be.error?
+  expect Object.new.extend(Expectations::Results::Fulfilled).not.to.be.failure?
+  expect Object.new.extend(Expectations::Results::StateBasedFailure).to.be.failure?
+  expect Object.new.extend(Expectations::Results::BehaviorBasedFailure).to.be.failure?
+  expect Object.new.extend(Expectations::Results::Error).not.to.be.failure?
 end

data/test/expectations/xml_string_test.rb

@@ -1,17 +1,9 @@
 require File.dirname(__FILE__) + "/../test_helper"
 
 Expectations do
-  expect true do
-    Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "<foo>bar</foo>"
-  end
-
-  expect false do
-    Expectations::XmlString.new("<foo>not bar</foo>").expectations_equal_to "<foo>bar</foo>"
-  end
-
-  expect false do
-    Expectations::XmlString.new("<not-foo>bar</not-foo>").expectations_equal_to "<foo>bar</foo>"
-  end
+  expect Expectations::XmlString.new("<foo>bar</foo>").to.be.expectations_equal_to("<foo>bar</foo>")
+  expect Expectations::XmlString.new("<foo>not bar</foo>").not.to.be.expectations_equal_to("<foo>bar</foo>")
+  expect Expectations::XmlString.new("<not-foo>bar</not-foo>").not.to.be.expectations_equal_to("<foo>bar</foo>")
 
   expect true do
     Expectations::XmlString.new("<foo>bar</foo>").expectations_equal_to "  <foo>bar</foo>  "

data/test/failures_test.rb

@@ -12,10 +12,11 @@ Expectations do
     suite.expect(ArgumentError) { Object.no_method }
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::BehaviorBasedFailure do
+    Expectations::StandardError.silence
     suite = Expectations::Suite.new
-    suite.expect Mocha::Mock.new.to.receive(:dial).with("2125551212").times(2) do |phone|
+    suite.expect mock.to.receive(:dial).with("2125551212").times(2) do |phone|
       phone.dial("2125551212")
       phone.dial("2125551212")
       phone.dial("2125551212")
@@ -26,25 +27,25 @@ Expectations do
   expect Expectations::Results::BehaviorBasedFailure do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
-    suite.expect Mocha::Mock.new.to.receive(:dial).with("2125551212").times(2) do |phone| 
+    suite.expect mock.to.receive(:dial).with("2125551212").times(2) do |phone| 
       phone.dial("2125551212")
     end
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::BehaviorBasedFailure do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
     suite.expect(Object.to.receive(:deal)) {  }
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::Error do
     suite = Expectations::Suite.new
     suite.expect(2) { stub(:two => 2).twos }
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::Error do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
@@ -54,7 +55,7 @@ Expectations do
     end
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::Error do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
@@ -64,7 +65,7 @@ Expectations do
     end
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::Error do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
@@ -73,7 +74,7 @@ Expectations do
     end
     suite.execute(Silent).expectations.first
   end
-
+  
   expect Expectations::Results::Error do
     Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
@@ -102,5 +103,5 @@ Expectations do
     end
     suite.execute(Silent).expectations.first
   end
-  
+   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-18 00:00:00 +01:00
+date: 2008-07-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency