angular_webdriver 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 129723933393935ba3f51f00d55c00170701b4c1
-  data.tar.gz: 0f0458f8424f2010c459206d9d2d6ec26800fe71
+  metadata.gz: bddebdc5e0805f1a225634f2472d982f3e29d7f5
+  data.tar.gz: 4725e12aef7fc193b367dc393d397b46149befb2
 SHA512:
-  metadata.gz: 8d6e619430ed609bbe8cd6ca53591acd93c02a23413195c129bbb11d9242df64e77ebf159d188eded115110b61a9f3cf86793257731cb8546e7678cedff5366e
-  data.tar.gz: 16233f787ff5ca1603df8668587e455b4aa9941ce08cb5edbe7cd825741e16d84824cef770440af574f71239c9244d89fd1a0b14f21d590ceee8c2e07955714e
+  metadata.gz: 881b3dac4df7917e4dd36dccc99349148ec86d90abf80d204fc76bfe5af181c42f02e32cfb6a80c71852b9e685ac0b56f3104eea682456ce1df8fbc2fb8fe940
+  data.tar.gz: 0d4ccf98664fe02f9708bae8b3f2556968c5b0b594a4141594cf4b7d8cba5c0ea064a51a31895a55bc285027e043af1411bdd1e79c3213154e7c2b233321a323

data/lib/angular_webdriver.rb

@@ -2,7 +2,12 @@ require_relative 'angular_webdriver/version'
 
 require 'rubygems'
 require 'selenium-webdriver'
+require_relative 'angular_webdriver/protractor/webdriver_patch'
+
+require_relative 'angular_webdriver/protractor/watir_patch'
+AngularWebdriver.patch_watir # (1/2) before
 require 'watir-webdriver'
+AngularWebdriver.patch_watir # (2/2) after
 
 require_relative 'angular_webdriver/protractor/by'
 require_relative 'angular_webdriver/protractor/by_repeater_inner'
@@ -10,5 +15,3 @@ require_relative 'angular_webdriver/protractor/client_side_scripts'
 require_relative 'angular_webdriver/protractor/protractor'
 require_relative 'angular_webdriver/protractor/protractor_element'
 require_relative 'angular_webdriver/protractor/rspec_helpers'
-require_relative 'angular_webdriver/protractor/webdriver_patch'
-require_relative 'angular_webdriver/protractor/watir_patch'

data/lib/angular_webdriver/protractor/protractor.rb

@@ -122,7 +122,7 @@ class Protractor
 
     # data urls must be preserved and not have http:// prepended.
     # data:<blah>
-    data_url = destination.start_with?('data:')
+    data_url  = destination.start_with?('data:')
 
     unless about_url || data_url
       # URI.join doesn't allow for http://localhost:8081/#/ as a base_url
@@ -283,20 +283,48 @@ class Protractor
 
     # must be local var for use with define element below.
     protractor_element = AngularWebdriver::ProtractorElement.new @watir
+    driver             = @driver
 
     # Top level element method to enable protractor syntax.
     # redefine element to point to the new protractor element instance.
     #
     # toplevel self enables by/element from within pry. rspec helpers enables
     # by/element within rspec tests when used with install_rspec_helpers.
-    [eval('self', TOPLEVEL_BINDING), AngularWebdriver::RSpecHelpers].each do |obj|
-      obj.send :define_singleton_method, :element do |*args|
+    toplevel_main      = eval('self', TOPLEVEL_BINDING)
+    [toplevel_main, AngularWebdriver::RSpecHelpers].each do |obj|
+      # define singleton on toplevel main, otherwise use regular define method
+      # if we use define singleton on the rspec helpers, then rspec won't
+      # be able to handle block parameters.
+      #
+      # Also rspec requires config.include AngularWebdriver::RSpecHelpers
+      # for the no_wait helper to accept the block parameter.
+      method_type = obj == toplevel_main ? :define_singleton_method : :define_method
+
+      obj.send method_type, :element do |*args|
         protractor_element.element *args
       end
 
-      obj.send :define_singleton_method, :by do
+      obj.send method_type, :by do
         AngularWebdriver::By
       end
+
+      obj.send method_type, :no_wait do |&block|
+        max_wait      = driver.max_wait_seconds
+        max_page_wait = driver.max_page_wait_seconds
+
+        driver.set_max_wait 0
+        driver.set_max_page_wait 0
+
+        begin
+          raise ArgumentError, 'Tried to use no_wait without a block' unless block
+          result = block.call
+        ensure
+          driver.set_max_wait max_wait
+          driver.set_max_page_wait max_page_wait
+        end
+
+        result
+      end
     end
 
     self

data/lib/angular_webdriver/protractor/watir_patch.rb

@@ -1,209 +1,225 @@
-require 'watir-webdriver/elements/element'
-
 # match protractor semantics
 # unfortunately setting always locate doesn't always locate.
-Watir.always_locate = true
-
-#
-# This patch serves a few purposes. The first is matching Protractor semantics
-# of lazy finding elements and always relocating elements (ex: element.text)
-#
-# The second is removing unnecessary bloatware from Watir which has a number
-# of checks that don't make sense for angular.js testing. The specifics
-# of this patch will change in the next Watir release. Currently version
-# 0.7.0 is targeted.
-#
-# The third is teaching Watir about angular specific locators
-#
-# Design goal: element.all(by.binding('slowHttpStatus'))
-#              should not make any server requests
-#
-
 module Watir
+  @always_locate = true
+end
 
-  class HTMLElementCollection
-    # Return original selector.
-    # Method added for protractor compatibility
-    def locator
-      @selector
-    end
-  end
+module AngularWebdriver
 
-  module Container
+  # Patch watir must be invoked before watir-webdriver is required to
+  # ensure the methods are defined before inheritance occurs.
+  # Then patch_watir must be invoked after requiring watir-webdriver to
+  # restore the methods that were overridden.
+  #
+  def self.patch_watir
     #
-    # Alias of elements for Protractor
+    # This patch serves a few purposes. The first is matching Protractor semantics
+    # of lazy finding elements and always relocating elements (ex: element.text)
+    #
+    # The second is removing unnecessary bloatware from Watir which has a number
+    # of checks that don't make sense for angular.js testing. The specifics
+    # of this patch will change in the next Watir release. Currently version
+    # 0.7.0 is targeted.
+    #
+    # The third is teaching Watir about angular specific locators
+    #
+    # Design goal: element.all(by.binding('slowHttpStatus'))
+    #              should not make any server requests
     #
 
-    def all(*args)
-      elements(*args)
-    end
-
-    # Redefine extract_selector to wrap find by repeater
-    upstream_extract_selector = instance_method(:extract_selector)
-    define_method(:extract_selector) do |selectors|
-      selectors = AngularWebdriver::ByRepeaterInner.wrap_repeater selectors
-
-      upstream_extract_selector.bind(self).call selectors
+    ::Watir::HTMLElementCollection.class_eval do
+      # Return original selector.
+      # Method added for protractor compatibility
+      def locator
+        @selector
+      end
     end
 
-  end # module Container
-
-  #
-  # Base class for HTML elements.
-  #
+    ::Watir::Container.module_eval do
+      #
+      # Alias of elements for Protractor
+      #
 
-  # Note the element class is different on master.
+      def all(*args)
+        elements(*args)
+      end
 
-  class Element
+      # Redefine extract_selector to wrap find by repeater
+      upstream_extract_selector = instance_method(:extract_selector)
+      define_method(:extract_selector) do |selectors|
+        selectors = AngularWebdriver::ByRepeaterInner.wrap_repeater selectors
 
-    # Always raise on stale element ref error. Prevents infinite retry loop.
-    def element_call
-      yield
-    rescue Selenium::WebDriver::Error::StaleElementReferenceError
-      raise
-    end
+        upstream_extract_selector.bind(self).call selectors
+      end
 
-    def selected?
-      assert_exists
-      element_call { @element.selected? }
-    end
+    end # ::Watir::Container.module_eval
 
-    # required for watir otherwise execute_script will fail
-    #
-    # e = browser.element(tag_name: 'div')
-    # driver.execute_script 'return arguments[0].tagName', e
-    # {"script":"return arguments[0].tagName","args":[{"ELEMENT":"0"}]}
     #
-    # Convert to a WebElement JSON Object for transmission over the wire.
-    # @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#basic-terms-and-concepts
+    # Base class for HTML elements.
     #
-    # @api private
-    #
-    def to_json(*args)
-      assert_exists
-      { ELEMENT: @element.ref }.to_json
-    end
 
-    # Ensure that the element exists by always relocating it
-    # Required to trigger waitForAngular. Caching the element here will
-    # break the Protractor sync feature so this must be @element = locate.
-    def assert_exists
-      @element = locate
-    end
+    # Note the element class is different on master.
 
-    def assert_not_stale
-      nil
-    end
+    ::Watir::Element.class_eval do
+      # Always raise on stale element ref error. Prevents infinite retry loop.
+      def element_call
+        yield
+      rescue Selenium::WebDriver::Error::StaleElementReferenceError
+        raise
+      end
 
-    def assert_enabled
-      nil
-    end
+      # Rescue all exceptions. Guarantee that we'll return true or false.
+      #
+      # Returns true if element exists and false otherwise.
+      def exists?
+        assert_exists
+        true
+      rescue Exception
+        false
+      end
 
-    # Return original selector.
-    # Method added for protractor compatibility
-    def locator
-      @selector
-    end
+      def selected?
+        assert_exists
+        element_call { @element.selected? }
+      end
 
-    # avoid context lookup
-    def locate
-      locator_class.new(@parent.wd, @selector, self.class.attribute_list).locate
-    end
+      # required for watir otherwise execute_script will fail
+      #
+      # e = browser.element(tag_name: 'div')
+      # driver.execute_script 'return arguments[0].tagName', e
+      # {"script":"return arguments[0].tagName","args":[{"ELEMENT":"0"}]}
+      #
+      # Convert to a WebElement JSON Object for transmission over the wire.
+      # @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#basic-terms-and-concepts
+      #
+      # @api private
+      #
+      def to_json(*args)
+        assert_exists
+        { ELEMENT: @element.ref }.to_json
+      end
 
-    # Invoke protractor.allowAnimations with freshly located element and
-    # optional value.
-    def allowAnimations value=nil
-      assert_exists
-      driver.protractor.allowAnimations @element, value
-    end
+      # Ensure that the element exists by always relocating it
+      # Required to trigger waitForAngular. Caching the element here will
+      # break the Protractor sync feature so this must be @element = locate.
+      def assert_exists
+        @element = locate
+      end
 
-    # Watir doesn't define a clear method on element so we have to provide one.
-    def clear
-      assert_exists
-      element_call { @element.clear }
-    end
+      def assert_not_stale
+        nil
+      end
 
-    # Evaluate an Angular expression as if it were on the scope
-    # of the current element.
-    #
-    # @param expression <String> The expression to evaluate.
-    #
-    # @return <Object> The result of the evaluation.
-    def evaluate expression
-      assert_exists
-      driver.protractor.evaluate @element, expression
-    end
+      def assert_enabled
+        nil
+      end
 
-    #
-    # Returns true if the element exists and is visible on the page.
-    #
-    # @return [Boolean]
-    # @see Watir::Wait
-    #
-    #
-    # rescue element not found
-    def present?
-      exists? && visible?
-    rescue Selenium::WebDriver::Error::NoSuchElementError, Selenium::WebDriver::Error::StaleElementReferenceError, UnknownObjectException
-      # if the element disappears between the exists? and visible? calls,
-      # consider it not present.
-      false
-    end
-  end
+      # Return original selector.
+      # Method added for protractor compatibility
+      def locator
+        @selector
+      end
 
+      # avoid context lookup
+      def locate
+        locator_class.new(@parent.wd, @selector, self.class.attribute_list).locate
+      end
 
-  #
-  # The main class through which you control the browser.
-  #
+      # Invoke protractor.allowAnimations with freshly located element and
+      # optional value.
+      def allowAnimations value=nil
+        assert_exists
+        driver.protractor.allowAnimations @element, value
+      end
 
-  class Browser
-    def assert_exists
-      # remove expensive window check
-      raise Exception::Error, 'browser was closed' if @closed
-    end
+      # Watir doesn't define a clear method on element so we have to provide one.
+      def clear
+        assert_exists
+        element_call { @element.clear }
+      end
 
-    def inspect
-      nil # avoid expensive browser url and title lookup
-    end
-  end
+      # Evaluate an Angular expression as if it were on the scope
+      # of the current element.
+      #
+      # @param expression <String> The expression to evaluate.
+      #
+      # @return <Object> The result of the evaluation.
+      def evaluate expression
+        assert_exists
+        driver.protractor.evaluate @element, expression
+      end
 
-  class ElementLocator
-    def validate_element(element)
-      tn = @selector[:tag_name]
-      return element unless tn # don't validate nil tag names
-      element_tag_name = element.tag_name.downcase
+      #
+      # Returns true if the element exists and is visible on the page.
+      # Returns false if the element doesn't exist or isn't visible.
+      #
+      # @return [Boolean]
+      # @see Watir::Wait
+      #
+      #
+      # rescue element not found
+      def present?
+        exists? && visible?
+      rescue Exception
+        # if the element disappears between the exists? and visible? calls,
+        # consider it not present.
+        false
+      end
+    end # ::Watir::Element.class_eval
 
-      return if tn && !tag_name_matches?(element_tag_name, tn)
+    #
+    # The main class through which you control the browser.
+    #
 
-      if element_tag_name == 'input'
-        return if @selector[:type] && @selector[:type] != element.attribute(:type)
+    ::Watir::Browser.class_eval do
+      def assert_exists
+        # remove expensive window check
+        raise Exception::Error, 'browser was closed' if @closed
       end
 
-      element
-    end
+      def inspect
+        nil # avoid expensive browser url and title lookup
+      end
+    end # ::Watir::Browser.class_eval
 
-    # always raise element not found / stale reference error
-    def locate
-      # element.all(by.partialButtonText('text')).to_a[0].value creates the
-      # selector {:element=>#<Selenium::WebDriver::Element ...>}
-      # in that case we've already located the element.
-      #
-      # see 'should find multiple buttons containing "text"' in locators_spec.rb
-      return @selector[:element] if @selector.is_a?(Hash) && @selector[:element].is_a?(Selenium::WebDriver::Element)
+    ::Watir::ElementLocator.class_eval do
+      def validate_element(element)
+        tn = @selector[:tag_name]
+        return element unless tn # don't validate nil tag names
+        element_tag_name = element.tag_name.downcase
 
-      e = by_id and return e # short-circuit if :id is given
+        return if tn && !tag_name_matches?(element_tag_name, tn)
 
-      if @selector.size == 1
-        element = find_first_by_one
-      else
-        element = find_first_by_multiple
+        if element_tag_name == 'input'
+          return if @selector[:type] && @selector[:type] != element.attribute(:type)
+        end
+
+        element
       end
 
-      # This actually only applies when finding by xpath/css - browser.text_field(:xpath, "//input[@type='radio']")
-      # We don't need to validate the element if we built the xpath ourselves.
-      # It is also used to alter behavior of methods locating more than one type of element
-      # (e.g. text_field locates both input and textarea)
-      validate_element(element) if element
-    end
-  end
-end
+      # always raise element not found / stale reference error
+      def locate
+        # element.all(by.partialButtonText('text')).to_a[0].value creates the
+        # selector {:element=>#<Selenium::WebDriver::Element ...>}
+        # in that case we've already located the element.
+        #
+        # see 'should find multiple buttons containing "text"' in locators_spec.rb
+        return @selector[:element] if @selector.is_a?(Hash) && @selector[:element].is_a?(Selenium::WebDriver::Element)
+
+        e = by_id and return e # short-circuit if :id is given
+
+        if @selector.size == 1
+          element = find_first_by_one
+        else
+          element = find_first_by_multiple
+        end
+
+        # This actually only applies when finding by xpath/css - browser.text_field(:xpath, "//input[@type='radio']")
+        # We don't need to validate the element if we built the xpath ourselves.
+        # It is also used to alter behavior of methods locating more than one type of element
+        # (e.g. text_field locates both input and textarea)
+        validate_element(element) if element
+      end
+    end # ::Watir::ElementLocator.class_eval
+  end # def patch_watir
+end # module AngularWebdriver

data/lib/angular_webdriver/version.rb

@@ -1,4 +1,4 @@
 module AngularWebdriver
-  VERSION = '1.0.3' unless defined? ::AngularWebdriver::VERSION
+  VERSION = '1.0.4' unless defined? ::AngularWebdriver::VERSION
   DATE    = '2015-06-07' unless defined? ::AngularWebdriver::DATE
 end

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v1.0.4 2015-06-07
+
+- [a7965d7](https://github.com/bootstraponline/angular_webdriver/commit/a7965d7d1103bb802eabbdf11a37c9be8f9f3547) Release 1.0.4
+- [bf94300](https://github.com/bootstraponline/angular_webdriver/commit/bf9430076da4a89a85050b92289b1fda34afe3f8) Fix and test rspec helpers
+- [1d11610](https://github.com/bootstraponline/angular_webdriver/commit/1d11610441ed56addabc5be60fe35125151a7a75) Move no_wait into top level singleton
+- [10f7ff9](https://github.com/bootstraponline/angular_webdriver/commit/10f7ff9ecbbdf0751752c751cebef4119eb86f94) Fix watir patch. Fix exists?
+
+
 #### v1.0.3 2015-06-07
 
 - [97d5f18](https://github.com/bootstraponline/angular_webdriver/commit/97d5f18e187d56bc8616fb65ec1e5b9bafa8c289) Release 1.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular_webdriver
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - code@bootstraponline.com