bucky-core 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13cebeab73b7e81980d36a07515ac17fb040eea9
-  data.tar.gz: 407b0fc24a25d52ce5977fa2a63e2c7b5a5b1021
+  metadata.gz: 2b9ddfb233321416ab533a5e156cd947f0d5e44b
+  data.tar.gz: d2eb7b14ed2c76e537312f701fe93ae45bfb4b43
 SHA512:
-  metadata.gz: 2c49d372f9e4a36a81daaf07fe7309caf7286e5dbbfd6ad4094bc29eaded54f4bf51c1ed84ad3813858b974c5cbcd63729d87438ebe3b881a76c779ee69ba1b1
-  data.tar.gz: 65ba083425e8b97bc0e59486c3663e8e293c1add4cb1e4cd89749dea1333e078e79bd40bb73235122ae020631e90784ad35eb07207b7e315b65690e731ee8811
+  metadata.gz: 13028e8366556af56000d2f0a96b3b4c523a7b6ff4e62e98fd6147d33bee5100f35742e6f232d5394435e3a0e446fd434cc36b73bd56796619ed0c94c53d17da
+  data.tar.gz: f0350162e227a603748e2371f69656bb3be679e07bdaba669843613f9b7925a6a260a3aed39d07b65f4c7c9f13c562b750ee1e4dfdcae42989d231468686dede

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bucky-core (0.9.9)
+    bucky-core (0.9.11)
       color_echo (~> 3.1)
       json (~> 2.1)
       nokogiri (~> 1.8)

data/lib/bucky/test_equipment/pageobject/base_pageobject.rb

@@ -2,11 +2,14 @@
 
 require_relative '../../utils/yaml_load'
 require_relative '../../core/exception/bucky_exception'
+require_relative '../selenium_handler/wait_handler'
+
 module Bucky
   module TestEquipment
     module PageObject
       class BasePageObject
         include Bucky::Utils::YamlLoad
+        include Bucky::TestEquipment::SeleniumHandler::WaitHandler
 
         # https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/SearchContext.html#find_element-instance_method
         FINDERS = {
@@ -52,7 +55,8 @@ module Bucky
           method_name = method.downcase.to_sym
           raise StandardError, "Invalid finder. #{method_name}" unless FINDERS.key? method_name
 
-          elements = @driver.find_elements(method_name, value)
+          # wait until driver find element
+          elements = wait_until_helper(3, 0.1, Selenium::WebDriver::Error::NoSuchElementError) { @driver.find_elements(method_name, value) }
           raise_if_elements_empty(elements, method_name, value)
 
           get_element_or_attribute = lambda do |elems, arg|
@@ -67,7 +71,7 @@ module Bucky
 
           elements.first.instance_eval do
             define_singleton_method('[]') { |arg| get_element_or_attribute.call(elements, arg) }
-            %w[each length].each { |m| define_singleton_method(m) { elements.send(m) } }
+            %w[each length].each { |m| define_singleton_method(m) { |&block| elements.send(m, &block) } }
           end
 
           elements.first

data/lib/bucky/test_equipment/selenium_handler/wait_handler.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'selenium-webdriver'
+require 'English'
+
+module Bucky
+  module TestEquipment
+    module SeleniumHandler
+      module WaitHandler
+        module_function
+
+        def wait_until_helper(timeout, interval, ignore, &block)
+          wait = Selenium::WebDriver::Wait.new(timeout: timeout, interval: interval, ignore: [ignore])
+          wait.until { block.call }
+        rescue Selenium::WebDriver::Error::TimeoutError
+          raise ignore, "Wait until the limit times for #{caller[1][/`([^']*)'/, 1]}\n   #{$ERROR_INFO.message}"
+        end
+      end
+    end
+  end
+end

data/lib/bucky/test_equipment/user_operation/user_operation_helper.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative '../selenium_handler/wait_handler'
+
 module Bucky
   module TestEquipment
     module UserOperation
       class UserOperationHelper
+        include Bucky::TestEquipment::SeleniumHandler::WaitHandler
+
         def initialize(args)
           @app = args[:app]
           @device = args[:device]
@@ -33,8 +37,8 @@ module Bucky
         def click(args)
           elem = @pages.get_part(args)
           elem.location_once_scrolled_into_view
-          sleep 1
-          elem.click
+          # when click successfully, return of click is nil.
+          wait_until_helper(5, 0.1, Selenium::WebDriver::Error::WebDriverError) { elem.click.nil? }
         end
 
         def refresh(_)
@@ -50,14 +54,8 @@ module Bucky
         end
 
         def switch_to_the_window(args)
-          # change ignore condition, NoSuchElementError to NoSuchWindowError
-          wait = Selenium::WebDriver::Wait.new(:timeout => 1, :interval => 0.1, :ignore => [Selenium::WebDriver::Error::NoSuchWindowError])
-          begin
-            # when the window successfully switched, return of switch_to.window is nil.
-            wait.until{ @driver.switch_to.window(args[:window_name]).nil? }
-          rescue Selenium::WebDriver::Error::TimeoutError
-            raise Selenium::WebDriver::Error::TimeoutError, "Exceeded the limit for trying switch_to_the_window.\n    #{$ERROR_INFO.message}"
-          end
+          # when the window successfully switched, return of switch_to.window is nil.
+          wait_until_helper(5, 0.1, Selenium::WebDriver::Error::NoSuchWindowError) { @driver.switch_to.window(args[:window_name]).nil? }
         end
 
         # Close window
@@ -71,7 +69,7 @@ module Bucky
         end
 
         def choose(args)
-          option = Selenium::WebDriver::Support::Select.new(@pages.get_part(args))
+          option = wait_until_helper(5, 0.1, Selenium::WebDriver::Error::StaleElementReferenceError) { Selenium::WebDriver::Support::Select.new(@pages.get_part(args)) }
           if args.key?(:text)
             type = :text
             selected = args[type].to_s
@@ -89,8 +87,8 @@ module Bucky
 
         # Alert accept
         def accept_alert(_)
-          a = @driver.switch_to.alert
-          a.accept
+          alert = wait_until_helper(5, 0.1, Selenium::WebDriver::Error::NoAlertPresentError) { @driver.switch_to.alert }
+          alert.accept
         end
 
         def wait(args)

data/lib/bucky/version.rb

@@ -2,6 +2,6 @@
 
 module Bucky
   module Version
-    VERSION = '0.9.12'
+    VERSION = '0.9.13'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucky-core
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - NaotoKishino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -364,6 +364,7 @@ files:
 - lib/bucky/test_equipment/evidence/evidence_generator.rb
 - lib/bucky/test_equipment/pageobject/base_pageobject.rb
 - lib/bucky/test_equipment/pageobject/pages.rb
+- lib/bucky/test_equipment/selenium_handler/wait_handler.rb
 - lib/bucky/test_equipment/selenium_handler/webdriver_handler.rb
 - lib/bucky/test_equipment/test_case/abst_test_case.rb
 - lib/bucky/test_equipment/test_case/e2e_test_case.rb