taf 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768dc5f49d4e43dfe0fa2204332c6aa4f6381fb5f9f0f5deebd4000a34b243d6
-  data.tar.gz: f6c53a43233dfea0a02c2028e3e43de390bb8cee239033b80aa53088ee88fe4f
+  metadata.gz: 31c202a157c5f26907dacb3a08df58921f03cea0a5eb9bcc75523cdd7b44c148
+  data.tar.gz: 22aefc58b15a5b6ea4c0396c82528ff335d9cd1ca05e7dfae6978c44b7d902a2
 SHA512:
-  metadata.gz: c7931a9595ec40c9be46342a0d2600a7e3da1441e2e3466a84611255b372c2f85514b9d635c2c6226e3ce1ccee91f2b6a316106814394074e54c42011e3f1bc0
-  data.tar.gz: a46d04a04fe0f1ae8c2e2d65517914019729dcde9d18b34b994504999dd28139a2a76c140d1fe0085a4f56e30c03e6b21724ffc774faf48821e6ef5866f9ab71
+  metadata.gz: db6b224929133960d7adebe1a6069773f97bb170a0a7a620d9320a04d74e4736be1dfe4c53f56ffb67e94d343e1c839aad043ba9acc790a3c14915826259f893
+  data.tar.gz: 95ee60dfb7b653b4110d8c8652e84c8eb4bce57b2cb4a7432901fe40308dc6d12e61561532ae1c52eb7eb5e24adc39ea94604cf6701bd1e1742c4c99e180b7f3

data/lib/taf/test_steps/handlers/base.rb

@@ -25,28 +25,25 @@ module Taf
             Taf::Browser.b.text_field(id: user_elm).wait_until(&:exists?)
                         .set user
             Taf::Browser.b.text_field(id: pass_elm).set pass
-            button = 'Sign in' || 'Log in'
-            Taf::Browser.b.button(value: button).wait_until(&:exists?).click
+            Taf::Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
             sleep 1
           else
             Taf::MyLog.log.warn("User: #{user} has failed to log in.")
           end
         end
 
-        def login_check(b_title_sucess, user)
-          if Taf::Browser.b.title.eql?(b_title_sucess)
-            Taf::MyLog.log.info("User: #{user} has logged in successful.")
+        def url_check(url)
+          if Taf::Browser.b.url == url
+            Taf::MyLog.log.info("URL: #{url} is correct.")
             true
           else
-            Taf::MyLog.log.warn("User: #{user} has failed to log in.")
+            Taf::MyLog.log.warn("URL: #{url} is incorrect.")
             false
           end
         end
 
-        def mem_word_check(user, b_title_sucess)
-          if Taf::Browser.b.title.eql?('Memorable word Portal')
-            portal_mem_word(user, b_title_sucess)
-          elsif Taf::Browser.b.title.eql?(b_title_sucess)
+        def login_check(b_title_success, user)
+          if Taf::Browser.b.title.eql?(b_title_success)
             Taf::MyLog.log.info("User: #{user} has logged in successful.")
             true
           else
@@ -55,7 +52,7 @@ module Taf
           end
         end
 
-        def portal_mem_word(user, b_title_sucess)
+        def portal_mem_word(user, b_title_success)
           password = ENV['PORTAL_MEM']
           nums = (1..256).to_a
           found_mem_nums = nums.each_with_object([]) do |num_val, mem_word|
@@ -74,7 +71,7 @@ module Taf
           end
 
           Taf::Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
-          if Taf::Browser.b.title.eql?(b_title_sucess)
+          if Taf::Browser.b.title.eql?(b_title_success)
             Taf::MyLog.log.info("User: #{user} has logged in successful.")
             return true
           else

data/lib/taf/test_steps/handlers/base/click_button.rb

@@ -7,25 +7,21 @@ module Taf
       class ClickButton < Base
         register :click_button
 
-        def check
-          @elms = %i[button span a div link image h1 h2 h3 h4]
-
-          found_button = @elms.map do |elm|
-            Taf::Browser.b.send(elm, "#{@locate}": @value).exists?
-          end.compact
+        def perform
+          # Optimisation: if we can immediately find the target in the DOM
+          # under a specific tag we should use it.
+          @tag = %i[button span a div link image h1 h2 h3 h4].find do |e|
+            Taf::Browser.b.send(e, "#{@locate}": @value).exists?
+          end
 
-          raise 'Multiple matches' if found_button.select { |i| i }.empty?
+          # Otherwise, fallback to locating across the entire DOM.
+          # This can be necessary for when content rendering is deferred
+          # (e.g., a loader in a SPA) or if the user wants to use CSS or XPath.
+          @tag ||= :element
 
-          index = found_button.index(true)
-          return unless index
+          Taf::Browser.b.send(@tag, "#{@locate}": @value).wait_until(&:exists?)
+                      .click
 
-          index
-        end
-
-        def perform
-          index = check
-          Taf::Browser.b.send(@elms[index], "#{@locate}": @value)
-                      .wait_until(&:exists?).click
           Taf::MyLog.log.info("Button: #{@value} has been selected")
           true
         rescue StandardError

data/lib/taf/test_steps/handlers/base/login.rb

@@ -16,9 +16,7 @@ module Taf
 
         def login_user(user)
           case @value.downcase
-          when 'admin_portal_login' then admin_portal_login(user)
           when 'portal_login' then portal_login(user)
-          when 'sint_login' then sint_login(user)
           when 'sso_login' then sso_login(user)
           else
             Taf::MyLog.log.error "unable to find login: #{@value}"
@@ -28,56 +26,53 @@ module Taf
 
         private
 
-        def admin_portal_login(user)
-          url = ENV['ADMINL_URL']
-          pass = ENV['ADMIN_USER_PASS']
-          b_title = 'Log in Portal Admin'
-          b_title_sucess = 'Home Admin Portal'
-          user_elm = 'admin_username'
-          pass_elm = 'admin_password'
-
-          Taf::Browser.b.goto(url)
-          login_process(b_title, user_elm, pass_elm, user, pass)
-          login_check(b_title_sucess, user)
-        end
-
         def portal_login(user)
           url = ENV['PORTAL_URL']
           pass = ENV['PORTAL_USER_PASS']
-          b_title = 'Log in Portal'
-          b_title_sucess = 'Home Portal'
+          b_title = 'Log in'
+          b_title_success = 'Home'
+          memorable_word_title = 'Memorable word'
           user_elm = 'user_email'
           pass_elm = 'user_password'
+          max_retry = 2
 
-          Taf::Browser.b.goto(url)
-          login_process(b_title, user_elm, pass_elm, user, pass)
-          mem_word_check(user, b_title_sucess)
+          max_retry.times do
+            Taf::Browser.b.goto(url)
+            url_check(url)
+            login_process(b_title, user_elm, pass_elm, user, pass)
+
+            begin
+              Taf::Browser.b.wait_until(timeout: 30) do |b|
+                b.title == b_title_success || b.title == memorable_word_title
+              end
+            rescue Watir::Wait::TimeoutError
+              Taf::MyLog.log.warn('Retrying login process...')
+              next
+            end
+
+            success = true
+
+            if Taf::Browser.b.title.eql?(memorable_word_title)
+              success = portal_mem_word(user, b_title_success)
+            end
+
+            return success
+          end
+
+          false
         end
 
         def sso_login(user)
           pass = ENV['SSO_USER_PASS']
-          # b_title = 'Log in to rh-sso'
-          # b_title_sucess = 'RHS-SSO Admin Console'
           b_title = ''
-          b_title_sucess = ''
+          b_title_success = ''
           user_elm = 'username'
           pass_elm = 'password'
 
-          login_process(b_title, user_elm, pass_elm, user, pass)
-          login_check(b_title_sucess, user)
-        end
-
-        def sint_login(user)
-          url = ENV['SINT_URL']
-          pass = ENV['SINT_USER_PASS']
-          b_title = 'SINT'
-          b_title_sucess = 'SINT'
-          user_elm = 'user_username'
-          pass_elm = 'user_password'
-
           Taf::Browser.b.goto(url)
+          url_check(url)
           login_process(b_title, user_elm, pass_elm, user, pass)
-          login_check(b_title_sucess, user)
+          login_check(b_title_success, user)
         end
       end
     end

data/lib/taf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Taf
-  VERSION = '0.4.8'
+  VERSION = '0.5.0'
 end

metadata

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