angular_webdriver 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddebdc5e0805f1a225634f2472d982f3e29d7f5
-  data.tar.gz: 4725e12aef7fc193b367dc393d397b46149befb2
+  metadata.gz: 58db555e9c61c2ac98f01a0f922028cedd06a7bb
+  data.tar.gz: 0690ef7884d1dd4f96e8b1652fd8130c5d9545e2
 SHA512:
-  metadata.gz: 881b3dac4df7917e4dd36dccc99349148ec86d90abf80d204fc76bfe5af181c42f02e32cfb6a80c71852b9e685ac0b56f3104eea682456ce1df8fbc2fb8fe940
-  data.tar.gz: 0d4ccf98664fe02f9708bae8b3f2556968c5b0b594a4141594cf4b7d8cba5c0ea064a51a31895a55bc285027e043af1411bdd1e79c3213154e7c2b233321a323
+  metadata.gz: 4803748675e7324fd817f3af6475245eee262e00a4a0ec72ebf162e58837155894b933f71980e4105c7cf2c3b579b72f1eeb43e89d3f7e45638669c5239767c9
+  data.tar.gz: 101732bf8cdd661a9393128b7526ea5c0ebebf1b60be0b91b73a80a771f8a349846c258a01c3bbea203aa39aef4ff779d6ec3486b9a7e3cae37ed365fb313d5d

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'thor' # enable: bundle exec thor spec
+gem 'coveralls', require: false

data/angular_webdriver.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   # exact versions of both are used.
   s.add_runtime_dependency 'selenium-webdriver', '= 2.46.2'
   s.add_runtime_dependency 'watir-webdriver', '= 0.7.0'
-  s.add_runtime_dependency 'webdriver_utils', '>= 0.0.6'
+  s.add_runtime_dependency 'webdriver_utils', '>= 1.0.2'
 
-  s.add_development_dependency 'rspec', '>= 3.2.0'
-  s.add_development_dependency 'appium_thor', '>= 0.0.7'
+  s.add_development_dependency 'rspec', '>= 3.3.0'
+  s.add_development_dependency 'appium_thor', '>= 1.0.1'
   s.add_development_dependency 'pry', '>= 0.10.1'
-  s.add_development_dependency 'trace_files', '~> 0.0.2'
+  s.add_development_dependency 'trace_files', '>= 1.0.0'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(gen|test|spec|features|protractor)/})

data/lib/angular_webdriver/protractor/protractor.rb

@@ -67,7 +67,7 @@ class Protractor
     return @base_url = nil unless url
 
     uri = URI.parse(url) rescue false
-    raise "Invalid URL #{url.inspect}. Must contain scheme and host." unless uri && uri.scheme && uri.host
+    fail ArgumentError, "Invalid URL #{url.inspect}. Must contain scheme and host." unless uri && uri.scheme && uri.host
     @base_url = url
   end
 
@@ -111,10 +111,10 @@ class Protractor
 
     timeout = opt_timeout
 
-    raise "Invalid timeout #{timeout}" unless timeout.is_a?(Numeric)
+    fail ArgumentError, "Invalid timeout #{timeout}" unless timeout.is_a?(Numeric)
 
     unless destination.is_a?(String) || destination.is_a?(URI)
-      raise "Invalid destination #{destination}"
+      fail ArgumentError, "Invalid destination #{destination}"
     end
 
     # http://about:blank doesn't work. it must be exactly about:blank
@@ -157,7 +157,7 @@ class Protractor
       url                  = executeScript_('return window.location.href;', msg.call('get url'))
       not_on_reset_url     = url != reset_url
       destination_is_reset = destination == reset_url
-      raise 'still on reset url' unless not_on_reset_url || destination_is_reset
+      fail 'still on reset url' unless not_on_reset_url || destination_is_reset
     end
 
     # now that the url has changed, make sure Angular has loaded
@@ -181,13 +181,13 @@ class Protractor
   #
   #  @param opt_timeout [Integer] Number of seconds to wait for Angular to start.
   #
-  def refresh opt_timeout
-    timeout = opt_timeout || 10
+  def refresh opt_timeout=10
+    timeout = opt_timeout
 
     return driver.navigate.refresh if ignore_sync
 
-    executeScript_('return window.location.href;',
-                   'Protractor.refresh() - getUrl')
+    href = executeScript_('return window.location.href;',
+                          'Protractor.refresh() - getUrl')
 
     get(href, timeout)
   end
@@ -240,7 +240,7 @@ class Protractor
     @watir = opts[:watir]
 
     valid_watir = defined?(Watir::Browser) && @watir.is_a?(Watir::Browser)
-    raise "Driver must be a Watir::Browser not #{@driver.class}" unless valid_watir
+    fail ArgumentError, "Driver must be a Watir::Browser not #{@driver.class}" unless valid_watir
     @driver = @watir.driver
 
     unless Selenium::WebDriver::SearchContext::FINDERS.keys.include?(NEW_FINDERS_KEYS)
@@ -290,15 +290,9 @@ class Protractor
     #
     # toplevel self enables by/element from within pry. rspec helpers enables
     # by/element within rspec tests when used with install_rspec_helpers.
-    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
+    toplevel_main      = TOPLEVEL_BINDING.eval('self')
+    [toplevel_main, ::AngularWebdriver::RSpecHelpers].each do |obj|
+      method_type = :define_singleton_method
 
       obj.send method_type, :element do |*args|
         protractor_element.element *args

data/lib/angular_webdriver/protractor/rspec_helpers.rb

@@ -5,15 +5,46 @@ module AngularWebdriver
   module RSpecHelpers
   end
 
-  # call within before(:all) in rspec config after invoking Protractor.new
-  def self.install_rspec_helpers
-    context = RSpec::Core::ExampleGroup
-    helpers = AngularWebdriver::RSpecHelpers
-    helpers.singleton_methods.each do |method_symbol|
-      context.send(:define_method, method_symbol) do |*args|
-        args.length == 0 ? helpers.send(method_symbol) :
-                           helpers.send(method_symbol, *args)
+  class << self
+    # call after invoking Protractor.new. Installs by/element/no_wait
+    def install_rspec_helpers context = RSpec::Core::ExampleGroup
+      helpers = AngularWebdriver::RSpecHelpers
+      helpers.singleton_methods(false).each do |method_symbol|
+        context.send(:define_method, method_symbol) do |*args, &block|
+          args.length == 0 ? helpers.send(method_symbol, &block) :
+            helpers.send(method_symbol, *args, &block)
+        end
       end
     end
-  end
-end
+
+    def require_all_pages glob_path=nil
+      glob_path ||= File.join(Rake.application.original_dir, 'page', '**', '*.rb')
+      Dir.glob(glob_path) { |file| require_relative file }
+    end
+
+    def define_page_methods opts={}
+      method        = opts.fetch(:method, :define_singleton_method)
+      page_module   = opts[:page_module] || raise('must set page_module')
+      target_class  = opts[:target_class] || raise('must set target_class')
+      driver_object = opts[:watir] || opts[:driver] || raise('must set driver')
+      page_module.constants.each do |page_class|
+        qualified_class = page_module.const_get(page_class)
+
+        # enable use of by/element/no_wait within block passed to pageobject element
+        # element(:greet_button) { element(by.binding('greet'))   }
+        AngularWebdriver.install_rspec_helpers qualified_class
+
+        # ButtonsPage => buttons_page
+        # https://github.com/rails/rails/blob/daaa21bc7d20f2e4ff451637423a25ff2d5e75c7/activesupport/lib/active_support/inflector/methods.rb#L96
+        page_name = page_class.to_s.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+        target_class.send(method, page_name) do
+          instance_name = "@#{page_module}#{page_class}"
+          instance      = instance_variable_get(instance_name)
+          return instance if instance
+          obj = qualified_class.new driver_object
+          instance_variable_set instance_name, obj
+        end
+      end
+    end
+  end # class << self
+end # module AngularWebdriver

data/lib/angular_webdriver/version.rb

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

data/readme.md

@@ -1,4 +1,7 @@
-# angular_webdriver [![Gem Version](https://badge.fury.io/rb/angular_webdriver.svg)](https://rubygems.org/gems/angular_webdriver) [![Build Status](https://travis-ci.org/bootstraponline/angular_webdriver.svg?branch=master)](https://travis-ci.org/bootstraponline/angular_webdriver/builds)
+# angular_webdriver 
+
+[![Gem Version](https://badge.fury.io/rb/angular_webdriver.svg)](https://rubygems.org/gems/angular_webdriver) [![Build Status](https://travis-ci.org/bootstraponline/angular_webdriver.svg?branch=master)](https://travis-ci.org/bootstraponline/angular_webdriver/builds) [![Coverage Status](https://coveralls.io/repos/bootstraponline/angular_webdriver/badge.svg?nocache)](https://coveralls.io/r/bootstraponline/angular_webdriver) [![Dependency Status](https://gemnasium.com/bootstraponline/angular_webdriver.svg?nocache)](https://gemnasium.com/bootstraponline/angular_webdriver)
+
 
 Angular enhancements to the Ruby webdriver bindings based on [protractor](https://github.com/angular/protractor).
 

data/release_notes.md

@@ -1,3 +1,24 @@
+#### v1.0.5 2015-06-20
+
+- [248bd2a](https://github.com/bootstraponline/angular_webdriver/commit/248bd2a7d979543047e4ad9d4f7f12f4a99f4ce8) Release 1.0.5
+- [1347e18](https://github.com/bootstraponline/angular_webdriver/commit/1347e181c8d0c29a9e62b9a7a29c882c20fff6e4) Update dependencies
+- [0f41127](https://github.com/bootstraponline/angular_webdriver/commit/0f411277df55783ef46736ba28c5f3aaee07324c) Update install_rspec_helpers. Add page helpers
+- [b4c4ad4](https://github.com/bootstraponline/angular_webdriver/commit/b4c4ad4d519b1538e4db5e25ddd7594f86b99660) Test rspec helpers
+- [7075fc0](https://github.com/bootstraponline/angular_webdriver/commit/7075fc037acf2797e39ea4be64631275b2c6ded6) Update badges
+- [ddbfbf0](https://github.com/bootstraponline/angular_webdriver/commit/ddbfbf0c18489c1f1b73f458daeca4f0defdf0c8) Add gemnasium badge
+- [b47c73c](https://github.com/bootstraponline/angular_webdriver/commit/b47c73c8835e160b28ab0b65bb66866f32e744a5) Set spec timeouts and window size
+- [5b5b260](https://github.com/bootstraponline/angular_webdriver/commit/5b5b260d45df6f0a5f462cdcb5008d09b300b180) Test locate find_first_by_multiple
+- [eed49f4](https://github.com/bootstraponline/angular_webdriver/commit/eed49f44d6bf9ed6caf5a725648d16acbdcc0991) Improve watir patch tests
+- [2033489](https://github.com/bootstraponline/angular_webdriver/commit/2033489b6f8425c19e55b1eb8bab5d18c1f6ecf9) Clean up exception raising
+- [20b8d91](https://github.com/bootstraponline/angular_webdriver/commit/20b8d91bac69d4e2411baed30c470db23c6c7ab8) Fix protractor refresh
+- [df975a4](https://github.com/bootstraponline/angular_webdriver/commit/df975a4ce94950e58f0077c3510402912d327ae0) Fix dynamic methods
+- [2b0aa97](https://github.com/bootstraponline/angular_webdriver/commit/2b0aa97e8f31003bb75a1ad7c3bc1c8cd7cf6d93) Launch browser exactly once for faster testing
+- [a522795](https://github.com/bootstraponline/angular_webdriver/commit/a52279514b9db1ff3ec548bd9f63f8ab003e54b7) Disable Pry paging
+- [a5d129e](https://github.com/bootstraponline/angular_webdriver/commit/a5d129ec81a85a18952a040b9be1b6ef7345bad3) Fix client side scripts spec
+- [cdf3c88](https://github.com/bootstraponline/angular_webdriver/commit/cdf3c88e1aa7cde322843aa25bfadd7fe03a6ccd) Add coveralls
+- [e9231df](https://github.com/bootstraponline/angular_webdriver/commit/e9231dfbb327e6243222dda573fbdc9eb97b6c95) Remove completed todo
+
+
 #### v1.0.4 2015-06-07
 
 - [a7965d7](https://github.com/bootstraponline/angular_webdriver/commit/a7965d7d1103bb802eabbdf11a37c9be8f9f3547) Release 1.0.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angular_webdriver
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: appium_thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: trace_files
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
 description: Angular webdriver.
 email:
 - code@bootstraponline.com
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"