watir_pump 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec31a031d8aedd7d62a03f29e2e3b7926efdc68
-  data.tar.gz: 7089d63c641acb31767e957abb5854247d92aba6
+  metadata.gz: ee18bfe88d1c960ab0eea77c154a0c8cd5bdbf0f
+  data.tar.gz: 6148984fde63b139d4065b5910f370e2d94e59f1
 SHA512:
-  metadata.gz: c9c9372a6656ff88907f40f71346d232f378cce8f7324f072d17ba1085fd4efc603d2d1132815d629cc7fd327102d7bd4b58892f842c3397cae8df5ff817641b
-  data.tar.gz: 1ef6400e082d0c038cbfa5ad4606a5078ff2cc376840764d86ec03f32a8048f3824a84eb047cbec9226ee320645164d5b71495117055a70dfe278494e2672277
+  metadata.gz: 4943fcbb68cb2c31ab71b7e63d75a189506c31a53abee9e5b79e13e4b083016213445286dc13b75a7d96a2ffa77fc747c6aa7f372d5dbba0e3b92d7f7595bc28
+  data.tar.gz: f09295a0103d7945940020727d626d2b83dff890117dc4d3f30159186a27e7385cfc8748263254f11982850d5a9639b534ace827328e275b87ec83730e4db45b

data/lib/watir_pump/component.rb

@@ -3,6 +3,7 @@
 require 'set'
 require 'forwardable'
 
+require_relative 'errors/element_mismatch'
 require_relative 'component_collection'
 require_relative 'decorated_element'
 require_relative 'constants'
@@ -131,7 +132,10 @@ module WatirPump
         define_method(name) do |*args|
           ret = instance_exec(*args, &p)
           unless ret.is_a?(Watir::Element)
-            raise 'element method did not return a Watir::Element'
+            raise Errors::ElementMismatch.new(
+              expected: Watir::Element,
+              actual: ret.class
+            )
           end
           ret
         end
@@ -141,7 +145,10 @@ module WatirPump
         define_method(name) do |*args|
           ret = instance_exec(*args, &p)
           unless ret.is_a?(Watir::ElementCollection)
-            raise 'elements method did not return a Watir::ElementCollection'
+            raise Errors::ElementMismatch.new(
+              expected: Watir::ElementCollection,
+              actual: ret.class
+            )
           end
           ret
         end
@@ -158,6 +165,12 @@ module WatirPump
                                   watir_method_args: loc_args,
                                   code: loc_method,
                                   code_args: args)
+          unless node.is_a?(Watir::Element) || node.nil?
+            raise Errors::ElementMismatch.new(
+              expected: Watir::Element,
+              actual: node.class
+            )
+          end
           klass.new(browser, self, node)
         end
       end
@@ -168,6 +181,12 @@ module WatirPump
                                    watir_method_args: loc_args,
                                    code: loc_method,
                                    code_args: args)
+          unless nodes.is_a?(Watir::ElementCollection)
+            raise Errors::ElementMismatch.new(
+              expected: Watir::ElementCollection,
+              actual: nodes.class
+            )
+          end
           ComponentCollection.new(nodes.map { |n| klass.new(browser, self, n) })
         end
       end
@@ -273,7 +292,10 @@ module WatirPump
     def check_watir_method_mapping(watir_method, evaluated)
       return evaluated unless watir_method.is_a?(Symbol)
       return evaluated if evaluated.class == WATIR_METHOD_MAPPING[watir_method]
-      raise "#{evaluated.class} class does not match expected: #{watir_method}"
+      raise Errors::ElementMismatch.new(
+        expected: WATIR_METHOD_MAPPING[watir_method],
+        actual: evaluated.class
+      )
     end
 
     def method_missing(name, *args, &blk)

data/lib/watir_pump/errors/element_mismatch.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module WatirPump
+  module Errors
+    class ElementMismatch < StandardError
+      def initialize(expected:, actual:, msg: nil)
+        msg ||= "Element type mismatch. Expected: #{expected}, actual: #{actual}" # rubocop:disable Metrics/LineLength
+        super(msg)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,6 +142,7 @@ files:
 - lib/watir_pump/components/radio_group.rb
 - lib/watir_pump/constants.rb
 - lib/watir_pump/decorated_element.rb
+- lib/watir_pump/errors/element_mismatch.rb
 - lib/watir_pump/page.rb
 - lib/watir_pump/watir_method_mapping.rb
 homepage: https://github.com/bwilczek/watir_pump
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Page Object pattern for Watir. Hacker friendly and enterprise ready.