taf 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2367c31920261be5fd4ab3b50e3266c972f6f4eeb6f22a99e704a64904639ae3
-  data.tar.gz: dccbc5fc244b455a3d2173dbde7c2814571d090d7fc8447fa34759bb1f2c80f8
+  metadata.gz: 4c2a7cbae2cd4f9ec43c57b441f2182a8477cb2ce763964800aa9b3b0500f1ff
+  data.tar.gz: 9f7343f0a1edc9ff6df54ec04645e48e2fcdc18667a38458c2d9490a53b19f65
 SHA512:
-  metadata.gz: f0d440c2349b3543910236233e321a651677fcce1e96dfb300e86ae6f6cadd81865aedd0aa705ab0e3e0b4b046b74703f9cab91e4611bb3fa24bc17421f3c238
-  data.tar.gz: d90267152e10e951260c2181b30b38209ab22bfdada3b4afe63d52b26207f8fabe08e5347a88cd179ce2f7f6d0f24a4dacba36444570da3f240ced03ae3d4541
+  metadata.gz: b5b3dbe44aebbf959b489b05e82e73599c887863b544927b6a18aa2f8d642bd23de47080f5b11a583cb7083ee695b08bba8926cc753b9309d6851510d3e479c0
+  data.tar.gz: f7b6711f47c6f3094c5ae7307f759667e49011cc68ff1184c4af263f4cfc0a9b56e8e2f3552fa6655de0e8b8d80d1fd48d688dc0b5c1550eb9853646d1aba6f0

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/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/login.rb

@@ -19,10 +19,10 @@ module Taf
 
         def login_user(user)
           case @value.downcase
-          when 'portal_login'
-            portal_login(user)
-          when 'sso_login'
-            sso_login(user)
+          when 'portal_login' then portal_login(user)
+          when 'sso_login' then sso_login(user)
+          else
+            Taf::MyLog.log.error 'Not a valid Login'
           end
         end
 
@@ -50,6 +50,7 @@ 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_sucess, user)
         end

data/lib/taf/version.rb

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

metadata

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