watir_angular 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e019786d3a45abfef1cd132d84311e9e19ebe7f
-  data.tar.gz: c19d55702a8681c2fa17dc8ae24828424a734932
+  metadata.gz: 92861e78110e040eac6d0d6cc163a51a39b246ff
+  data.tar.gz: 42f962e3e5e58a6b399ceaf8b7a5dfcf88a10924
 SHA512:
-  metadata.gz: 6e3578f7a70423f0286df7d0bf0459acf49f7025996a8a22322571a8a68576ad9169585775a12a64afad11735b3b349b21dee8de6b20c71ce83d99c8e68c7fe7
-  data.tar.gz: e50bda2128b5bc1980a58042e078e23bd313bee521b747a0cbdb7cf7a6570ec07b757078b1f1d1085cbba55b9590daa4350abf2762f7ab24548cbfe8ad222b22
+  metadata.gz: 5b9c5ddf6de13251fcc8a4f8b098e5c161f6fd1e9f428da08f9cf916232d2250d48429f1386380537d72fa55654579e2b2243f32fc5e3eb2c69ad45de08efc7f
+  data.tar.gz: e3fe8f2eb14adf70b99db6eeaeb404a9db47f95d7fa1dbb6f77533344b8ff66885b3e2dbf66f0d4ea94f23c8146b40ab513d93f03eb2960fba858d2fb20886bb

data/README.md

@@ -28,10 +28,23 @@ Or install it yourself as:
 
 ## Usage
 
+To have access to all `ng-*` locators and methods, simply require the gem 
 ```ruby
 require "watir_angular"
 ```
 
+To explicitly specify a wait for angular executions to complete
+```ruby
+browser = Watir::Browser.new
+WatirAngular.wait_for_angular(browser)
+```
+
+To automatically wait for angular executions to complete after each method
+```ruby
+browser = Watir::Browser.new
+WatirAngular.inject_angular_wait(browser)
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/titusfortner/watir_angular.

data/lib/watir_angular.rb

@@ -1,15 +1,18 @@
-# Code on Page is based on code by westlm1@NW110283.nwie.net
+# Code on this page is based on code by westlm1@NW110283.nwie.net
 # From https://github.com/watir/watir/pull/387
 
 require "watir"
-require 'watir_angular/locators/element/selector_builder'
+
+Watir::Locators::Element::SelectorBuilder.send(:remove_const, :WILDCARD_ATTRIBUTE)
+Watir::Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE = /^(aria|data|ng)_(.+)$/
 
 module WatirAngular
-  def wait_for_angular(timeout: Watir.default_timeout)
+  def self.wait_for_angular(browser, timeout: Watir.default_timeout)
+    wd = browser.wd
     angular_element = "document.querySelectorAll('[ng-app]')[0]"
     wd.execute_script("angular.element(#{angular_element}).scope().pageFinishedRendering = false")
     wd.execute_script("angular.getTestability(#{angular_element}).whenStable(function(){angular.element(#{angular_element}).scope().pageFinishedRendering = true})")
-    wait_until(timeout: timeout, message: "waiting for angular to render") do
+    browser.wait_until(timeout: timeout, message: "waiting for angular to render") do
       wd.execute_script("return angular.element(#{angular_element}).scope().pageFinishedRendering")
     end
   rescue Selenium::WebDriver::Error::InvalidElementStateError
@@ -21,20 +24,8 @@ module WatirAngular
     raise unless ex.message.include? "angular is not defined"
     # angular not used in the application, continue as normal
   end
-end
-
-require 'extensions/watir/browser'
-Watir.locator_namespace = WatirAngular::Locators
-
-WatirAngular::Locators::Element::Locator = Watir::Locators::Element::Locator
-WatirAngular::Locators::Element::Validator = Watir::Locators::Element::Validator
-
-# Behaviors for element subclasses to come from Watir rather than WatirAngular superclass element
-WatirAngular::Locators::Button::Locator = Watir::Locators::Button::Locator
-WatirAngular::Locators::Button::Validator = Watir::Locators::Button::Validator
-WatirAngular::Locators::Cell::Locator = Watir::Locators::Cell::Locator
-WatirAngular::Locators::Row::Locator = Watir::Locators::Row::Locator
-WatirAngular::Locators::TextArea::Locator = Watir::Locators::TextArea::Locator
-WatirAngular::Locators::TextField::Locator = Watir::Locators::TextField::Locator
-WatirAngular::Locators::TextField::Validator = Watir::Locators::TextField::Validator
 
+  def self.inject_wait(browser)
+    browser.after_hooks.add ->(browser) { wait_for_angular(browser) }
+  end
+end

data/watir_angular.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_angular"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "watir", "~> 6.8", ">= 6.8.2"
+  spec.add_runtime_dependency "watir", "~> 6.9"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_angular
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.8.2
+        version: '6.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.8.2
+        version: '6.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,10 +95,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/extensions/watir/browser.rb
 - lib/watir_angular.rb
-- lib/watir_angular/locators/element/selector_builder.rb
-- support/travis.sh
 - watir_angular.gemspec
 homepage: http://github.com/titusfortner/watir_angular
 licenses:

data/lib/extensions/watir/browser.rb

@@ -1,16 +0,0 @@
-module Watir
-
-  class Browser
-    include WatirAngular
-
-    # TODO - reimplement with Watir Executor when available
-
-    alias_method :watir_initialize, :initialize
-
-    def initialize(*args)
-      watir_initialize(*args)
-      proc = ->(browser) { browser.wait_for_angular }
-      @after_hooks.add(proc)
-    end
-  end # Browser
-end # Watir

data/lib/watir_angular/locators/element/selector_builder.rb

@@ -1,61 +0,0 @@
-module WatirAngular
-  module Locators
-
-    module SelectorHelpers
-      def assert_valid_as_attribute(attribute)
-        return if ng_attribute?(attribute)
-        super
-      end
-
-      def ng_attribute?(attribute)
-        ng_attributes.include? attribute[/^ng_(.+)$/, 1]
-      end
-
-      def ng_attributes
-        %w[app bind bind_html bind_template blur change checked class
-class_even class_odd click cloak controller copy csp cut dblclick disabled focus
-form hide href if include init jq keydown keypress keyup list maxlength
-minlength model model_options mousedown mouseenter mouseleave mousemove mouseover
-mouseup non_bindable open options paste pluralize readonly repeat required selected
-show src srcset style submit switch transclude value]
-      end
-    end
-
-    class Element
-      class SelectorBuilder < Watir::Locators::Element::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-    class Button
-      class SelectorBuilder < Watir::Locators::Button::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-    class Cell
-      class SelectorBuilder < Watir::Locators::Cell::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-    class Row
-      class SelectorBuilder < Watir::Locators::Row::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-    class TextArea
-      class SelectorBuilder < Watir::Locators::TextArea::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-    class TextField
-      class SelectorBuilder < Watir::Locators::TextField::SelectorBuilder
-        include SelectorHelpers
-      end
-    end
-
-  end
-end

data/support/travis.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-sh -e /etc/init.d/xvfb start