webdrone 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6886483cc7bf3eeef28050d029da3565181361
-  data.tar.gz: b37e7cfefcda6f08fcfb26191b4c4fc8fa197c83
+  metadata.gz: 5cdf62a2cce8db573d203579df27407f5667783e
+  data.tar.gz: 27db99313aad1c4f26b0f863cdd1be81d35f9170
 SHA512:
-  metadata.gz: 878371a3882ce841051ade25fe9f2a9f3191a14cd0257201772a45c0bd9424571547494496a1e6c5c98ca522707af720f1ccc6d51bd51ab567e74f17956ccb3b
-  data.tar.gz: 36cab00a6abba640a62f860433812e281e7ab0d897523c95e8267b89a592c9f8a9fc0a8a44220f10ca8f206855ac7e8fa77bd08862d3ddb9693b4a921f910cf9
+  metadata.gz: 140491cb3a032217fee14d222f1fc34301d045e84b1d0d8e9e3929644d61e908bbfdf1e73ec36b78c7a4b5556f0d75f163be8687a4263d7e38fb66cbac7880dc
+  data.tar.gz: a3bbd965994875b3f8b66f8b7464022f609ccefca77461a4e36ebb7a378ed0b92e1c7131a5976dd03f3aa8668873ee9738a18c82dc66e110783a9ee1c406e199

data/CHANGELOG.md

@@ -4,6 +4,47 @@ New features are summarized here.
 
 
 
+## v1.6.0 - 2017-01-15
+### Added
+- Added `mark:` an `shot:` parameters to `a0.clic`. The following code will mark the element, take a screenshot and then click the element.
+```
+a0.clic.on 'something', mark: true, shot: true
+```
+### Changed
+- Changed default to true for `quit_at_exit` in `Webdrone.create`.
+- Setting default of 30 seconds to timeout parameter in `Webdrone.create`. This means the timeout is an optional parameter, for ex:
+```ruby
+# Before
+a0 = Webdrone.create                # <= ArgumentError: missing keyword: timeout
+a0 = Webdrone.create timeout: 10    # setting timeout to 10 seconds
+
+# Now
+a0 = Webdrone.create                # default timeout of 30 seconds
+a0 = Webdrone.create timeout: 10    # overriding timeout to 10 seconds 
+```
+- Renamed `sleep` to `delay` in `a0.mark`, for example:
+```ruby
+# Before
+export WEBDRONE_MARK_TIMES=1
+export WEBDRONE_MARK_SLEEP=0
+a0.mark.on          'something'
+
+a0.mark.on          'something', times: 2, sleep: 1
+
+# Now
+export WEBDRONE_MARK_TIMES=1
+export WEBDRONE_MARK_DELAY=0
+a0.mark.on          'something'
+
+a0.mark.on          'something', times: 2, delay: 1
+```
+### Fixed
+- Firefox using geckodriver is not supporting window resizing/positioning :-(. The following error will be ignored in the meantime:
+```
+Selenium::WebDriver::Error::UnsupportedOperationError: The W3C standard does not currently support setting the Window Position" 
+```
+
+
 ## v1.5.0 - 2016-08-11
 ### Added
 - Added platform info for Webdrone (ruby) on a0_webdrone_trace.csv file

data/lib/webdrone/browser.rb

@@ -58,7 +58,7 @@ module Webdrone
       end
     end
 
-    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout:, developer: false, logger: true, quit_at_exit: false, maximize: true, error: :raise_report, win_x: nil, win_y: nil, win_w: nil, win_h: nil, use_env: true, chrome_prefs: nil, firefox_profile: nil, remote_url: nil)
+    def initialize(browser: 'firefox', create_outdir: true, outdir: nil, timeout: 30, developer: false, logger: true, quit_at_exit: true, maximize: true, error: :raise_report, win_x: nil, win_y: nil, win_w: nil, win_h: nil, use_env: true, chrome_prefs: nil, firefox_profile: nil, remote_url: nil)
       env_update(Kernel.binding) if use_env
       if create_outdir or outdir
         outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
@@ -111,8 +111,12 @@ module Webdrone
         else
           win_h ||= h
         end
-        @driver.manage.window.position= Selenium::WebDriver::Point.new win_x, win_y
-        @driver.manage.window.resize_to(win_w, win_h)
+        begin
+          @driver.manage.window.position = Selenium::WebDriver::Point.new win_x, win_y
+          @driver.manage.window.resize_to(win_w, win_h)
+        rescue => e
+          puts "Ignoring error on window position/resize: #{e}"
+        end
       else
         self.maximize if maximize
       end

data/lib/webdrone/clic.rb

@@ -12,8 +12,13 @@ module Webdrone
       @a0 = a0
     end
 
-    def clic(text, n: 1, all: false, visible: true)
+    def clic(text, n: 1, all: false, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil, mark: false)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      if mark
+        @a0.mark.mark_item(item, color: color, times: times, delay: delay, shot: shot, text: text)
+      elsif shot
+        @a0.shot.screen shot.is_a?(String) ? shot : text
+      end
       if item.is_a? Array
         item.each(&:click)
       else

data/lib/webdrone/form.rb

@@ -114,8 +114,8 @@ module Webdrone
       Webdrone.report_error(@a0, exception)
     end
 
-    def mark(key, n: 1, visible: true, color: '#af1616', times: nil, sleep: nil, shot: nil)
-      @a0.mark.mark_item self.find_item(key, n: n, visible: visible), color: color, times: times, sleep: sleep, shot: shot
+    def mark(key, n: 1, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil)
+      @a0.mark.mark_item self.find_item(key, n: n, visible: visible), color: color, times: times, delay: delay, shot: shot
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end

data/lib/webdrone/mark.rb

@@ -6,17 +6,17 @@ module Webdrone
   end
 
   class Mark
-    attr_accessor :a0, :default_times, :default_sleep
+    attr_accessor :a0, :default_times, :default_delay
 
     def initialize(a0)
       @a0 = a0
       @default_times = ENV['WEBDRONE_MARK_TIMES'] || 3
-      @default_sleep = ENV['WEBDRONE_MARK_SLEEP'] || 0.05
+      @default_delay = ENV['WEBDRONE_MARK_DELAY'] || 0.05
     end
 
-    def mark(text, n: 1, all: false, visible: true, color: '#af1616', times: nil, sleep: nil, shot: nil)
+    def mark(text, n: 1, all: false, visible: true, color: '#af1616', times: nil, delay: nil, shot: nil)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
-      mark_item item, color: color, times: times, sleep: sleep, shot: shot, text: text
+      mark_item item, color: color, times: times, delay: delay, shot: shot, text: text
     rescue => exception
       Webdrone.report_error(@a0, exception)
     end
@@ -29,16 +29,16 @@ module Webdrone
     alias_method :option, :mark
     alias_method :xpath,  :mark
 
-    def mark_item(item, color: '#af1616', times: nil, sleep: nil, shot: nil, text: nil)
+    def mark_item(item, color: '#af1616', times: nil, delay: nil, shot: nil, text: nil)
       times ||= @default_times
-      sleep ||= @default_sleep
+      delay ||= @default_delay
       times.times do
         mark_item_border item, 'white'
-        sleep sleep
+        sleep delay
         mark_item_border item, 'black'
-        sleep sleep
+        sleep delay
         mark_item_border item, color
-        sleep sleep
+        sleep delay
       end
       @a0.shot.screen shot.is_a?(String) ? shot : text  if shot
       item

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler