taf 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2367c31920261be5fd4ab3b50e3266c972f6f4eeb6f22a99e704a64904639ae3
-  data.tar.gz: dccbc5fc244b455a3d2173dbde7c2814571d090d7fc8447fa34759bb1f2c80f8
+  metadata.gz: 0501ee31ac5742b113c9e33b359bc324dae96b87e7a2caf82495113d6e6a3222
+  data.tar.gz: f9021907fd6dec231fe807e0afd32e2879ce44a9789f0bfd89ab62febb326e05
 SHA512:
-  metadata.gz: f0d440c2349b3543910236233e321a651677fcce1e96dfb300e86ae6f6cadd81865aedd0aa705ab0e3e0b4b046b74703f9cab91e4611bb3fa24bc17421f3c238
-  data.tar.gz: d90267152e10e951260c2181b30b38209ab22bfdada3b4afe63d52b26207f8fabe08e5347a88cd179ce2f7f6d0f24a4dacba36444570da3f240ced03ae3d4541
+  metadata.gz: 527cb4c93cce55d055bf5bb3d28026db1d5733ad8ba11c9bd91e2b091e1cedc3851169f889a2a6f4dc8ea6f932bbeb7f9fd23eb87e1f819c296ce76b106d8596
+  data.tar.gz: 16061dd456c4449a343261651e50b1c9de3509ef982acb965f9778a4f5f3d3bcd4a9abd9f1abeb757bcbdfb5921da21c92418939a898c60632a6ce1125c20d47

data/lib/taf.rb

@@ -8,18 +8,18 @@ module Taf
   class BrowserFailedOpen < TafError; end
   class LoginTypeFailed < TafError; end
 
-  require 'selenium-webdriver'
-  require 'watir'
-  require 'rubygems'
+  require 'colored'
   require 'fileutils'
+  require 'faraday'
+  require 'json'
   require 'logger'
-  require 'net/ping'
-  require 'time_difference'
-  require 'colored'
+  require 'open3'
   require 'optparse'
-  require 'fileutils'
+  require 'rubygems'
   require 'securerandom'
-  require 'json'
+  require 'selenium-webdriver'
+  require 'time_difference'
+  require 'watir'
 
   require 'taf/browser'
   require 'taf/cmd_line'

data/lib/taf/browser.rb

@@ -9,14 +9,20 @@
 module Taf
   # browser_setup.rb - a browser functions
   module Browser
+    # Suppoerted Browser names
+    @chrome_name = 'chrome'
+    @chrome_headless_name = 'chrome-headless'
+    @firefox_name = 'firefox'
+    @firefox_headless_name = 'firefox-headless'
+
     # open_browser function
     def self.open_browser
       browser = Taf::CMDLine.browser_type.downcase
       case browser
-      when 'chrome' then chrome
-      when 'chrome-headless' then chrome_headless
-      when 'firefox' then firefox
-      when 'firefox-headless' then firefox_headless
+      when @chrome_name then chrome
+      when @chrome_headless_name then chrome_headless
+      when @firefox_name then firefox
+      when @firefox_headless_name then firefox_headless
       else
         raise Taf::BrowserFailedOpen,
               "unable to open selected browser: #{browser}"
@@ -77,27 +83,27 @@ module Taf
     def self.browser_version
       browser_name = Taf::CMDLine.browser_type.downcase
       case browser_name
-      when 'chrome', 'chrome-headless'
+      when @chrome_name, @chrome_headless_name
         @browser.driver.capabilities[:version]
-      when 'firefox', 'firefox-headless'
+      when @firefox_name, @firefox_headless_name
         @browser.execute_script('return navigator.userAgent;').split('/')[-1]
+      else
+        'No Browser version'
       end
-    rescue StandardError
-      'No Browser version'
     end
 
     # Check platform
     def self.browser_platform
       browser_name = Taf::CMDLine.browser_type.downcase
       case browser_name
-      when 'chrome', 'chrome-headless'
+      when @chrome_name, @chrome_headless_name
         @browser.execute_script('return navigator.userAgent;')
                 .split(';')[1].split(')')[0]
-      when 'firefox', 'firefox-headless'
+      when @firefox_name, @firefox_headless_name
         @browser.execute_script('return navigator.userAgent;').split(';')[1]
+      else
+        'No Platform found'
       end
-    rescue StandardError
-      'No Platform found'
     end
   end
 end

data/lib/taf/cmd_line.rb

@@ -22,7 +22,7 @@ module Taf
 
     def self.browser(browser)
       @browser_type = browser
-      unless ['chrome', 'chrome-headless', 'firefox', 'firefox-headless']
+      unless %w[chrome chrome-headless firefox firefox-headless]
              .include?(@browser_type)
         Taf::MyLog.log.warn 'A valid Browser has not been supplied as a' \
                   ' command-line parameter as expected'

data/lib/taf/test_engine.rb

@@ -9,6 +9,34 @@
 module Taf
   # test_engine.rb - controls the iteration through the test suite and specs
   module TestEngine
+    def self.get_test_data(test_file_name)
+      # read in the test data
+      tests = Taf::Parser.read_test_data(test_file_name)
+      tests
+    # if unable to read the test data, show the error and move onto the
+    # next file (if there is one)
+    rescue StandardError => e
+      Taf::MyLog.log.warn 'Terminating the current test spec: ' \
+                   "#{test_file_name} #{e}"
+      Taf::MyLog.log.info
+      '...continuing with the next test file (if there is one)'
+    end
+
+    def self.get_step_data(test_file_name, tests, metrics)
+      tests['steps'].each_with_index do |test_step, test_step_idx|
+        test_step_idx += 1
+
+        parsed_steps = Taf::Parser.parse_test_step_data(test_step)
+
+        # process the test step data
+        Taf::TestSteps.process_test_steps(test_file_name, test_step_idx,
+                                          parsed_steps, metrics)
+      end
+    rescue Taf::TafError => e
+      warn e
+      Taf::MyLog.log.warn e
+    end
+
     # process the test files to execute the tests
     def self.process_testfiles
       total_passes = 0
@@ -20,37 +48,13 @@ module Taf
         metrics = Struct.new(:stepPasses, :stepFailures, :stepSkipped)
                         .new(0, 0, 0)
 
-        begin
-          # read in the test data
-          tests = Taf::Parser.read_test_data(test_file_name)
-          # if unable to read the test data, show the error and move onto the
-          # next file (if there is one)
-        rescue StandardError => e
-          Taf::MyLog.log.warn 'Terminating the current test spec: ' \
-                       "#{test_file_name} #{e}"
-          Taf::MyLog.log.info
-          '...continuing with the next test file (if there is one)'
-        end
+        tests = get_test_data(test_file_name)
 
         # create project folders - these only need creating once per test suite
         Taf::CreateDirectories.construct_projectdirs
 
         Taf::Browser.open_browser
-
-        begin
-          tests['steps'].each_with_index do |test_step, test_step_idx|
-            test_step_idx += 1
-
-            parsed_steps = Taf::Parser.parse_test_step_data(test_step)
-
-            # process the test step data
-            Taf::TestSteps.process_test_steps(test_file_name, test_step_idx,
-                                              parsed_steps, metrics)
-          end
-        rescue Taf::TafError => e
-          warn e
-          Taf::MyLog.log.warn e
-        end
+        get_step_data(test_file_name, tests, metrics)
 
         # output the test results summary to console
         Taf::ReportSummary.test_step_summary(test_file_name, test_file_idx,

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

@@ -9,8 +9,10 @@ module Taf
         def initialize(step_attributes)
           @value =  step_attributes[:testvalue]
           @value2 = step_attributes[:testvalue2]
+          @value3 = step_attributes[:testvalue3]
           @locate = step_attributes[:locate]
           @locate2 = step_attributes[:locate2]
+          @locate3 = step_attributes[:locate3]
         end
 
         def self.register(name)
@@ -45,7 +47,7 @@ module Taf
         end
 
         def mem_word_check(user, b_title_sucess)
-          if Taf::Browser.b.title.eql?('Memorable word')
+          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)
             Taf::MyLog.log.info("User: #{user} has logged in successful.")

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

@@ -27,12 +27,18 @@ module Taf
           ele = Taf::Browser.b.send(@elms[index], "#{@locate}": @value)
 
           ele.wait_until(&:exists?)
-          (ele.value == @value2)
-          Taf::MyLog.log.info("Textbox: #{@value} has correct value: #{value2}")
-          true
-        rescue StandardError
-          Taf::MyLog.log.warn("Textbox: #{@value} does not exist")
-          false
+
+          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

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Taf
+  module TestSteps
+    module Handlers
+      # Generate an RSA token for use with 2FA login.
+      class GenerateToken < Base
+        register :generate_token
+
+        def perform
+          raise 'TOKEN_SEED env var not set' unless ENV['TOKEN_SEED']
+
+          # Generate token using the seed from the environment.
+          _, stdout, stderr, wait_thr = Open3.popen3(
+            'stoken', '--file', ENV['TOKEN_SEED']
+          )
+
+          raise stderr.gets unless wait_thr.value.success?
+
+          Taf::Browser.b.send(:text_field, "#{@locate}": @value)
+                      .wait_until(&:exists?).send_keys stdout.gets
+
+          stdout.close
+          stderr.close
+
+          true
+        rescue StandardError => e
+          Taf::MyLog.log.warn("Error generating token: #{e}")
+
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -12,27 +12,40 @@ module Taf
           user = ENV[user.to_s] if ENV[user.to_s]
 
           login_user(user)
-        rescue StandardError
-          Taf::MyLog.log.error "unable to find login: #{@value}"
-          raise Taf::LoginTypeFailed
         end
 
         def login_user(user)
           case @value.downcase
-          when 'portal_login'
-            portal_login(user)
-          when 'sso_login'
-            sso_login(user)
+          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}"
+            raise Taf::LoginTypeFailed
           end
         end
 
         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'
-          b_title_sucess = 'Home'
+          b_title = 'Log in Portal'
+          b_title_sucess = 'Home Portal'
           user_elm = 'user_email'
           pass_elm = 'user_password'
 
@@ -53,6 +66,19 @@ module Taf
           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)
+          login_process(b_title, user_elm, pass_elm, user, pass)
+          login_check(b_title_sucess, user)
+        end
       end
     end
   end

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

@@ -7,19 +7,21 @@ module Taf
       class PingTest < Base
         register :ping_test
 
-        # TODO: retry every 'x' until timeout reached.
         def perform
-          check = Net::Ping::HTTP.new(@value)
-
-          check.ping?
-          sleep 5
-          if check.ping?
-            Taf::MyLog.log.info("pinged: #{@value}")
-            return true
+          tries ||= 20
+          Faraday.get(@value)
+        rescue Faraday::Error
+          if (tries -= 1).positive?
+            sleep 1
+            puts "Failed to ping: #{@value} - Retries left: #{tries}"
+            retry
           else
             Taf::MyLog.log.warn("Failed to ping: #{@value}")
-            return false
+            false
           end
+        else
+          Taf::MyLog.log.info("Pinged successfully: #{@value}")
+          true
         end
       end
     end

data/lib/taf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.02'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.02'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: net-ping
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubygems-update
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +202,7 @@ files:
 - lib/taf/test_steps/handlers/base/check_url.rb
 - lib/taf/test_steps/handlers/base/click_button.rb
 - lib/taf/test_steps/handlers/base/execute_system_command.rb
+- lib/taf/test_steps/handlers/base/generate_token.rb
 - lib/taf/test_steps/handlers/base/handle_browser_window.rb
 - lib/taf/test_steps/handlers/base/ipause.rb
 - lib/taf/test_steps/handlers/base/list_all_dropdowns_values.rb