watirsome 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe636cb3b0cae995c534f29c111f641c893c231b
-  data.tar.gz: 7de7589b70e4a487f50fed9e1a6928c308faa896
+  metadata.gz: c6f0438dee5cca61ecdc5c88626d2ba92acb1588
+  data.tar.gz: 544532f54c7f84faaac5368bd317fbda8fac45bf
 SHA512:
-  metadata.gz: 6dc9bab5a99c4db9460d4c3e34fa084adf1f4c3db3b56776be0d0e5c5b5492430f7df0a2c754cafbb63443fe15698647dc15764f8612b052154c627f8284293e
-  data.tar.gz: 0f853e10baafc6ef04c69c2210a5ccad5d4c4f4bfc225a333134a0ce11dd85be36371b5ab8216228b64c43d362c4681efbf3969b815f4d8bcf23a3fbc5ac341f
+  metadata.gz: bcf87becd8a08ccd1fbee22c583d7805ace58eed9fb768498cad864cc12cc1b03ce22817e35fceabd71fc1e415ae8bc67d2ac8b45b2d7bd8fb78bdae316de3ac
+  data.tar.gz: 84c964b0e353c55ce4625d1adfe2d3778dd6d4e46db3f40548dd1650e167610531aee93f603646ea34cf27e9e72cbf269feb322244a73406489e8aefefa0db2b

data/.travis.yml

@@ -5,3 +5,7 @@ rvm:
 before_script:
   - mkdir ~/.yard
   - bundle exec yard config load_plugins true
+  - export DISPLAY=:99
+  - sh -e /etc/init.d/xvfb start
+  - support/travis.sh
+  - export PATH="$(pwd)/bin:$PATH"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v0.2.0
+
+* Update watirsome for Watir 6
+
 ### v0.1.7
 
 * Massive refactoring

data/README.md

@@ -1,4 +1,4 @@
-## watirsome [![Gem Version](https://badge.fury.io/rb/watirsome.svg)](http://badge.fury.io/rb/watirsome) [![Build Status](https://secure.travis-ci.org/p0deje/watirsome.svg)](http://travis-ci.org/p0deje/watirsome) [![Coverage Status](https://coveralls.io/repos/p0deje/watirsome/badge.svg?branch=master)](https://coveralls.io/r/p0deje/watirsome)
+## watirsome [![Gem Version](https://badge.fury.io/rb/watirsome.svg)](http://badge.fury.io/rb/watirsome) [![Build Status](https://secure.travis-ci.org/p0deje/watirsome.svg)](http://travis-ci.org/p0deje/watirsome)
 
 Pure dynamic Watir-based page object DSL.
 
@@ -126,7 +126,7 @@ page = Page.new(@browser)
 page.link_a('Login')  # equals to @browser.div(class: 'layer').a(text: 'Login')
 ```
 
-#### Element accessors
+#### Element Accessors
 
 For each element, accessor method is defined which returns instance of `Watir::Element` (or subtype when applicable).
 
@@ -145,13 +145,13 @@ page.section_one_section  #=> #<Watir::HTMLElement:0x201b2f994f32c922 selector={
 page.svg_element          #=> #<Watir::HTMLElement:0x15288276ab771162 selector={:tag_name=>"svg"}>
 ```
 
-#### Readable accessors
+#### Readable Accessors
 
 For each readable element, accessor method is defined which returns text of that element.
 
 Read accessor method name is `element_name`.
 
-Default readable methods are: `[:div, :span, :p, :h1, :h2, :h3, :h4, :h5, :h6, :select_list, :text_field, :textarea]`.
+Default readable methods are: `[:div, :span, :p, :h1, :h2, :h3, :h4, :h5, :h6, :select_list, :text_field, :textarea, :checkbox, :radio]`.
 
 You can make other elements readable by adding tag names to `Watirsome.readable`.
 
@@ -177,7 +177,7 @@ There is a bit of logic behind text retrieval:
 2. If element is a select list, return text of first selected option
 3. Otherwise, return text
 
-#### Clickable accessors
+#### Clickable Accessors
 
 For each clickable element, accessor method is defined which performs click on that element.
 
@@ -203,13 +203,13 @@ page.login             # clicks on link
 page.submit('submit')  # clicks on submit input
 ```
 
-#### Settable accessors
+#### Settable Accessors
 
 For each settable element, accessor method is defined which sets value to that element.
 
 Click accessor method name is `#{element_name}=`.
 
-Default settable methods are: `[:text_field, :file_field, :textarea, :checkbox]`.
+Default settable methods are: `[:text_field, :file_field, :textarea, :checkbox, :select_list]`.
 
 You can make other elements settable by adding tag names to `Watirsome.settable`.
 
@@ -222,41 +222,22 @@ class Page
 
   text_field :username, label: 'Username'
   input :date, type: 'date'
+  select_list :country, label: 'Country'
 end
 
 page = Page.new(@browser)
 page.username = 'Username'         # sets value of username text field
 page.date = '2013-01-01', :return  # sends text to element and hits "Enter"
+page.country = 'Russia'            # selects option with "Russia" text
 ```
 
 If found element responds to `#set`, accessor calls it. Otherwise, `#send_keys` is used.
 
-#### Selectable accessors
-
-For each selectable element, accessor method is defined which selects opton of that element.
-
-Click accessor method name is `#{element_name}=`.
-
-Default selectable methods are: `[:select_list]`.
-
-You can make other elements selectable by adding tag names to `Watirsome.selectable`. Though, why would you want?
-
-```ruby
-class Page
-  include Watirsome
-
-  select_list :country, label: 'Country'
-end
-
-page = Page.new(@browser)
-page.country = 'Russia'  #=> selects option with "Russia" text
-```
-
 ### Initializers
 
 Watirsome provides you with initializers DSL to dynamically modify your pages/regions behavior.
 
-#### Page initializer
+#### Page Initializer
 
 Each page may define `#initialize_page` method which will be used as page constructor.
 
@@ -273,7 +254,7 @@ Page.new(@browser)
 #=> 'Initialized!'
 ```
 
-#### Region initializer
+#### Region Initializer
 
 Each region you include/extend may define `#initialize_region` method which will be called after page constructor.
 
@@ -309,9 +290,8 @@ Regions are being cached, so, once initialized, they won't be executed if you ca
 
 ### Limitations
 
-1. Currently tested to work only with `watir-webdriver`. Let me know if it works using `watir-classic`.
-2. You cannot use `Watir::Browser#select` method as it's overriden by `Kernel#select`. Use `Watir::Browser#select_list` instead.
-3. You cannot use block arguments to locate elements for settable/selectable accessors (it makes no sense). However, you can use block arguments for all other accessors.
+1. You cannot use `Watir::Browser#select` method as it's overriden by `Kernel#select`. Use `Watir::Browser#select_list` instead.
+2. You cannot use block arguments to locate elements for settable/selectable accessors (it makes no sense). However, you can use block arguments for all other accessors.
 
 ### Contribute
 

data/lib/watirsome.rb

@@ -10,19 +10,19 @@
 #     div :container, class: 'container'
 #   end
 #
-#   page = Page.new(browser)
-#   page.body_element  #=> browser.element(tag_name: 'body')
-#   page.container_div #=> browser.div(class: 'container')
+#   page = Page.new(@browser)
+#   page.body_element  #=> @browser.element(tag_name: 'body')
+#   page.container_div #=> @browser.div(class: 'container')
 #
 # @example Read Accessors
 #   class Page
 #     include Watirsome
 #
 #     div :container, class: 'container'
-#     radio :sex_male, value: "Male"
+#     radio :sex_male, value: 'Male'
 #   end
 #
-#   page = Page.new(browser)
+#   page = Page.new(@browser)
 #   page.container #=> "Container"
 #   page.sex_male_radio.set
 #   page.sex_male #=> true
@@ -34,27 +34,39 @@
 #     a :open_google, text: 'Open Google'
 #   end
 #
-#   page = Page.new(browser)
+#   page = Page.new(@browser)
 #   page.open_google
-#   browser.title #=> "Google"
+#   @browser.title #=> "Google"
 #
 # @example Set Accessors
 #   class Page
 #     include Watirsome
 #
-#     text_field :name, placeholder: "Enter your name"
-#     select_list :country, name: "Country"
-#     checkbox :agree, name: "I Agree"
+#     text_field :name, placeholder: 'Enter your name'
+#     select_list :country, name: 'Country'
+#     checkbox :agree, name: 'I Agree'
 #   end
 #
-#   page = Page.new(browser)
-#   page.name = 'My name'
+#   page = Page.new(@browser)
+#   page.name = "My name"
 #   page.name #=> "My name"
 #   page.country = "Russia"
 #   page.country #=> "Russia"
 #   page.agree = true
 #   page.agree #=> true
 #
+# @example Locators
+#   class Page
+#     include Watirsome
+#
+#     div :visible, class: 'visible', visible: true
+#     div :invisible, class: 'visible', visible: false
+#   end
+#
+#   page = Page.new(@browser)
+#   page.visible_div.visible?   #=> true
+#   page.invisible_div.visible? #=> false
+#
 module Watirsome
   class << self
     #
@@ -204,7 +216,7 @@ module Watirsome
   end
 end # Watirsome
 
-require 'watir-webdriver'
+require 'watir'
 require 'watirsome/accessors'
 require 'watirsome/initializers'
 require 'watirsome/errors'

data/lib/watirsome/accessors.rb

@@ -199,7 +199,7 @@ module Watirsome
           elements = @browser.__send__(method, *watir_args)
           custom_args.first.each do |k, v|
             elements.to_a.select! do |e|
-              if e.public_method(:"#{k}?").arity == 0
+              if e.public_method(:"#{k}?").arity.zero?
                 e.__send__(:"#{k}?") == v
               else
                 e.__send__(:"#{k}?", v)

data/lib/watirsome/initializers.rb

@@ -15,7 +15,7 @@ module Watirsome
   #     end
   #   end
   #
-  #   page = Page.new(browser)
+  #   page = Page.new(@browser)
   #   page.page_loaded
   #   #=> true
   #
@@ -33,7 +33,7 @@ module Watirsome
   #     attr_accessor :page_loaded
   #   end
   #
-  #   page = Page.new(browser)
+  #   page = Page.new(@browser)
   #   page.page_loaded
   #   #=> true
   #

data/lib/watirsome/version.rb

@@ -1,3 +1,3 @@
 module Watirsome
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.2.0'.freeze
 end # Watirsome

data/support/doctest.html

@@ -12,5 +12,9 @@
       <input type="radio" name="sex" value="Male">
       <input type="radio" name="sex" value="Female">
     </div>
+    <div>
+      <div class="visible">Visible</div>
+      <div class="visible" style="display: none">Invisible</div>
+    </div>
   </body>
 </html>

data/support/doctest_helper.rb

@@ -0,0 +1,17 @@
+require 'watirsome'
+
+YARD::Doctest.configure do |doctest|
+  doctest.before do
+    opts = {}
+    if ENV['TRAVIS']
+      Selenium::WebDriver::Chrome.path = "#{File.dirname(__FILE__)}/../bin/google-chrome"
+      opts[:args] = ['no-sandbox']
+    end
+    @browser = Watir::Browser.new(:chrome, opts)
+    @browser.goto "data:text/html,#{File.read('support/doctest.html')}"
+  end
+
+  doctest.after do
+    @browser.quit
+  end
+end

data/support/travis.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+
+mkdir bin/
+
+# https://omahaproxy.appspot.com
+# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
+CHROME_REVISION=386257
+curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"
+unzip chrome-linux.zip
+ln -s "$(pwd)/chrome-linux/chrome" "$(pwd)/bin/google-chrome"
+
+curl -L -O "http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip"
+unzip chromedriver_linux64.zip
+ln -s "$(pwd)/chromedriver" "$(pwd)/bin/chromedriver"

data/watirsome.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = %w[lib]
 
-  s.add_dependency 'watir-webdriver', '>= 0.6.9'
+  s.add_dependency 'watir', '>= 6.0'
 
   s.add_development_dependency 'yard-doctest', '>= 0.1.5'
   s.add_development_dependency 'rake'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: watirsome
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: watir-webdriver
+  name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
@@ -79,13 +79,14 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- doctest_helper.rb
 - lib/watirsome.rb
 - lib/watirsome/accessors.rb
 - lib/watirsome/errors.rb
 - lib/watirsome/initializers.rb
 - lib/watirsome/version.rb
 - support/doctest.html
+- support/doctest_helper.rb
+- support/travis.sh
 - watirsome.gemspec
 homepage: http://github.com/p0deje/watirsome
 licenses: []

data/doctest_helper.rb

@@ -1,16 +0,0 @@
-require 'watirsome'
-
-def browser
-  @browser ||= begin
-    browser = Watir::Browser.new(:phantomjs)
-    browser.goto "data:text/html,#{File.read('support/doctest.html')}"
-
-    browser
-  end
-end
-
-YARD::Doctest.configure do |doctest|
-  doctest.after do
-    @browser.quit if @browser
-  end
-end