watirsplash 1.3.0 → 1.4.0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== Version 1.4.0 / 2011-04-30
+
+ * deprecated #in(timeout) method - use #within(timeout) instead
+ * added #seconds/#second and #minutes/#minute method to RSpec matchers for making it possible to use them together with #within(timeout) method
+
 === Version 1.3.0 / 2011-04-22
 
  * handle RSpec's #should_not correctly when using #in(timeout)

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/watirsplash/rspec_patches.rb

@@ -112,17 +112,40 @@ end
 #     another_div.should exist.in(5.minutes)
 RSpec::Matchers.constants.each do |const|
   RSpec::Matchers.const_get(const).class_eval do
-    def in(timeout)
-      @timeout = timeout
-      self
-    end
-
-    def soon 
-      self.in(30)
-    end
 
     inst_methods = instance_methods.map {|m| m.to_sym}
 
+    if inst_methods.include?(:matches?) || inst_methods.include?(:does_not_match?)
+      def in(timeout)
+        Kernel.warn "DEPRECATION NOTICE: #in(timeout) is DEPRECATED, please use #within(timeout) method instead!"
+        within(timeout)
+      end
+
+      def within(timeout)
+        @timeout = timeout
+        self
+      end
+
+      def soon 
+        within(30)
+      end      
+
+      def seconds
+        # for syntactic sugar
+        self
+      end
+
+      alias_method :second, :seconds
+
+      def minutes
+        return unless @timeout
+        @timeout *= 60
+        self
+      end
+
+      alias_method :minute, :minutes
+    end
+
     if inst_methods.include? :matches?
       alias_method :__matches?, :matches? 
 

data/spec/rspec_patches_spec.rb

@@ -5,37 +5,37 @@ describe "RSpec patches" do
   end
 
   context "RSpec::Matchers" do
-    context "#in" do
+    context "#within" do
       it "can be used with #change" do
         expect {
           link(:id => "toggle").click
-        }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").in(2)
+        }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(2)
       end
 
       it "will fail upon timeout" do
         expect {
           expect {
             link(:id => "toggle").click
-          }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").in(0.1)
+          }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(0.1)
         }.to raise_exception(%q{result should have been changed to "Div is hidden", but is now "Div is shown"})
       end
 
       it "can be used with #make" do
         expect {
           link(:id => "toggle").click
-        }.to make {div(:id => "div1").present?}.in(2)
+        }.to make {div(:id => "div1").present?}.within(2)
       end
 
       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)
+        h.should_not have_key(:special).within(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)
+          h.should_not have_key(:special).within(0.1)
         }.to raise_error
       end
 
@@ -48,9 +48,9 @@ describe "RSpec patches" do
 
         h = {:special => true}
         Thread.new {sleep 0.5; h.delete :special}
-        h.should_not have_my_key(:special).in(1)
+        h.should_not have_my_key(:special).within(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|
@@ -60,7 +60,7 @@ describe "RSpec patches" do
 
         h = {:special => true}
         expect {
-          h.should_not have_my_key(:special).in(0.1)
+          h.should_not have_my_key(:special).within(0.1)
         }.to raise_error
       end
     end
@@ -80,6 +80,26 @@ describe "RSpec patches" do
         }.to make {text_field(:name => "field1").value.empty?}
       end
     end
-  end
 
+    context "#seconds" do
+      it "is for syntactic sugar" do
+        RSpec::Matchers::Matcher.new(nil) {}.within(2).seconds.instance_variable_get(:@timeout).should == 2
+      end
+
+      it "has #second as an alias" do
+        RSpec::Matchers::Matcher.new(nil) {}.within(1).second.instance_variable_get(:@timeout).should == 1
+      end
+    end
+
+    context "#minutes" do
+      it "converts timeout into minutes" do
+        RSpec::Matchers::Matcher.new(nil) {}.within(2).minutes.instance_variable_get(:@timeout).should == 2*60
+      end
+
+      it "has #minute as an alias" do
+        RSpec::Matchers::Matcher.new(nil) {}.within(1).minute.instance_variable_get(:@timeout).should == 1*60
+      end
+    end
+
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 +03:00
+date: 2011-04-30 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.3.0! Don't forget to take a look at the README and History files!
+  Thank you for installing WatirSplash 1.4.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.3.0
+summary: watirsplash 1.4.0
 test_files: 
 - spec/file_helper_spec.rb
 - spec/rspec_patches_spec.rb