taf 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100e35dd9978bfa05efba145ff90b4141cbdd113d1d55b85bc81bcb8b3785ff8
-  data.tar.gz: 3a76b151dd7c36ced5f7d060fcc82af04066f81eaedd9c60e52c7ec09c813d8b
+  metadata.gz: 8fce262beb8801e713c9bf2bba991657eed3e3660d5098b3905d27c16abbb2c9
+  data.tar.gz: 9a98b39402e830e014216b8701082c89955556c90af42793ef7f797981c917c4
 SHA512:
-  metadata.gz: 43bdb2ada7aed5194dc3157fda08baf1f4b4ce62573ffdbecd6aa52ee75ca5a4cc5138e5dfb50774e5d42ea10a8161a5e8ccf81126d6111dbeadc3b147aa62c4
-  data.tar.gz: a2e404ee7781a6b306f8ad9bcc80007fe4306990d88bd2b05a3693244863069ecd8df73f035ff0d191eeca69c924d43f96d885bca6deb824e7ffaf81580d3250
+  metadata.gz: b93e27555e02b0478cbc0615a66812fe9c1621ccbebb0fbd452493fd5831b3d0ecf41af72275dffd39955eac8c06daae3b97a07d6eb9966e4c07faf7737df460
+  data.tar.gz: cdbe883d6dbb0ab8bf43c273eb36ae2814eff4955ad351a04e5ab2224a3157f7ad54f1ac622fd9e01fac91140239f205866f2e7c2687f0f459e2016808b88e7c

data/lib/functions/handlers/base_handler.rb

@@ -17,10 +17,10 @@ module TestSteps
 
       def login_process(b_title, user_elm, pass_elm, user, pass)
         if Browser.b.title.eql?(b_title)
-          Browser.b.text_field(id: user_elm).wait_until.set user
-          Browser.b.text_field(id: pass_elm).wait_until.set pass
+          Browser.b.text_field(id: user_elm).wait_until(&:exists?).set user
+          Browser.b.text_field(id: pass_elm).wait_until(&:exists?).set pass
           login_button
-          sleep 3
+          sleep 1
         else
           MyLog.log.warn("User: #{user} has failed to log in.")
         end
@@ -28,9 +28,9 @@ module TestSteps
 
       def login_button
         if Browser.b.button(value: 'Sign in').exist?
-          Browser.b.button(value: 'Sign in').wait_until.click
+          Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
         elsif Browser.b.button(value: 'Log in').exist?
-          Browser.b.button(value: 'Log in').wait_until.click
+          Browser.b.button(value: 'Log in').wait_until(&:exists?).click
         else
           MyLog.log.warn("User: #{user} has failed to log in.")
         end
@@ -75,7 +75,7 @@ module TestSteps
         Browser.b.select_list(:id => elm_id).option(:value => "#{char}").select
         }
 
-        Browser.b.button(value: 'Sign in').wait_until.click
+        Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
         if Browser.b.title.eql?(b_title_sucess)
           MyLog.log.info("User: #{user} has logged in successful.")
           return true

data/lib/functions/handlers/check_box.rb

@@ -9,7 +9,7 @@ module TestSteps
         checkbox = step_attributes[:testvalue]
         locate = step_attributes[:locate]
 
-        Browser.b.checkbox(:"#{locate}" => checkbox).wait_until.click
+        Browser.b.checkbox(:"#{locate}" => checkbox).wait_until(&:exists?).click
         MyLog.log.info("Check box: #{checkbox} has been selected")
         true
       rescue StandardError

data/lib/functions/handlers/check_boxdata.rb

@@ -19,10 +19,10 @@ module TestSteps
         index = found_box.index(true)
         return unless index
         if index.zero?
-          Browser.b.textarea(:"#{locate}" => box).wait_until
+          Browser.b.textarea(:"#{locate}" => box).wait_until(&:exists?)
           (Browser.b.textarea(:"#{locate}" => box).value == value)
         elsif index == 1
-          Browser.b.text_field(:"#{locate}" => box).wait_until
+          Browser.b.text_field(:"#{locate}" => box).wait_until(&:exists?)
           (Browser.b.text_field(:"#{locate}" => box).value == value)
         end
         MyLog.log.info("Textbox: #{box} has the correct value: #{value}")

data/lib/functions/handlers/check_browser_title.rb

@@ -6,17 +6,15 @@ module TestSteps
       register :check_browser_title
 
       def perform(step_attributes)
-        text_check = step_attributes[:testvalue]
+        b_title = step_attributes[:testvalue]
 
-        sleep 2
-        if Browser.b.title.eql?(text_check)
-          MyLog.log.info("Browser title: #{text_check}")
-          return true
-        else
-          MyLog.log.warn("Title not found: #{text_check}")
-          return false
-        end
+        Browser.b.wait_until { Browser.b.title.eql? (b_title)}
+        MyLog.log.info("Browser title: #{b_title}")
+        true
+      rescue StandardError
+        MyLog.log.warn("Title not found: #{b_title}")
+        false
       end
     end
   end
-end
+end

data/lib/functions/handlers/check_screendata.rb

@@ -6,17 +6,15 @@ module TestSteps
       register :check_screen_data
 
       def perform(step_attributes)
-        text_check = step_attributes[:testvalue]
+        check_text = step_attributes[:testvalue]
 
-        sleep 5
-        if Browser.b.text.include?(text_check)
-          MyLog.log.info("Found text: #{text_check}")
-          return true
-        else
-          MyLog.log.warn("NOT found text: #{text_check}")
-          return false
-        end
+        Browser.b.wait_until { Browser.b.element.text.include? (check_text)}
+        MyLog.log.info("Text found: #{check_text}")
+        true
+      rescue StandardError
+        MyLog.log.warn("Text not found: #{check_text}")
+        false
       end
     end
   end
-end
+end

data/lib/functions/handlers/click_button.rb

@@ -12,7 +12,7 @@ module TestSteps
         elms = %i{button span a div link image h1 h2 h3 h4}
 
         found_button = elms.map do |elm|
-          Browser.b.send(elm, :"#{locate}" => button).exist?
+          Browser.b.send(elm, :"#{locate}" => button).exists?
         end.compact
 
         raise 'Multiple matches' if found_button.select { |i| i }.empty?
@@ -21,25 +21,25 @@ module TestSteps
 
         case index
         when 0
-          Browser.b.button(:"#{locate}" => button).wait_until.click
+          Browser.b.button(:"#{locate}" => button).wait_until(&:exists?).click
         when 1
-          Browser.b.span(:"#{locate}" => button).wait_until.click
+          Browser.b.span(:"#{locate}" => button).wait_until(&:exists?).click
         when 2
-          Browser.b.a(:"#{locate}" => button).wait_until.click
+          Browser.b.a(:"#{locate}" => button).wait_until(&:exists?).click
         when 3
-          Browser.b.div(:"#{locate}" => button).wait_until.click
+          Browser.b.div(:"#{locate}" => button).wait_until(&:exists?).click
         when 4
-          Browser.b.link(:"#{locate}" => button).wait_until.click
+          Browser.b.link(:"#{locate}" => button).wait_until(&:exists?).click
         when 5
-          Browser.b.image(:"#{locate}" => button).wait_until.click
+          Browser.b.image(:"#{locate}" => button).wait_until(&:exists?).click
         when 6
-          Browser.b.h1(:"#{locate}" => button).wait_until.click
+          Browser.b.h1(:"#{locate}" => button).wait_until(&:exists?).click
         when 7
-          Browser.b.h2(:"#{locate}" => button).wait_until.click
+          Browser.b.h2(:"#{locate}" => button).wait_until(&:exists?).click
         when 8
-          Browser.b.h3(:"#{locate}" => button).wait_until.click
+          Browser.b.h3(:"#{locate}" => button).wait_until(&:exists?).click
         when 9
-          Browser.b.h4(:"#{locate}" => button).wait_until.click
+          Browser.b.h4(:"#{locate}" => button).wait_until(&:exists?).click
         end
         MyLog.log.info("Button: #{button} has been selected")
         true

data/lib/functions/handlers/list_all_dropdowns_values.rb

@@ -9,7 +9,7 @@ module TestSteps
         dropdown = step_attributes[:testvalue]
         locate = step_attributes[:locate]
 
-        Browser.b.element(:"#{locate}" => dropdown).wait_until
+        Browser.b.element(:"#{locate}" => dropdown).wait_until(&:exists?)
         Browser.b.select_list(:"#{locate}" => dropdown).options.each do |i|
           MyLog.log.info("List of dropdown for #{dropdown} are: #{i.text}")
         return true

data/lib/functions/handlers/radio_button.rb

@@ -11,7 +11,7 @@ module TestSteps
         locate = step_attributes[:locate]
         locate2 = step_attributes[:locate2]
 
-        Browser.b.radio(:"#{locate}" => radio).wait_until
+        Browser.b.radio(:"#{locate}" => radio).wait_until(&:exists?)
         Browser.b.radio(:"#{locate}" => radio, :"#{locate2}" => "#{value2}").set
         MyLog.log.info("Radio button: #{radio} has been selected")
         true

data/lib/functions/handlers/select_dropdown.rb

@@ -11,7 +11,7 @@ module TestSteps
         locate = step_attributes[:locate]
         locate2 = step_attributes[:locate2]
 
-        Browser.b.select_list(:"#{locate}" => dropdown).wait_until
+        Browser.b.select_list(:"#{locate}" => dropdown).wait_until(&:exists?)
         Browser.b.select_list(:"#{locate}" => dropdown).option(:"#{locate2}" => "#{value2}").select
         MyLog.log.info("Dropdown item: #{value2} has been selected")
         true

data/lib/functions/handlers/write_box_data.rb

@@ -19,10 +19,10 @@ module TestSteps
         index = found_box.index(true)
         return unless index
         if index.zero?
-          Browser.b.textarea(:"#{locate}" => box).wait_until.set value
+          Browser.b.textarea(:"#{locate}" => box).wait_until(&:exists?).set value
           (Browser.b.textarea(:"#{locate}" => box).value == value)
         elsif index == 1
-          Browser.b.text_field(:"#{locate}" => box).wait_until.set value
+          Browser.b.text_field(:"#{locate}" => box).wait_until(&:exists?).set value
           (Browser.b.text_field(:"#{locate}" => box).value == value)
         end
         MyLog.log.info("Textbox: #{box} has correct value: #{value}")

data/lib/functions/handlers/write_to_editor.rb

@@ -10,7 +10,7 @@ module TestSteps
         value = step_attributes[:testvalue2]
         locate = step_attributes[:locate]
 
-        Browser.b.iframe(:"#{locate}" => iframe).wait_until
+        Browser.b.iframe(:"#{locate}" => iframe).wait_until(&:exists?)
         Browser.b.iframe(:"#{locate}" => iframe).send_keys value
         MyLog.log.info("Editor box: #{iframe} has correct value: #{value}")
         true

data/lib/taf_config.rb

@@ -36,3 +36,6 @@ require_relative './parser/xlsx_parser'
 # Require all test step handlers, which register themselves with
 # TestStep.handlers when the files are required.
 require_relative './functions/handlers'
+
+# Watir config. set wait:
+Watir.default_timeout = 60

data/lib/version.rb

@@ -3,7 +3,7 @@
 module Taf
   # This module holds the TAF version information.
   module Version
-    STRING = '0.1.8'.freeze
+    STRING = '0.1.9'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler