pouch 0.3.1 → 0.3.2

data/lib/pouch.rb

@@ -21,7 +21,7 @@ module Pouch
     
     @browser = browser
     @context = standardize opts[:context] if opts[:context]
-    @timeout = opts[:timeout] || 10
+    @timeout = opts[:timeout] || 5
 
     set_timer if self.respond_to? :set_timer
     visit if self.respond_to?(:visit) && start

data/lib/pouch/elements.rb

@@ -2,10 +2,10 @@ module Pouch
   module Elements
 
     def element tag, name, identifier, *args, &block
-      define_method name do
-        timer { browser.element(tag, identifier).visible? }
+      define_method name, ->(time = nil) do
+        timer(time){ browser.element(tag, identifier).visible? }
         return browser.element tag, identifier unless block_given?
-        block.call browser.send(:element, tag, identifier), *args
+        block.call browser.send(:element, tag, identifier), *args        
       end
 
       define_waiting_methods tag, name, identifier, *args, &block
@@ -121,23 +121,23 @@ module Pouch
     private
 
     def define_waiting_methods tag, name, identifier, *args, &block
-      define_method "when_#{name}_not_visible" do
-        result = negative_timer { !browser.element(tag, identifier).visible? }
+      define_method "when_#{name}_not_visible", ->(time = nil) do
+        result = negative_timer(time){ !browser.element(tag, identifier).visible? }
         unless result
           raise VisibilityError, "#{name} element is still visible"
         end
         self
       end
       
-      define_method "when_#{name}_present" do
-        timer { browser.element(tag, identifier).present? }
+      define_method "when_#{name}_present", ->(time = nil) do
+        timer(time){ browser.element(tag, identifier).present? }
         html_element = browser.element tag, identifier
         return located_element unless block_given?
         block.call located_element, *args
       end
 
-      define_method "when_#{name}_not_present" do
-        result = negative_timer { !browser.element(tag, identifier).present? }
+      define_method "when_#{name}_not_present", ->(time = nil) do
+        result = negative_timer(time){ !browser.element(tag, identifier).present? }
         unless result
           raise PresenceError, "#{name} element is still present"
         end
@@ -145,7 +145,8 @@ module Pouch
       end
     end
 
-    def timer &block
+    def timer n, &block
+      interval = n.nil? ? timeout : n
       timed_out = Time.now + timeout
       until Time.now > timed_out
         result = yield block rescue false
@@ -153,8 +154,9 @@ module Pouch
       end
     end
 
-    def negative_timer &block
-      timed_out = Time.now + timeout
+    def negative_timer n, &block
+      interval = n.nil? ? timeout : n
+      timed_out = Time.now + interval
       until Time.now > timed_out
         result = yield block rescue false
         return result if result

data/lib/pouch/version.rb

@@ -1,3 +1,3 @@
 module Pouch
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/elements_spec.rb

@@ -28,11 +28,16 @@ describe Pouch::Elements do
       expect(page.blocked).to eq "www.test.com"
     end
 
-    it "calls #timer to wait for visible element" do
+    it "calls #timer to wait for default interval" do
       expect(page).to receive(:timer)
       page.generic
     end
 
+    it "calls #timer with custom interval" do
+      expect(page).to receive(:timer).with(20)
+      page.generic 20
+    end
+
     it "generates #when_generic_not_visible" do
       expect(page).to respond_to :when_generic_not_visible
     end
@@ -81,6 +86,11 @@ describe Pouch::Elements do
       expect(page).to receive(:negative_timer).and_return(false)
       expect{ page.when_invisible_not_visible }.to raise_error Pouch::VisibilityError, /invisible element/
     end
+
+    it "accepts an optional interval for timeout" do
+      expect(page).to receive(:negative_timer).with(20).and_return(true)
+      page.when_invisible_not_visible 20
+    end
   end
 
   describe "#when_element_not_present" do
@@ -97,6 +107,11 @@ describe Pouch::Elements do
       expect(page).to receive(:negative_timer).and_return(false)
       expect{ page.when_gone_not_present }.to raise_error Pouch::PresenceError, /gone element/
     end
+
+    it "accepts an optional interval for timeout" do
+      expect(page).to receive(:negative_timer).with(20).and_return(true)
+      page.when_gone_not_present 20
+    end
   end
 
   describe "#button" do

data/spec/pouch_spec.rb

@@ -21,13 +21,13 @@ describe Pouch do
 
     it "creates @timeout variable" do
       obj = Page2.new 'webdriver'
-      expect(obj.instance_variable_get :@timeout).to eq 10
+      expect(obj.instance_variable_get :@timeout).to eq 5
     end
 
     context "with :timeout option" do
       it "creates @timeout variable" do
-        obj = Page2.new 'webdriver', timeout: 5
-        expect(obj.instance_variable_get :@timeout).to eq 5
+        obj = Page2.new 'webdriver', timeout: 10
+        expect(obj.instance_variable_get :@timeout).to eq 10
       end
     end
         
@@ -125,14 +125,14 @@ describe Pouch do
     context "without setting a custom timeout interval" do
       it "returns the page object default timeout" do
         obj = Page.new 'webdriver'
-        expect(obj.timeout).to eq 10
+        expect(obj.timeout).to eq 5
       end
     end
 
     context "after passing :timeout option to #initialize" do
       it "returns the custom timeout" do
-        obj = Page.new 'webdriver', timeout: 5
-        expect(obj.timeout).to eq 5
+        obj = Page.new 'webdriver', timeout: 10
+        expect(obj.timeout).to eq 10
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pouch
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors: