watir_drops 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e57b1ada80896b55568b55ff341f5e2abae32f5
-  data.tar.gz: d87ea767c146b04fbda8f7c679f31b94395aa700
+  metadata.gz: 280730b6901eb01a5744bc02c17e50c0d14fce76
+  data.tar.gz: deb0cd398b6c840f35346c37d110a70eff7de0f3
 SHA512:
-  metadata.gz: f5348f40cabadec4f07226e6e89771fe39feed3ec396364231e1144786e40c730d6c12af430eefd90c20ddda8c45c6bae895ba7a7a69c9bccb28f4217777c831
-  data.tar.gz: dc270caa536640de3fec8f058c133507a1be05806573a91154f93389a2666fcb4c20f418463ec15babf35acb9954fd4ae6d45740bdf5b9d07620c9d6271931af
+  metadata.gz: b5f878a47b275c0bd4c4865045cd30f7b0d32464105af3a11914f5c010d79b91211e5cc402f538e3d443c2068359249e03e0d1248ac4dc561b73f181a9a4e14a
+  data.tar.gz: d5e0bfd51542d40f8d6befc46e944a5ef762e5651d0f3134d2e3cc3d0e25ac8fe39ac6e0de09e55c3c17330c56fd7e032f80cc5bca76a0d712d8575f594f31f4

data/.rspec

@@ -0,0 +1,3 @@
+
+--color
+--format doc

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.7.0 (2017-02-02)
+
+* implement #on_page? verification by url, title or element(s) (thanks Lu Cui)
+
 ### 0.6.1 (2017-02-01)
 
 * fix bug requiring Active Support (thanks Fedor Barannik)

data/lib/watir_drops/page_object.rb

@@ -5,8 +5,13 @@ module WatirDrops
     class << self
 
       attr_writer :element_list
+      attr_writer :required_element_list
+      attr_reader :require_url
+
+
+      def page_url(required: false)
+        @require_url = required
 
-      def page_url
         define_method("page_url") do |*args|
           yield(*args)
         end
@@ -16,12 +21,24 @@ module WatirDrops
         end
       end
 
+
+      def page_title
+        define_method("page_title") do |*args|
+          yield(*args)
+        end
+      end
+
       def element_list
         @element_list ||= []
       end
 
+      def required_element_list
+        @required_element_list ||= []
+      end
+
       def inherited(subclass)
         subclass.element_list = element_list.dup
+        subclass.required_element_list = required_element_list.dup
       end
 
       def elements(name, &block)
@@ -32,7 +49,7 @@ module WatirDrops
         element_list << name.to_sym
       end
 
-      def element(name, &block)
+      def element(name, required: false, &block)
         define_method(name) do |*args|
           self.instance_exec(*args, &block)
         end
@@ -54,14 +71,20 @@ module WatirDrops
             watir_element.click if val
           end
         end
-
         element_list << name.to_sym
+        required_element_list << name.to_sym if required
       end
 
       def visit(*args)
-        new.tap { |page| page.goto(*args) }
+        new.tap do |page|
+          page.goto(*args)
+          exception = Selenium::WebDriver::Error::WebDriverError
+          message = "Expected to be on #{page.class}, but conditions not met"
+          raise exception, message if page.page_verifiable? && !page.on_page?
+        end
       end
 
+
       def browser=(browser_input)
         @@browser = browser_input
       end
@@ -95,8 +118,32 @@ module WatirDrops
     def inspect
       '#<%s url=%s title=%s>' % [self.class, url.inspect, title.inspect]
     end
+
     alias selector_string inspect
 
+
+    def on_page?
+      exception = Selenium::WebDriver::Error::WebDriverError
+      message = "Can not verify page without any requirements set"
+      raise exception, message unless page_verifiable?
+
+      @browser.wait_until do |browser|
+        !self.class.require_url || page_url.gsub("#{URI.parse(page_url).scheme}://", '') == browser.url.gsub("#{URI.parse(browser.url).scheme}://", '')
+      end
+
+      @browser.wait_until do |browser|
+        !self.respond_to?(:page_title) || browser.title == page_title
+      end
+
+      @browser.wait_until do |_browser|
+        !self.class.required_element_list.any? || self.class.required_element_list.all? { |e| send(e).present? }
+      end
+
+      true
+    rescue Watir::Wait::TimeoutError
+      false
+    end
+
     def method_missing(method, *args, &block)
       if @browser.respond_to?(method)
         @browser.send(method, *args, &block)
@@ -109,5 +156,8 @@ module WatirDrops
       @browser.respond_to?(method) || super
     end
 
+    def page_verifiable?
+      self.class.require_url || self.respond_to?(:page_title) || self.class.required_element_list.any?
+    end
   end
 end

data/watir_drops.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'watir_drops'
-  spec.version       = '0.6.1'
+  spec.version       = '0.7.0'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_drops
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Titus Fortner
@@ -118,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Page Object Framework for use with Watir