watirsplash 1.2.1 → 1.3.0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== Version 1.3.0 / 2011-04-22
+
+ * handle RSpec's #should_not correctly when using #in(timeout)
+ * added #soon for RSpec's matcher as an alias for #in(30)
+
 === Version 1.2.1 / 2011-04-17
 
  * use RSpec's multiple formatters support functionality directly

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/watirsplash/rspec_patches.rb

@@ -103,6 +103,10 @@ end
 #       div.click
 #     }.to make {another_div.present?}.in(5)
 #
+#     expect {
+#       div.click
+#     }.to change {another_div.text}.soon
+#
 # use with ActiveSupport to use descriptive methods for numbers:
 #     require "active_support"
 #     another_div.should exist.in(5.minutes)
@@ -113,6 +117,10 @@ RSpec::Matchers.constants.each do |const|
       self
     end
 
+    def soon 
+      self.in(30)
+    end
+
     inst_methods = instance_methods.map {|m| m.to_sym}
 
     if inst_methods.include? :matches?
@@ -129,6 +137,10 @@ RSpec::Matchers.constants.each do |const|
       def does_not_match?(actual)
         @timeout ? (Watir::Wait.until(@timeout) {__does_not_match?(actual)} rescue false) : __does_not_match?(actual)
       end
+    else
+      def does_not_match?(actual)
+        @timeout ? !(Watir::Wait.while(@timeout) {__matches?(actual)} rescue true) : !__matches?(actual)
+      end
     end
   end
 end

data/spec/rspec_patches_spec.rb

@@ -26,7 +26,20 @@ describe "RSpec patches" do
         }.to make {div(:id => "div1").present?}.in(2)
       end
 
-      it "handles also #does_not_match?" do
+      it "handles #should_not via matcher's #matches?" do
+        h = {:special => true}
+        Thread.new {sleep 0.5; h.delete :special}
+        h.should_not have_key(:special).in(1)
+      end
+
+      it "fails when #should_not is not satisfied within timeout via matcher's #matches?" do
+        h = {:special => true}
+        expect {
+          h.should_not have_key(:special).in(0.1)
+        }.to raise_error
+      end
+
+      it "handles #should_not via matcher's #does_not_match?" do
         RSpec::Matchers.define :have_my_key do |expected|
           match_for_should_not do |actual|
             !actual.has_key?(expected)
@@ -37,6 +50,27 @@ describe "RSpec patches" do
         Thread.new {sleep 0.5; h.delete :special}
         h.should_not have_my_key(:special).in(1)
       end
+      
+      it "fails when #should_not is not satisfied within timeout via matcher's #does_not_match?" do
+        RSpec::Matchers.define :have_my_key do |expected|
+          match_for_should_not do |actual|
+            !actual.has_key?(expected)
+          end
+        end
+
+        h = {:special => true}
+        expect {
+          h.should_not have_my_key(:special).in(0.1)
+        }.to raise_error
+      end
+    end
+
+    context "#soon" do
+      it "is an alias for #in(30)" do
+        expect {
+          link(:id => "toggle").click
+        }.to make {div(:id => "div1").present?}.soon
+      end
     end
 
     context "#make" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +03:00
+date: 2011-04-22 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,7 +134,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 1.2.1! Don't forget to take a look at the README and History files!
+  Thank you for installing WatirSplash 1.3.0! 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.
   
@@ -173,7 +173,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: watirsplash 1.2.1
+summary: watirsplash 1.3.0
 test_files: 
 - spec/file_helper_spec.rb
 - spec/rspec_patches_spec.rb