watir_drops 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b995a8643b6747bff783e4f714b96df55ea9aa
-  data.tar.gz: a7a3fc82cf579b01466b14711ff2fdbeb5bd41f2
+  metadata.gz: d66c2965a5fd282b640c17434bdbf4b428560a77
+  data.tar.gz: e82eb9a8b5c37bb0508de2c02b0e706e74b66816
 SHA512:
-  metadata.gz: 0ef1710bcab707a70f3df2f96fa7fe34ac3884d77007d0c5a7a3f9909fd1e8e09ef2cbcf41647c9644434bab6fcab7287a85958c3728fd9ed1018e0b7ba772ad
-  data.tar.gz: bbf53a96376ee1cd2fbbc9baa1a9d57da792ebf1ad4eba3f8cb7ababd95ffb348067feaf220419f0f54393e712881d468b281176a2b836df88f2fa4d55021213
+  metadata.gz: 0a5423e07816e4b930deb21c8cc0a2db17e4bbcdb511efd79c61086ff8f50dc4214053bd2b30e6f0bc717faf341791aca89961d7c378e595829758c6863d0bcf
+  data.tar.gz: fdee13b41ebdd7e1f694f260b706a89a272c6eff74f49cf8a41f61d97b86699efcdf887e310037e7b8a0da28e6828e977d40ad501f5729a033fa7e19f79711d4

data/CHANGES.md

@@ -0,0 +1,41 @@
+### 0.4.0 (2016-02-12)
+
+* define elements & collections with locator hashes as well as blocks
+* supports auto-form filling data from any object that converts to a hash
+* allow setting browser with class method
+* runtime dependency removed for watir_model and watir_session
+
+### 0.3.4 (2016-01-25)
+
+* elements inherited in subclasses
+
+### 0.3.3 (2016-01-30)
+
+* switch from test-model to watir_model
+* update to latest watir_session implementation
+
+### 0.3.2 (2016-01-25)
+
+* clear field before typing into it
+
+### 0.3.1 (2016-01-25)
+
+* wait for element before interacting with it
+
+### 0.3.0 (2016-01-24)
+
+* Singleton replaced with usage of watir_session gem
+* page_url methods can take parameters
+* Default form filling method with usage of test-model gem
+* Pluralizing element names obtains collections of those elements
+* `#visit` and `#use` methods provided for passing blocks to the Page Object
+
+### 0.1.1 (2015-07-30)
+
+* Browser session stored in singleton
+* Page Objects initialize without parameters
+* Default actions for setters on elements
+
+### 0.1.0 (2015-07-15)
+
+* initial commit

data/lib/watir_drops/page_object.rb

@@ -1,4 +1,4 @@
-require 'watir_session'
+require 'watir-webdriver'
 require 'active_support/inflector'
 
 module WatirDrops
@@ -6,7 +6,7 @@ module WatirDrops
 
     class << self
 
-      attr_writer :elements
+      attr_writer :element_list
 
       def page_url
         define_method("goto") do |*args|
@@ -14,48 +14,68 @@ module WatirDrops
         end
       end
 
-      def elements
-        @elements ||= []
+      def element_list
+        @element_list ||= []
       end
 
       def inherited(subclass)
-        subclass.elements = elements.dup
+        subclass.element_list = element_list.dup
       end
 
-      def element(name, &block)
-        define_method(name) do |*args|
-          self.instance_exec(*args, &block)
-        end
+      Watir::Container.instance_methods(false).each do |class_method_name|
+        define_method(class_method_name) do |instance_method_name, locator = {}, &block|
+          define_method(instance_method_name) do |*args|
+            if block.is_a? Proc
+              raise StandardError, 'Can not define element with both locator and block' unless locator.empty?
+              expected_class = browser.send(class_method_name).class
+              element = self.instance_exec(*args, &block)
+              return element if element.is_a? expected_class
+              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
+            else
+              browser.send(class_method_name, locator)
+            end
+          end
 
-        define_method(name.to_s.pluralize) do |*args|
-          selector = self.instance_exec(*args, &block).instance_variable_get('@selector')
-          element_type = selector.delete(:tag_name) || 'element'
-          browser.send(element_type.pluralize, selector)
-        end
+          define_method("#{instance_method_name}=") do |val|
+            watir_element = self.send(instance_method_name)
+            watir_element.wait_until_present
+            case watir_element
+              when Watir::Radio
+                watir_element.set if val
+              when Watir::CheckBox
+                val ? watir_element.set : watir_element.clear
+              when Watir::Select
+                watir_element.select val
+              when Watir::Button
+                watir_element.click
+              # TODO - Email & Password types are not set to UserEditable in Watir
+              when Watir::Input
+                watir_element.wd.clear
+                watir_element.send_keys val
+              else
+                watir_element.click if val
+            end
+          end
+
+          define_method(instance_method_name.to_s.pluralize) do |*args|
+            if block.is_a? Proc
+              expected_class = browser.send(class_method_name.to_s.pluralize).class
 
+              single_element = self.instance_exec(*args, &block)
+              parent = single_element.instance_variable_get('@parent')
+              selector = single_element.instance_variable_get('@selector')
+              element_type = selector.delete(:tag_name) || 'element'
+              element = parent.send(element_type.pluralize, selector)
 
-        define_method("#{name}=") do |val|
-          watir_element = self.instance_exec &block
-          watir_element.wait_until_present
-          case watir_element
-            when Watir::Radio
-              watir_element.set if val
-            when Watir::CheckBox
-              val ? watir_element.set : watir_element.clear
-            when Watir::Select
-              watir_element.select val
-            when Watir::Button
-              watir_element.click
-            # TODO - Email & Password types are not set to UserEditable in Watir
-            when Watir::Input
-              watir_element.wd.clear
-              watir_element.send_keys val
+              return element if element.is_a?(expected_class) || class_method_name == :element
+              raise StandardError, "#{instance_method_name} method was defined as a #{expected_class}, but is a #{element.class}"
             else
-              watir_element.click if val
+              browser.send(class_method_name.to_s.pluralize, locator)
+            end
           end
-        end
 
-        elements << {name.to_sym => block}
+          element_list << instance_method_name.to_sym
+        end
       end
 
       def visit(*args)
@@ -69,18 +89,25 @@ module WatirDrops
         new.tap { yield if block_given? }
       end
 
-    end
+      def browser=(*args)
+        @@browser = block_given? ? yield(args) : args.first
+      end
 
-    attr_reader :browser
+      def browser
+        @@browser || (WatirSession.browser if defined? WatirSession)
+      end
+
+    end
 
-    def initialize
-      @browser = WatirSession.browser
+    def browser
+      self.class.browser
     end
 
     def fill_form(model)
-      intersect = self.class.elements.map(&:keys).flatten & model.keys
+      model = model.to_h unless model.is_a? Hash
+      intersect = self.class.element_list & model.keys
       intersect.each do |val|
-        self.send("#{val}=", model.send(val))
+        self.send("#{val}=", model[val])
       end
     end
 

data/watir_drops.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'watir_drops'
-  spec.version       = '0.3.4'
+  spec.version       = '0.4.0'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 
@@ -15,10 +15,11 @@ application information, allowing it to be decoupled from the tests}
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'watir_session', '~> 0.2'
   spec.add_runtime_dependency 'activesupport', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'watir_session', '~> 0.2'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: watir_drops
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: watir_session
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: watir_session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: |-
   This gem leverages the Watir test framework to allow for easy modeling of specific web
   application information, allowing it to be decoupled from the tests
@@ -90,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md