watchdoge 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a16fc3b9ab93bf0330328330314535ad9a74bc18caec50daf8327872564d4db
-  data.tar.gz: 28fa4084a510d0413af4d1d579e3ece2bcc480c7ca68c783a380587ac1d3f991
+  metadata.gz: 82f7faeabe1627ca97fb027c5b6dd4273d89f992a5f838a514b0df8202182382
+  data.tar.gz: 71d1cf9249ecb4696afdca3b815ed0c718f9a704010a245957cb1d1ecff8d480
 SHA512:
-  metadata.gz: '0999541a4012b25df6c64531f510279cf9509ccfccbdb98457b146a05eb51f3d4f1bacc96f96bcf659563010d558b64285229a9740fa100bc3763cf7bfaf1df6'
-  data.tar.gz: 1a7dc9b351fac103e1ee413bad479b3a805738f27818bdb505b4779063c74be55db38aff88fdb3d8325904fc0ee3d8265054ba8108dee3d5dc814cbdf36b25aa
+  metadata.gz: d9fc30e9d5ccc14002589d234f1a838fcde272179966c6589829b4c56a509c3611ce085626560a1325cba14c327fc8cb6c26c019c4185f9e417aadcc71c470f0
+  data.tar.gz: 7a0a333d68d915e269ea86b8955649463e2f288ff140ff094a91efa7816b44d558191cacdd0e473a012bceeef0dc04063f2235fd037e9602532e9c91683d72b6

data/lib/watchdoge/configuration.rb

@@ -33,9 +33,10 @@ module WatchDoge
     attr_accessor :web_drivers_dir
 
     attr_accessor :engine
-    attr_accessor :browser
     attr_accessor :cookie_pool
-    attr_accessor :http_timeout
+
+    attr_reader   :default_worker_options
+    attr_accessor :worker_options
 
     attr_accessor :notifications
 
@@ -65,15 +66,27 @@ module WatchDoge
       # framwork that Worker used, default to selenium
       @engine = Watir::Browser
 
-      # default browser used by engine
-      @browser = :firefox
+      # options for worker
+      @default_worker_options = {
+        # default window-size of worker
+        width: 1280,
+        height: 768,
+
+        # using Firfox as default browser
+        browser: :firefox,
+
+        # default to headless
+        headless: true,
+
+        # connection timeout threshold(seconds)
+        timeout: 120
+      }
+
+      @worker_options = {}
 
       # where all cookie saved (as yaml)
       @cookie_pool = @base_dir + '/.doge_cookie'
 
-      # connection timeout threshold(seconds)
-      @http_timeout = 120
-
       # map of notification sources
       #   key: must be stringify of its class name
       #   value: hash struct, will passed to constructor while push message

data/lib/watchdoge/regression.rb

@@ -23,17 +23,17 @@ module WatchDoge
           WatchDoge.hooks.before_regression.each { |t| instance_exec &t }
 
           Dir["#{WatchDoge::Regression::Utils.scenarios_dir}/*"].each do |scenario_path|
-            WatchDoge.hooks.before_scenario.each { |t| instance_exec &t }
-
             mgr = self.new scenario_path, regression_flag: regression_flag
 
+            WatchDoge.hooks.before_scenario.each { |t| mgr.instance_exec &t }
+
             if WatchDoge.hooks.around_scenario
               WatchDoge.hooks.around_scenario.call(Proc.new { mgr.eval_scenario })
             else
               mgr.eval_scenario
             end
 
-            WatchDoge.hooks.after_scenario.each { |t| instance_exec &t }
+            WatchDoge.hooks.after_scenario.each { |t| mgr.instance_exec &t }
           end
 
           WatchDoge.hooks.after_regression.each { |t| instance_exec &t }
@@ -49,7 +49,10 @@ module WatchDoge
         @setup_proc = nil
         @teardown_proc = nil
 
-        @worker = WatchDoge::Worker.new @scenario_name
+        worker_options =
+          WatchDoge.configuration.default_worker_options.merge WatchDoge.configuration.worker_options
+
+        @worker = WatchDoge::Worker.new @scenario_name, worker_options.dup
 
         @view_port = {}
       end

data/lib/watchdoge/regression/dsl.rb

@@ -13,7 +13,14 @@ module WatchDoge
       def use browser
         puts "[use] browser #{browser}"
         @worker.close
-        @worker = WatchDoge::Worker.new @scenario_name, browser: browser
+
+        worker_options =
+          WatchDoge.configuration.default_worker_options.merge WatchDoge.configuration.worker_options
+
+        worker_options = worker_options.dup
+        worker_options[:browser] = browser
+
+        @worker = WatchDoge::Worker.new @scenario_name, worker_options
       end
 
       def sign_in_as resoruce
@@ -42,20 +49,20 @@ module WatchDoge
         @setup_proc.call if @setup_proc
 
         args = {
-          before: nil
+          wait: nil
         }.merge(kwargs)
 
-        args[:before].call if args[:before]
-
         @worker.goto path
 
-        if kwargs[:wait]
+        if args[:wait]
           @view_port.merge!({
-            wait: kwargs[:wait]
+            wait: args[:wait]
           })
         end
 
         @worker.resize_by_viewport(@view_port) do
+          yield(@worker) if block_given?
+
           case @regression_flag
           when :capture
             puts "  -> make reference images on worker #{@worker}"

data/lib/watchdoge/worker.rb

@@ -20,27 +20,24 @@ module WatchDoge
     #   2. height: browser's height, default to 768
     #   3. http_client: instance of Selenium::WebDriver::Remote::Http
     #   4. all acceptable arguments of Watir::Browser class
-    def initialize uid, options={}
+    def initialize uid, options
       @http = Selenium::WebDriver::Remote::Http::Default.new
-      @browser = WatchDoge.configuration.browser
 
       # HTTP timeout default to 120 sec
-      @http.read_timeout = options.delete(:timeout) || WatchDoge.configuration.http_timeout
+      @http.read_timeout = options.delete(:timeout)
 
-      @uid = uid
+      @browser = options[:browser]
 
-      default_options = {
-        width: 1280,
-        height: 768,
-        headless: true,
+      @uid = uid
 
+      options = {
         # Selenium HTTP configuration
         http_client: @http
-      }.merge(options).merge(browser_profile)
+      }.merge(options).merge(default_browser_profile)
 
       # intall required version driver
       WatchDoge::WebdriverManager.new @browser
-      @core = WatchDoge.configuration.engine.new @browser, default_options
+      @core = WatchDoge.configuration.engine.new @browser, options
 
       # for generate uri hash
       @landed_page = nil
@@ -52,8 +49,8 @@ module WatchDoge
       @cookie_loaded = false
 
       # width/height
-      @width = default_options[:width]
-      @height = default_options[:height]
+      @width = options[:width]
+      @height = options[:height]
       @core.window.resize_to @width, @height
     end
 
@@ -105,7 +102,7 @@ module WatchDoge
 
     private
 
-    def browser_profile
+    def default_browser_profile
       case @browser
       when :chrome
         prefs = {}

data/watchdoge.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'watchdoge'
-  s.version     = '0.1.24'
+  s.version     = '0.1.25'
   s.date        = '2019-07-22'
   s.summary     = "dogi"
   s.description = "WatchDoge is Ruby on Rails friendly frontend regression test tool"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchdoge
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Shen Lee