watchdoge 0.1.22 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a6deaa86f5be34f6897add857e7fa2d045f26944ca58330f65a5a69fc353b3
-  data.tar.gz: 4e157ff755b3c1067cb058bc2479f3cbdd243a8edeef89018d31874e2f0447df
+  metadata.gz: '019747f5628db25d05c5c809d2cc66e0963d8ea977f61e2dbbdd322ed3223fea'
+  data.tar.gz: ff96d4b7718e406400f989bf2c9b17e8d3ff4e37dd004c92a0d31602162c5c89
 SHA512:
-  metadata.gz: 2e28048bc379d80f8a20349fd1a80ff38243846cff19f36430c22b58d335554724f8ab608225efd8b28cda4cd5537a19d095b9321e89e207a3e2bb362878ddf4
-  data.tar.gz: 9414cbb506b2e92def9555e696ab0dfd2fe7d0756a4ae65363002ae8f4e5949a572a6cb53b28495f738861869f5b700ac15b534d714b0d6f43459f9784d1180e
+  metadata.gz: bfb7070e7f412f24a206cb41493c9771a039723f6d55440b46923cce3df8e0c3f84225cde5cbb6f25f34dd6399b67ee218005dbeaf38e1f50b0a3a37a862dbcd
+  data.tar.gz: 669fc2e2e3836d2daeaf0dbd0251b963628628053b52c76716d8b173d7d15ccace383aec14321ef0e7b6382b1cf11a7a11130d891f6f59994e052c04e2d2da32

data/lib/watchdoge/configuration.rb

@@ -17,12 +17,14 @@ module WatchDoge
       attr_accessor :after_regression
       attr_accessor :before_scenario
       attr_accessor :after_scenario
+      attr_accessor :around_scenario
 
       def initialize
         @before_regression = []
         @after_regression = []
         @before_scenario = []
         @after_scenario = []
+        @around_scenario = nil
       end
     end
 
@@ -31,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
 
@@ -63,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/rails/railtie.rb

@@ -6,17 +6,15 @@ module WatchDoge
       namespace :watchdoge do
         desc "generating reference images"
         task :capture => :environment do
+          WatchDoge.initialize!
           WatchDoge::Regression::Manager.run_all_scenarios :capture
         end
         desc "scrap screenshots and compare with reference images"
         task :test => :environment do
+          WatchDoge.initialize!
           WatchDoge::Regression::Manager.run_all_scenarios :test
         end
       end
     end
-
-    initializer "watchdoge.initialize" do |app|
-      WatchDoge.initialize!
-    end
   end
 end

data/lib/watchdoge/regression.rb

@@ -20,18 +20,23 @@ module WatchDoge
 
       class << self
         def run_all_scenarios regression_flag
-          WatchDoge.hooks.before_regression.each { |t| t.call }
+          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| t.call }
-
             mgr = self.new scenario_path, regression_flag: regression_flag
-            mgr.eval_scenario
 
-            WatchDoge.hooks.after_scenario.each { |t| t.call }
+            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| mgr.instance_exec &t }
           end
 
-          WatchDoge.hooks.after_regression.each { |t| t.call }
+          WatchDoge.hooks.after_regression.each { |t| instance_exec &t }
           WatchDoge::Notification.flush
         end
       end
@@ -44,14 +49,17 @@ 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
 
       def eval_scenario
         puts "scenario: #{@scenario_name} begin"
-        eval File.read(@scenario_path)
+        instance_eval File.read(@scenario_path), @scenario_path
         @worker.close
         puts "scenario: #{@scenario_name} end\n"
         puts ""

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/version.rb

@@ -1,4 +1,4 @@
 # Version of WatchDoge
 module WatchDoge
-  VERSION = '0.1.22'
+  VERSION = '0.1.27'
 end

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.22'
+  s.version     = '0.1.27'
   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.22
+  version: 0.1.27
 platform: ruby
 authors:
 - Shen Lee
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: dogi