taf 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c202a157c5f26907dacb3a08df58921f03cea0a5eb9bcc75523cdd7b44c148
-  data.tar.gz: 22aefc58b15a5b6ea4c0396c82528ff335d9cd1ca05e7dfae6978c44b7d902a2
+  metadata.gz: 3b23df94f306d0f67dc7c0c5baf2c707aabcde4a286b8dd811b33f123dfb329b
+  data.tar.gz: 433d583f64e1bf46b77f4e2954e78e11d13584e162d60ad539e12b9c79b57338
 SHA512:
-  metadata.gz: db6b224929133960d7adebe1a6069773f97bb170a0a7a620d9320a04d74e4736be1dfe4c53f56ffb67e94d343e1c839aad043ba9acc790a3c14915826259f893
-  data.tar.gz: 95ee60dfb7b653b4110d8c8652e84c8eb4bce57b2cb4a7432901fe40308dc6d12e61561532ae1c52eb7eb5e24adc39ea94604cf6701bd1e1742c4c99e180b7f3
+  metadata.gz: dfe2d1437c34f7239047be0ba88435c72c6b62b8ac2c986d4943db8a1bdf994ff04b25ab88cce17e7667fed49b5f5b0c1318f55f49aaba6053d03778286db19b
+  data.tar.gz: c4bfaf18143ca30df636cff7787a4d74de344a2991cc805736ad67d617a13bacca7fce8716814d3c6a829641e398931675bacb01b9212b4c57105227a3f4f6fc

data/lib/taf.rb

@@ -19,7 +19,6 @@ module Taf
   require 'securerandom'
   require 'selenium-webdriver'
   require 'time_difference'
-  require 'watir'
 
   require 'taf/browser'
   require 'taf/cmd_line'
@@ -42,10 +41,7 @@ module Taf
 
   # Load all handlers.
   Dir[File.expand_path('taf/test_steps/handlers/base/*.rb', __dir__)]
-    .each do |f|
+    .sort.each do |f|
     require f
   end
-
-  # Watir config. set wait:
-  Watir.default_timeout = 60
 end

data/lib/taf/browser.rb

@@ -31,16 +31,17 @@ module Taf
     def self.chrome
       case @browser_name
       when @chrome_name
-        chrome_values = %w[
-          --acceptInsecureCerts-true --start-maximized --window-size=1920,1080
-        ]
+        options = Selenium::WebDriver::Chrome::Options.new
+        options.add_argument('--ignore-certificate-errors')
+        options.add_argument('--window-size=1920,1080')
       when @chrome_headless_name
-        chrome_values = %w[
-          --start-maximized --disable-gpu --headless --acceptInsecureCerts-true
-          --no-sandbox --window-size=1920,1080
-        ]
+        options = Selenium::WebDriver::Chrome::Options.new
+        options.add_argument('--headless')
+        options.add_argument('--ignore-certificate-errors')
+        options.add_argument('--window-size=1920,1080')
       end
-      @browser = Watir::Browser.new :chrome, switches: chrome_values
+      @browser = Selenium::WebDriver.for :chrome, options: options
+      @browser.manage.timeouts.implicit_wait = 120
     end
 
     # firefox browser details
@@ -49,14 +50,14 @@ module Taf
       caps['acceptInsecureCerts'] = true
       case @browser_name
       when @firefox_name
-        driver = Selenium::WebDriver.for(:firefox, desired_capabilities: caps)
+        @browser = Selenium::WebDriver.for(:firefox, desired_capabilities: caps)
       when @firefox_headless_name
         options = Selenium::WebDriver::Firefox::Options.new(args: ['-headless'])
-        driver = Selenium::WebDriver.for(:firefox, options: options,
-                                                   desired_capabilities: caps)
+        @browser = Selenium::WebDriver.for(:firefox, options: options,
+                                                     desired_capabilities: caps)
       end
-      @browser = Watir::Browser.new(driver)
-      @browser.driver.manage.window.maximize
+      @browser.manage.window.maximize
+      @browser.manage.timeouts.implicit_wait = 120
     end
 
     # define browser value
@@ -68,7 +69,7 @@ module Taf
     def self.browser_version
       case @browser_name
       when @chrome_name, @chrome_headless_name
-        @browser.driver.capabilities[:version]
+        @browser.capabilities[:version]
       when @firefox_name, @firefox_headless_name
         @browser.execute_script('return navigator.userAgent;').split('/')[-1]
       else
@@ -78,12 +79,13 @@ module Taf
 
     # Check platform
     def self.browser_platform
+      ptf = @browser.execute_script('return navigator.userAgent;').split(';')[1]
+
       case @browser_name
       when @chrome_name, @chrome_headless_name
-        @browser.execute_script('return navigator.userAgent;')
-                .split(';')[1].split(')')[0]
+        ptf.split(')')[0]
       when @firefox_name, @firefox_headless_name
-        @browser.execute_script('return navigator.userAgent;').split(';')[1]
+        ptf
       else
         'No Platform found'
       end

data/lib/taf/screenshot.rb

@@ -18,7 +18,7 @@ module Taf
                         "_Test_step-#{test_step_idx}_Failed_#{time}.png"
 
       # Screenshot capture for websites
-      Taf::Browser.b.screenshot.save sc_file_name
+      Taf::Browser.b.save_screenshot sc_file_name
       Taf::MyLog.log.info("Screenshot saved to: #{sc_file_name} \n")
       sc_file_name
     rescue StandardError => e

data/lib/taf/test_steps.rb

@@ -34,7 +34,7 @@ module Taf
           metrics
         )
         Taf::Report.check_failure_threshold(test_file_name)
-        return true
+        true
       else
         Taf::MyLog.log.warn "\nUnable to match function: #{step_function}"
         raise Taf::UnknownTestStep, "Unknown test step: #{step_function}"

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

@@ -21,11 +21,11 @@ module Taf
         end
 
         def login_process(b_title, user_elm, pass_elm, user, pass)
-          if Taf::Browser.b.title.eql?(b_title)
-            Taf::Browser.b.text_field(id: user_elm).wait_until(&:exists?)
-                        .set user
-            Taf::Browser.b.text_field(id: pass_elm).set pass
-            Taf::Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
+          if Taf::Browser.b.title.eql? b_title
+            Taf::Browser.b.find_element(id: user_elm).displayed?
+            Taf::Browser.b.find_element(id: user_elm).send_keys user
+            Taf::Browser.b.find_element(id: pass_elm).send_keys pass
+            Taf::Browser.b.find_element(name: 'commit').click
             sleep 1
           else
             Taf::MyLog.log.warn("User: #{user} has failed to log in.")
@@ -33,7 +33,7 @@ module Taf
         end
 
         def url_check(url)
-          if Taf::Browser.b.url == url
+          if Taf::Browser.b.current_url == url
             Taf::MyLog.log.info("URL: #{url} is correct.")
             true
           else
@@ -43,7 +43,7 @@ module Taf
         end
 
         def login_check(b_title_success, user)
-          if Taf::Browser.b.title.eql?(b_title_success)
+          if Taf::Browser.b.title.eql? b_title_success
             Taf::MyLog.log.info("User: #{user} has logged in successful.")
             true
           else
@@ -51,34 +51,6 @@ module Taf
             false
           end
         end
-
-        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|
-            elm_id = "user_memorable_parts_#{num_val}"
-            mem_word.push(num_val) if Taf::Browser.b.select(id: elm_id).exist?
-          end.compact
-
-          array_password = password.split('')
-          array_password.map!(&:upcase)
-
-          found_mem_nums.each do |mem_num|
-            char = array_password[(mem_num - 1)]
-            elm_id = "user_memorable_parts_#{mem_num}"
-            Taf::Browser.b.select_list(id: elm_id).option(value: char.to_s)
-                        .select
-          end
-
-          Taf::Browser.b.button(value: 'Sign in').wait_until(&:exists?).click
-          if Taf::Browser.b.title.eql?(b_title_success)
-            Taf::MyLog.log.info("User: #{user} has logged in successful.")
-            return true
-          else
-            Taf::MyLog.log.warn("User: #{user} has failed to log in.")
-            return false
-          end
-        end
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Taf
         register :browser_back
 
         def perform
-          Taf::Browser.b.back
+          Taf::Browser.b.navigate.back
           Taf::MyLog.log.info('Browser navigated back')
           true
         rescue StandardError

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

@@ -8,7 +8,7 @@ module Taf
         register :browser_forward
 
         def perform
-          Taf::Browser.b.forward
+          Taf::Browser.b.navigate.forward
           Taf::MyLog.log.info('Browser navigated forward')
           true
         rescue StandardError

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

@@ -8,7 +8,7 @@ module Taf
         register :browser_refresh
 
         def perform
-          Taf::Browser.b.refresh
+          Taf::Browser.b.navigate.refresh
           Taf::MyLog.log.info('The Browser has been refreshed')
           true
         rescue StandardError

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

@@ -8,8 +8,8 @@ module Taf
         register :capture_alert
 
         def perform
-          Taf::Browser.b.div(class: 'alert').exist?
-          alertmsg = Taf::Browser.b.div(class: 'alert').text
+          Taf::Browser.b.find_element(class: 'alert').displayed?
+          alertmsg = Taf::Browser.b.find_element(class: 'alert').text
           Taf::MyLog.log.info("Alert shown: #{alertmsg}")
           true
         rescue StandardError

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

@@ -8,7 +8,7 @@ module Taf
         register :check_browser_title
 
         def perform
-          Taf::Browser.b.wait_until { Taf::Browser.b.title.eql? @value }
+          Taf::Browser.b.title.eql? @value
           Taf::MyLog.log.info("Browser title: #{@value}")
           true
         rescue StandardError

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

@@ -12,11 +12,11 @@ module Taf
           if result == true
             Taf::MyLog.log.info \
               "Data has matched: #{@value} in LogFile: #{@value2}"
-            return true
+            true
           else
             Taf::MyLog.log.warn \
               "Problem finding: #{@value} in LogFile: #{@value2}"
-            return false
+            false
           end
         end
       end

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

@@ -8,9 +8,7 @@ module Taf
         register :check_screen_data
 
         def perform
-          Taf::Browser.b.wait_until do
-            Taf::Browser.b.element.text.include? @value
-          end
+          Taf::Browser.b.page_source.include? @value
           Taf::MyLog.log.info("Text found: #{@value}")
           true
         rescue StandardError

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

@@ -8,7 +8,7 @@ module Taf
         register :check_url
 
         def perform
-          if Taf::Browser.b.url == @value
+          if Taf::Browser.b.current_url == @value
             Taf::MyLog.log.info("URL: #{@value} is correct")
             true
           else

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

@@ -8,22 +8,18 @@ module Taf
         register :click_button
 
         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?
+          if @locate['text']
+            butt = Taf::Browser.b.find_element(xpath: "//*[text()='#{@value}']")
+            butt.displayed?
+            butt.click
+            Taf::MyLog.log.info("Button: #{@value} has been selected")
+            true
+          else
+            button = Taf::Browser.b.find_element("#{@locate}": @value)
+            button.displayed?
+            button.click
+            Taf::MyLog.log.info("Button: #{@value} has been selected")
           end
-
-          # 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
-
-          Taf::Browser.b.send(@tag, "#{@locate}": @value).wait_until(&:exists?)
-                      .click
-
-          Taf::MyLog.log.info("Button: #{@value} has been selected")
-          true
         rescue StandardError
           Taf::MyLog.log.warn("Button: #{@value} does not exist")
           false

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

@@ -11,10 +11,10 @@ module Taf
           b_result = system @value
           if b_result == true
             Taf::MyLog.log.info("Cmd has been executed sucessfully #{@value}")
-            return true
+            true
           else
             Taf::MyLog.log.warn("Theres a problem executing command #{@value}")
-            return false
+            false
           end
         end
       end

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

@@ -17,8 +17,8 @@ module Taf
 
           raise stderr.gets unless wait_thr.value.success?
 
-          Taf::Browser.b.send(:text_field, "#{@locate}": @value)
-                      .wait_until(&:exists?).send_keys stdout.gets
+          Taf::Browser.b.find_element("#{@locate}": @value)
+                      .send_keys stdout.gets
 
           stdout.close
           stderr.close

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

@@ -8,14 +8,16 @@ module Taf
         register :handle_browser_window
 
         def perform
-          Taf::Browser.b.window(title: @value.to_s).use
-          sleep 3
-          Taf::Browser.b.title.eql?(@value.to_s)
-          Taf::MyLog.log.info("Window title: #{@value} is correct")
-          true
-        rescue StandardError
-          Taf::MyLog.log.warn("Window not found: #{@value}")
-          false
+          Taf::Browser.b.window_handles.each do |handle|
+            Taf::Browser.b.switch_to.window handle
+            sleep 3
+            Taf::Browser.b.title.eql?(@value.to_s)
+            Taf::MyLog.log.info("Window title: #{@value} is correct")
+            true
+          rescue StandardError
+            Taf::MyLog.log.warn("Window not found: #{@value}")
+            false
+          end
         end
       end
     end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Taf
+  module TestSteps
+    module Handlers
+      # Handle leave iframe function.
+      class LeaveIframe < Base
+        register :leave_iframe
+
+        def perform
+          # Return to the top level
+          Taf::Browser.b.switch_to.default_content
+          Taf::MyLog.log.info('iframe switched to top level successfully')
+          true
+        rescue StandardError
+          Taf::MyLog.log.warn('iframe failed to switched to top level')
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,9 @@ 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}"
@@ -26,40 +28,32 @@ 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_success = 'Home Admin Portal'
+          user_elm = 'admin_username'
+          pass_elm = 'admin_password'
+
+          Taf::Browser.b.navigate.to(url)
+          url_check(url)
+          login_process(b_title, user_elm, pass_elm, user, pass)
+          login_check(b_title_success, user)
+        end
+
         def portal_login(user)
           url = ENV['PORTAL_URL']
           pass = ENV['PORTAL_USER_PASS']
-          b_title = 'Log in'
-          b_title_success = 'Home'
-          memorable_word_title = 'Memorable word'
+          b_title = 'Log in Portal'
+          b_title_success = 'Home Portal'
           user_elm = 'user_email'
           pass_elm = 'user_password'
-          max_retry = 2
 
-          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
+          Taf::Browser.b.navigate.to(url)
+          url_check(url)
+          login_process(b_title, user_elm, pass_elm, user, pass)
+          login_check(b_title_success, user)
         end
 
         def sso_login(user)
@@ -69,7 +63,19 @@ module Taf
           user_elm = 'username'
           pass_elm = 'password'
 
-          Taf::Browser.b.goto(url)
+          login_process(b_title, user_elm, pass_elm, user, pass)
+          login_check(b_title_success, user)
+        end
+
+        def sint_login(user)
+          url = ENV['SINT_URL']
+          pass = ENV['SINT_USER_PASS']
+          b_title = 'SINT'
+          b_title_success = 'SINT'
+          user_elm = 'user_username'
+          pass_elm = 'user_password'
+
+          Taf::Browser.b.navigate.to(url)
           url_check(url)
           login_process(b_title, user_elm, pass_elm, user, pass)
           login_check(b_title_success, user)

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

@@ -13,7 +13,7 @@ module Taf
                 else
                   @value
                 end
-          Taf::Browser.b.goto(url)
+          Taf::Browser.b.navigate.to(url)
           true
         end
       end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Taf
+  module TestSteps
+    module Handlers
+      # Radio or Checkbox Button function.
+      class RadioCheckboxButton < Base
+        register :radio_or_checkbox_button
+
+        def perform
+          Taf::Browser.b.find_element("#{@locate}": @value).click
+          Taf::Browser.b.find_element("#{@locate}": @value).selected?
+          Taf::MyLog.log.info("Check box / Radio: #{@value} has been selected")
+          true
+        rescue StandardError
+          Taf::MyLog.log.warn("Check box / Radio: #{@value} does not exist")
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,9 @@ module Taf
         register :select_dropdown
 
         def perform
-          ele = Taf::Browser.b.select_list("#{@locate}": @value)
-
-          ele.wait_until(&:exists?).select @value2.to_s
+          element = Taf::Browser.b.find_element("#{@locate}": @value)
+          select = Selenium::WebDriver::Support::Select.new(element)
+          select.select_by(:text, @value2)
           Taf::MyLog.log.info("Dropdown item: #{@value2} has been selected")
           true
         rescue StandardError

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

@@ -8,7 +8,7 @@ module Taf
         register :send_special_keys
 
         def perform
-          Taf::Browser.b.send_keys :"#{@value}"
+          Taf::Browser.b.action.send_keys(:"#{@value}").perform
           sleep 1
           Taf::MyLog.log.info("Browser Sent key: :#{@value} successfully")
           true

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Taf
+  module TestSteps
+    module Handlers
+      # Handle switch to iframe function.
+      class SwitchToIframe < Base
+        register :switch_to_iframe
+
+        def perform
+          Taf::Browser.b.switch_to.frame @value.to_s
+          Taf::MyLog.log.info("Switched to iframe: #{@value} successfully")
+          true
+        rescue StandardError
+          Taf::MyLog.log.warn("Failed to switch to iframe: #{@value}")
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Taf
+  module TestSteps
+    module Handlers
+      # Handle Browser Window function.
+      class SwitchToOriginalTabOrWindow < Base
+        register :switch_to_original_tab_or_window
+
+        def perform
+          Taf::Browser.b.switch_to.window original_window
+          sleep 2
+          Taf::Browser.b.title.eql?(@value.to_s)
+          Taf::MyLog.log.info("Original Window title: #{@value} is correct")
+          true
+        rescue StandardError
+          Taf::MyLog.log.warn("Original Window not found: #{@value}")
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -7,27 +7,11 @@ module Taf
       class WriteBoxdata < Base
         register :write_box_data
 
-        def check
-          @elms = %i[textarea text_field iframe]
-
-          found_box = @elms.map do |elm|
-            Taf::Browser.b.send(elm, "#{@locate}": @value).exists?
-          end.compact
-
-          raise 'Multiple matches' if found_box.select { |i| i }.empty?
-
-          index = found_box.index(true)
-          return unless index
-
-          index
-        end
-
         def perform
           txt = @value2
           txt = ENV[txt.to_s] if ENV[txt.to_s]
-          index = check
-          Taf::Browser.b.send(@elms[index], "#{@locate}": @value)
-                      .wait_until(&:exists?).send_keys txt
+          Taf::Browser.b.find_element("#{@locate}": @value).displayed?
+          Taf::Browser.b.find_element("#{@locate}": @value).send_keys txt
           Taf::MyLog.log.info("Textbox: #{@value} has correct value: #{txt}")
           true
         rescue StandardError

data/lib/taf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: watir
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.16'
 description: Test Automation Framework (TAF) to allow simple test web automation -
   external use
 email: 
@@ -194,8 +180,6 @@ files:
 - lib/taf/test_steps/handlers/base/browser_quit.rb
 - lib/taf/test_steps/handlers/base/browser_refresh.rb
 - lib/taf/test_steps/handlers/base/capture_alert.rb
-- lib/taf/test_steps/handlers/base/check_box.rb
-- lib/taf/test_steps/handlers/base/check_boxdata.rb
 - lib/taf/test_steps/handlers/base/check_browser_title.rb
 - lib/taf/test_steps/handlers/base/check_logs.rb
 - lib/taf/test_steps/handlers/base/check_screendata.rb
@@ -206,12 +190,14 @@ files:
 - lib/taf/test_steps/handlers/base/handle_browser_window.rb
 - lib/taf/test_steps/handlers/base/health_check.rb
 - lib/taf/test_steps/handlers/base/ipause.rb
-- lib/taf/test_steps/handlers/base/list_all_dropdowns_values.rb
+- lib/taf/test_steps/handlers/base/leave_iframe.rb
 - lib/taf/test_steps/handlers/base/login.rb
 - lib/taf/test_steps/handlers/base/open_url.rb
-- lib/taf/test_steps/handlers/base/radio_button.rb
+- lib/taf/test_steps/handlers/base/radio_or_checkbox_button.rb
 - lib/taf/test_steps/handlers/base/select_dropdown.rb
 - lib/taf/test_steps/handlers/base/send_special_keys.rb
+- lib/taf/test_steps/handlers/base/switch_to_iframe.rb
+- lib/taf/test_steps/handlers/base/switch_to_original_tab_or_window.rb
 - lib/taf/test_steps/handlers/base/write_box_data.rb
 - lib/taf/test_steps/skip_step.rb
 - lib/taf/test_steps/step.rb

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Taf
-  module TestSteps
-    module Handlers
-      # Check Box function.
-      class CheckBox < Base
-        register :check_box
-
-        def perform
-          Taf::Browser.b.checkbox("#{@locate}": @value).wait_until(&:exists?)
-                      .click
-          Taf::MyLog.log.info("Check box: #{@value} has been selected")
-          true
-        rescue StandardError
-          Taf::MyLog.log.warn("Check box: #{@value} does not exist")
-          false
-        end
-      end
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Taf
-  module TestSteps
-    module Handlers
-      # Check Box Data function.
-      class CheckBoxdata < Base
-        register :check_box_data
-
-        def check
-          @elms = %i[textarea text_field iframe]
-
-          found_box = @elms.map do |elm|
-            Taf::Browser.b.send(elm, "#{@locate}": @value).exists?
-          end.compact
-
-          raise 'Multiple matches' if found_box.select { |i| i }.empty?
-
-          index = found_box.index(true)
-          return unless index
-
-          index
-        end
-
-        def perform
-          index = check
-          ele = Taf::Browser.b.send(@elms[index], "#{@locate}": @value)
-
-          ele.wait_until(&:exists?)
-
-          if ele.value == @value2
-            Taf::MyLog.log.info(
-              "Textbox: #{@value} has correct value: #{@value2}"
-            )
-            true
-          else
-            Taf::MyLog.log.warn(
-              "Textbox: got #{ele.value}, expected #{@value2}"
-            )
-            false
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Taf
-  module TestSteps
-    module Handlers
-      # List all Dropdown Values function.
-      class ListAllDropdownValues < Base
-        register :list_all_dropdown_values
-
-        def perform
-          Taf::Browser.b.element("#{@locate}": @value).wait_until(&:exists?)
-          Taf::Browser.b.select_list("#{@locate}": @value).options.each do |i|
-            Taf::MyLog.log.info("List of dropdown for #{@value} are: #{i.text}")
-            return true
-          end
-        rescue StandardError
-          Taf::MyLog.log.warn("List dropdown: #{@value} does not exist")
-          false
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Taf
-  module TestSteps
-    module Handlers
-      # Radio Button function.
-      class RadioButton < Base
-        register :radio_button
-
-        def perform
-          Taf::Browser.b.radio("#{@locate}": @value).wait_until(&:exists?).set
-          Taf::MyLog.log.info("Radio button: #{@value} has been selected")
-          true
-        rescue StandardError
-          Taf::MyLog.log.warn("Radio button: #{@value} does not exist")
-          false
-        end
-      end
-    end
-  end
-end