webdrone 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a26ea163cdfb711c8037ff6e8550bb9ba27787
-  data.tar.gz: 02e5a85d31ddde91b0448c24a7ee48d5ba759db4
+  metadata.gz: 2a8be3ed6b1bf005705bffb2b3ad835a65b02ae4
+  data.tar.gz: 4694591f750bc154f188a5deb4443429c18464b7
 SHA512:
-  metadata.gz: f55b9f99a04f3b36013c2371f7ff5ff567889dad77cb0d3d68b3f51556ca2386a0e7d66ff1b33c5c797618725ba4444670197d04a6a81413d8897828063ffbf3
-  data.tar.gz: 38be7081da5b436cefaf46c3fa80663e98a0ae0343e0f3a8f3c2fc17c33a8efaec0c1dd4d5720dcd933c55a6e323b6fa27fa57bff04564d1074defe95f98e9cf
+  metadata.gz: dcf687350868122854d483f3f74cc19819d8ca1d997f027ce8cb43d8bbc7eff8afa5ac4b4207f8fe4b5db7b04aa85b09587bd7f0fd2940d8822b520aa0426007
+  data.tar.gz: 2147db1b5d9f128e0a3a9c4a53c87ad45280eff43327433a3ec30b282946bcdc03713a43844f20f827def47aa19e7d765ccbfbded55df1ff05340306ade565b9

data/README.md

@@ -24,109 +24,10 @@ Check for updates:
 
     $ gem update webdrone
 
-## Usage
-
-Create a browser:
-
-```ruby
-require 'webdrone'
-
-a0 = Webdrone.create timeout: 5
-a0.open.url         'http://www.google.com/'
-a0.quit
-
-# or
-Webdrone.create timeout: 5 do |a0|
-  a0.open.url       'http://www.google.com/'
-end
-```
-
-Take a screenshot:
-
-```ruby
-a0.shot.screen        'login'        # saves to screenshot-0001-login.png
-a0.shot.screen        'home'         # saves to screenshot-0002-home.png
-```
-
-Working with forms:
-
-```ruby
-
-Webdrone.create do |a0|
-  a0.open.url       'http://www.google.com/'
-  a0.form.set         'q', 'A0::WebDrone'
-  a0.form.submit
-end
-
-
-# or
-a0.form.with_xpath '//label[contains(.,"%s")]/following-sibling::*/*[self::input | self::textarea | self::select]' do
-  set               'label', 'value'
-  xlsx              sheet: 'ejemplo'
-end
-a0.form.submit
-```
-
-Filling a form from an xlsx spreadsheet:
-```ruby
-TODO
-```
-
-
-
-Config:
-
-```ruby
-TODO
-```
-
-Saving screenshots and downloaded files to a directory:
-
-```ruby
-a0 = Webdrone.create create_outdir: true
-print a0.conf.outdir            # <= default is webdrone_output_%date%_%time%
-
-a0.open.url     'http://www.google.cl/'
-a0.form.set     'q', "Download sample file filetype:xls\n"
-a0.shot.screen  'homepage'      # screenshot is saved in output directory
-a0.clic.xpath   '//h3'          # xls file is saved in output directory
-
-# or specify directory yourself
-a0 = Webdrone.create outdir: '/tmp/evidences'
-print a0.conf.outdir            # <= "/tmp/evidences"
-```
-
-
-
-Creating tabs and switching iframes:
-
-```ruby
-a0.ctxt.create_tab
-a0.open.url     'http:://example.com/'
-a0.ctxt.with_frame 'iframe_name' do 
-  a0.find.on  'Some link or button'
-end
-```
-
-Getting text:
-
-```ruby
-puts  a0.text.id        'some_id'
-puts  a0.text.xpath     'some_xpath'
-```
-
-Verifying text and HTML attributes
-
-```ruby
-a0.vrfy.id    'some_id', contains: 'SOME TEXT'
-a0.vrfy.xpath 'some_xpath', eq: 'EXACT TEXT'
-a0.vrfy.link  'link', attr: 'disabled', eq: 'true'
-a0.vrfy.link  'link', attr: 'sample', contains: 'something'
-```
-
 ## Documentation
 
-Docs can be found [here](http://www.rubydoc.info/gems/webdrone).
+* [Documentation Wiki](https://github.com/a0/a0-webdrone-ruby/wiki)
+* Docs can be found [here](http://www.rubydoc.info/gems/webdrone).
 
 ## Development
 

data/lib/webdrone.rb

@@ -15,6 +15,7 @@ require 'webdrone/wait'
 require 'webdrone/text'
 require 'webdrone/vrfy'
 require 'webdrone/html'
+require 'os'
 require 'selenium-webdriver'
 require 'xpath'
 require 'rubyXL'

data/lib/webdrone/browser.rb

@@ -25,7 +25,7 @@ module Webdrone
       @@chrome_prefs
     end
 
-    def initialize(browser: 'chrome', create_outdir: true, outdir: nil, timeout:, maximize: true, error: :raise_report, chrome_prefs: nil, firefox_profile: nil)
+    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout:, maximize: true, error: :raise_report, chrome_prefs: nil, firefox_profile: nil)
       if create_outdir or outdir
         outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
         self.conf.outdir = outdir
@@ -37,13 +37,7 @@ module Webdrone
         @driver = Selenium::WebDriver.for browser.to_sym, prefs: chrome_prefs, args: ['--disable-popup-blocking']
       elsif outdir != nil and browser.to_sym == :firefox
         firefox_profile = Browser.firefox_profile if firefox_profile == nil
-        case RbConfig::CONFIG['host_os'].downcase
-          when /mingw|mswin/
-            # Windows
-            downdir = outdir.gsub("/", "\\")
-          else
-            downdir = outdir
-        end
+        downdir = OS.windows? ? outdir.gsub("/", "\\") : outdir
         firefox_profile['browser.download.dir'] = downdir
         @driver = Selenium::WebDriver.for browser.to_sym, profile: firefox_profile
       else

data/lib/webdrone/clic.rb

@@ -12,46 +12,25 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, n: 1, all: false, visible: true)
-      @a0.find.id(text, n: n, all: all, visible: visible).click
+    def clic(text, n: 1, all: false, visible: true)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      if item.is_a? Array
+        item.each(&:click)
+      else
+        item.click
+      end
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    def css(text, n: 1, all: false, visible: true)
-      @a0.find.css(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def link(text, n: 1, all: false, visible: true)
-      @a0.find.link(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def button(text, n: 1, all: false, visible: true)
-      @a0.find.button(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
+    alias_method :id,     :clic
+    alias_method :css,    :clic
+    alias_method :link,   :clic
+    alias_method :button, :clic
+    alias_method :on,     :clic
+    alias_method :option, :clic
+    alias_method :xpath,  :clic
 
-    def on(text, n: 1, all: false, visible: true)
-      @a0.find.on(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def option(text, n: 1, all: false, visible: true)
-      @a0.find.option(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def xpath(text, n: 1, all: false, visible: true)
-      @a0.find.xpath(text, n: n, all: all, visible: visible).click
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
+    protected :clic
   end
 end

data/lib/webdrone/error.rb

@@ -47,6 +47,7 @@ module Webdrone
     def report
       report_script
       report_screenshot
+      report_os
       report_exception
       report_time
     end
@@ -56,7 +57,8 @@ module Webdrone
         ini, fin = [@location.lineno - 10 - 1, @location.lineno + 10 - 1]
         ini = 0 if ini < 0
 
-        write_title "#{@location.path} AT LINE #{sprintf '%3d', @location.lineno}"
+        write_title "LOCATION OF ERROR"
+        write_line "#{@location.path} AT LINE #{sprintf '%3d', @location.lineno}"
         File.readlines(@location.path)[ini..fin].each_with_index do |line, index|
           lno = index + ini + 1
           if lno == @location.lineno
@@ -77,10 +79,12 @@ module Webdrone
         begin
           @a0.ctxt.with_conf error: :raise do
             file = @a0.shot.screen 'a0_webdrone_error_report'
-            write_line "Screenshot Saved filename: #{file.path}"
+            write_line "Screenshot saved succesfully filename:"
+            write_line "#{File.expand_path(file.path)}"
           end
         rescue => exception
-          write_line "Error Saving screenhot: #{exception}"
+          write_line "Error Saving screenshot, exception:"
+          write_line "#{exception}"
         end
 
         dump_error_report
@@ -106,6 +110,15 @@ module Webdrone
       end
     end
 
+    def report_os
+      write_title "SYSTEM INFO"
+
+      write_line "A0 WEBDRONE VERSION: #{Webdrone::VERSION}"
+      write_line OS.report
+
+      dump_error_report
+    end
+
     def report_time
       write_title "#{Time.new}"
 

data/lib/webdrone/form.rb

@@ -12,7 +12,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def with_xpath(xpath, &block)
+    def with_xpath(xpath = nil, &block)
       @xpath = xpath
       instance_eval &block
     rescue => exception
@@ -44,8 +44,8 @@ module Webdrone
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    def mark(key, color: 'red')
-      @a0.mark.flash self.find_item(key), color: color
+    def mark(key, color: '#af1616', times: 3, sleep: 0.05)
+      @a0.mark.mark_item self.find_item(key), color: color, times: times, sleep: sleep
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
@@ -67,8 +67,10 @@ module Webdrone
 
     protected
       def find_item(key)
-        if @xpath
-          @lastitem = @a0.driver.find_element :xpath, sprintf(@xpath, key)
+        if @xpath.respond_to? :call
+          @lastitem = @a0.find.xpath @xpath.call(key).to_s
+        elsif @xpath.is_a? String and @xpath.include? '%s'
+          @lastitem = @a0.find.xpath sprintf(@xpath, key)
         else
           @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s
         end

data/lib/webdrone/mark.rb

@@ -12,69 +12,43 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.id(text, n: n, all: all, visible: visible), color: color
+    def mark(text, n: 1, all: false, visible: true, color: '#af1616', times: 3, sleep: 0.05)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      mark_item item, color: color, times: times, sleep: sleep
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    def css(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.css(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def link(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.link(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def button(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.button(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def on(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.on(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def option(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.option(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def xpath(text, color: 'red', n: 1, all: false, visible: true)
-      flash @a0.find.xpath(text, n: n, all: all, visible: visible), color: color
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def flash(item, color: 'red')
-      3.times do
-        border item, 'white'
-        sleep 0.05
-        border item, 'black'
-        sleep 0.05
-        border item, color
-        sleep 0.05
+    alias_method :id,     :mark
+    alias_method :css,    :mark
+    alias_method :link,   :mark
+    alias_method :button, :mark
+    alias_method :on,     :mark
+    alias_method :option, :mark
+    alias_method :xpath,  :mark
+
+    def mark_item(item, color: '#af1616', times: 3, sleep: 0.05)
+      times.times do
+        mark_item_border item, 'white'
+        sleep sleep
+        mark_item_border item, 'black'
+        sleep sleep
+        mark_item_border item, color
+        sleep sleep
       end
       item
     end
 
-    protected
-      def border(item, color)
-        if item.is_a? Array
-          item.each do |item|
-            @a0.exec.script("arguments[0].style.border = '2px solid #{color}'", item)
-          end
-        else
-          @a0.exec.script("arguments[0].style.border = '2px solid #{color}'", item)
+    def mark_item_border(item, color)
+      if item.is_a? Array
+        item.each do |item|
+          @a0.exec.script("arguments[0].style.outline = '2px solid #{color}'", item)
         end
+      else
+        @a0.exec.script("arguments[0].style.outline = '2px solid #{color}'", item)
       end
+    end
+
+    protected :mark, :mark_item_border
   end
 end

data/lib/webdrone/text.rb

@@ -12,7 +12,7 @@ module Webdrone
       @a0 = a0
     end
 
-    def find_text(text, n: 1, all: false, visible: true)
+    def text(text, n: 1, all: false, visible: true)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
       if item.is_a? Array
         item.collect(&:text)
@@ -23,13 +23,13 @@ module Webdrone
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    alias_method :id,     :find_text
-    alias_method :css,    :find_text
-    alias_method :link,   :find_text
-    alias_method :button, :find_text
-    alias_method :on,     :find_text
-    alias_method :option, :find_text
-    alias_method :xpath,  :find_text
+    alias_method :id,     :text
+    alias_method :css,    :text
+    alias_method :link,   :text
+    alias_method :button, :text
+    alias_method :on,     :text
+    alias_method :option, :text
+    alias_method :xpath,  :text
     
     def page_title
       @a0.driver.title
@@ -37,6 +37,6 @@ module Webdrone
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    protected :find_text
+    protected :text
   end
 end

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/lib/webdrone/vrfy.rb

@@ -12,49 +12,16 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.id(text), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def css(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.css(text), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def link(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.link(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def button(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.button(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def on(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.on(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def option(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.option(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def xpath(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
-      vrfy @a0.find.xpath(text, n: n, visible: visible), attr: attr, eq: eq, contains: contains
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+    def vrfy(text, n: 1, all: false, visible: true, attr: nil, eq: nil, contains: nil)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      if item.is_a? Array
+        item.each { |x| vrfy_item x, attr: attr, eq: eq, contains: contains }
+      else
+        vrfy_item item, attr: attr, eq: eq, contains: contains
+      end
     end
 
-    def vrfy(item, attr: nil, eq: nil, contains: nil)
+    def vrfy_item(item, attr: nil, eq: nil, contains: nil)
       if attr != nil
         r = item.attribute(attr) == eq if eq != nil
         r = item.attribute(attr).include? contains if contains != nil
@@ -73,5 +40,15 @@ module Webdrone
         end
       end
     end
+
+    alias_method :id,     :vrfy
+    alias_method :css,    :vrfy
+    alias_method :link,   :vrfy
+    alias_method :button, :vrfy
+    alias_method :on,     :vrfy
+    alias_method :option, :vrfy
+    alias_method :xpath,  :vrfy
+
+    protected :vrfy, :vrfy_item
   end
 end

data/webdrone.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "ci_reporter_rspec"
   spec.add_development_dependency "parallel_tests"
+  spec.add_runtime_dependency "os"
   spec.add_runtime_dependency "selenium-webdriver"
   spec.add_runtime_dependency "xpath"
   spec.add_runtime_dependency "rubyXL"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement