watirsplash 1.4.2 → 1.4.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 1.4.3 / 2011-06-05
+
+ * fix #change matcher in conjunction with #within for rspec 2.6.0
+
 === Version 1.4.2 / 2011-06-01
 
  * handle correctly RSpec shared examples by html formatter

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/lib/watirsplash/rspec_patches.rb

@@ -78,13 +78,15 @@ module RSpec::Matchers
   class Change
     def matches?(event_proc)
       raise_block_syntax_error if block_given?
-
+      
       # to make #change work with #in(timeout) method
-      @before = evaluate_value_proc unless defined? @before
-      event_proc.call
-      @after = evaluate_value_proc
-
-      (!change_expected? || changed?) && matches_before? && matches_after? && matches_amount? && matches_min? && matches_max?
+      unless defined? @actual_before
+        @actual_before = evaluate_value_proc
+        event_proc.call
+      end
+      @actual_after = evaluate_value_proc
+    
+      (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
     end
   end
 

data/spec/rspec_patches_spec.rb

@@ -7,36 +7,46 @@ describe "RSpec patches" do
   context "RSpec::Matchers" do
     context "#within" do
       it "can be used with #change" do
+        t = Time.now
         expect {
           link(:id => "toggle").click
         }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(2)
+        (Time.now - t).should be <= 2
       end
 
       it "will fail upon timeout" do
+        t = Time.now
         expect {
           expect {
             link(:id => "toggle").click
-          }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(0.1)
+          }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(0.5)
         }.to raise_exception(%q{result should have been changed to "Div is hidden", but is now "Div is shown"})
+        (Time.now - t).should be >= 0.5
       end
 
       it "can be used with #make" do
+        t = Time.now
         expect {
           link(:id => "toggle").click
         }.to make {div(:id => "div1").present?}.within(2)
+        (Time.now - t).should be <= 2
       end
 
       it "handles #should_not via matcher's #matches?" do
+        t = Time.now
         h = {:special => true}
         Thread.new {sleep 0.5; h.delete :special}
         h.should_not have_key(:special).within(1)
+        (Time.now - t).should be_between(0.5, 1)
       end
 
       it "fails when #should_not is not satisfied within timeout via matcher's #matches?" do
+        t = Time.now
         h = {:special => true}
         expect {
-          h.should_not have_key(:special).within(0.1)
+          h.should_not have_key(:special).within(0.5)
         }.to raise_error
+        (Time.now - t).should be >= 0.5
       end
 
       it "handles #should_not via matcher's #does_not_match?" do
@@ -46,9 +56,11 @@ describe "RSpec patches" do
           end
         end
 
+        t = Time.now
         h = {:special => true}
         Thread.new {sleep 0.5; h.delete :special}
         h.should_not have_my_key(:special).within(1)
+        (Time.now - t).should be_between(0.5, 1)
       end
 
       it "fails when #should_not is not satisfied within timeout via matcher's #does_not_match?" do
@@ -58,18 +70,22 @@ describe "RSpec patches" do
           end
         end
 
+        t = Time.now
         h = {:special => true}
         expect {
-          h.should_not have_my_key(:special).within(0.1)
+          h.should_not have_my_key(:special).within(0.5)
         }.to raise_error
+        (Time.now - t).should be >= 0.5
       end
     end
 
     context "#soon" do
       it "is an alias for #in(30)" do
+        t = Time.now
         expect {
           link(:id => "toggle").click
         }.to make {div(:id => "div1").present?}.soon
+        (Time.now - t).should be <= 30
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -131,7 +131,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 1.4.2! Don't forget to take a look at the README and History files!
+  Thank you for installing WatirSplash 1.4.3! Don't forget to take a look at the README and History files!
   
   Execute `watirsplash new` under your project's directory to generate a default project structure.
   
@@ -169,7 +169,7 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 1.4.2
+summary: watirsplash 1.4.3
 test_files: 
 - spec/file_helper_spec.rb
 - spec/rspec_patches_spec.rb