taf 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8547dfd48a03b189469331103f5fe10b053b8761c1b25bdce6e069b9808c264c
-  data.tar.gz: 35b82be0e8d1f7ee7d7146a16aaecc5cb09914519ac31a4c36d4dad5cd473bf5
+  metadata.gz: 94881157aa5b02823bfc4f494545d70074193616c9b00144545abdc0a85245d6
+  data.tar.gz: bba87713f355f46b5306ec041b61fcfc6db8b46a93881a3286631d606c83fe41
 SHA512:
-  metadata.gz: 98dd2ffb3dbf3be2fc7beb897a9453ff2f6ad48645da9cb663538ac92f909a5e615452f6766be6c9f70541b08a67666de5a829b909600982019aa8a2db4fc533
-  data.tar.gz: 1d934465ba76c51574fcbda69d930a9809e9c46fbca9ded3b858e6819d42eaadc00d2d264f1d10b0f7f9c091333d417d8bf2e9aaf68e7f70152aa003955f5786
+  metadata.gz: b84b075a41ac5c29522adfdb9acaa743fbf51de798659547c5674c6fd4b8dfedbb16f1ebcf0f0f2a1644ee5c9a9aaa73862e2bf5517549777a4d87f6b7d06e71
+  data.tar.gz: 2d6d5d56f6e561e2b326a35c1c6a0d454939129ba3615e035cf52153c1a2663cd1d57e0fcea1cf5760eb16eddac85135f7926a7aac16ce31440f22539c1e27b5

data/lib/taf_config.rb

@@ -30,6 +30,7 @@ require_relative './utils/browser'
 require_relative './utils/create_directories'
 require_relative './utils/logger'
 require_relative './utils/test_engine'
+require_relative './utils/screenshot'
 require_relative './utils/exceptions'
 require_relative './report/junit_report'
 require_relative './report/report_summary'

data/lib/utils/browser.rb

@@ -110,33 +110,4 @@ module Browser
   rescue StandardError
     'No Browser version'
   end
-
-  # create screenshot filename and save the screenshot if the test has failed or
-  # if explictly required
-  def self.check_save_screenshot(screen_shot)
-    if $currentTestFail || screen_shot
-      time = Time.now.strftime('%H%M')
-      sc_dir = CreateDirectories.construct_testspecdirs
-
-      sc_file_name = if $currentTestFail
-                       "#{sc_dir}/Test_ID-#{$testId.delete(' ')}"\
-                        "_Test_step-#{$test_step}_Failed_#{time}.png"
-                     else
-                       "#{sc_dir}/Test_ID-#{$testId.delete(' ')}"\
-                        "_Test_step-#{$test_step}_#{time}.png"
-                     end
-
-      # Screenshot capture for websites
-      Browser.b.screenshot.save sc_file_name
-      MyLog.log.info("Screenshot saved to: #{sc_file_name} \n")
-    else
-      MyLog.log.debug "No screenshot requested \n"
-    end
-
-    # if any issues with saving the screenshot then log a warning
-  rescue StandardError => error
-    # construct the error message from custom text and the actual system
-    # error message (converted to a string).
-    MyLog.log.warn("Error saving the screenshot: #{sc_file_name}   #{error}")
-  end
 end

data/lib/utils/screenshot.rb

@@ -0,0 +1,40 @@
+# Created on 02 Aug 2018
+# @author: Andy Perrett
+#
+# Versions:
+# 1.0 - Baseline
+#
+# browser_setup.rb - a browser functions
+module Screenshot
+  require_relative '../taf_config.rb'
+
+  # create screenshot filename and save the screenshot if the test has failed or
+  # if explictly required
+  def self.save_screenshot(screen_shot, parsed_steps)
+    if $currentTestFail || screen_shot
+      time = Time.now.strftime('%H%M')
+      sc_dir = CreateDirectories.construct_testspecdirs
+
+      sc_file_name = if $currentTestFail
+                       "#{sc_dir}/Test_ID-#{$testId.delete(' ')}"\
+                        "_Test_step-#{parsed_steps[:testStep]}_Failed"\
+                        "_#{time}.png"
+                     else
+                       "#{sc_dir}/Test_ID-#{$testId.delete(' ')}"\
+                        "_Test_step-#{parsed_steps[:testStep]}_#{time}.png"
+                     end
+
+      # Screenshot capture for websites
+      Browser.b.screenshot.save sc_file_name
+      MyLog.log.info("Screenshot saved to: #{sc_file_name} \n")
+    else
+      MyLog.log.debug "No screenshot requested \n"
+    end
+
+    # if any issues with saving the screenshot then log a warning
+  rescue StandardError => error
+    # construct the error message from custom text and the actual system
+    # error message (converted to a string).
+    MyLog.log.warn("Error saving the screenshot: #{sc_file_name}   #{error}")
+  end
+end

data/lib/utils/test_engine.rb

@@ -40,9 +40,11 @@ module TestEngine
         tests['steps'].each do |test_step|
           parsed_steps = Parser.parse_test_step_data(test_step)
           # process the test step data
-          TestSteps.process_test_steps(test_file_name, parsed_steps[:testStep], parsed_steps)
+          TestSteps.process_test_steps(test_file_name, parsed_steps[:testStep],
+                                       parsed_steps)
           # see if screenshot required
-          Browser.check_save_screenshot(parsed_steps[:screenShotData])
+          Screenshot.save_screenshot(parsed_steps[:screenShotData],
+                                     parsed_steps)
         end
       rescue TafError => error
         warn error

data/lib/utils/test_steps.rb

@@ -18,14 +18,16 @@ module TestSteps
   # processing the associated data accordingly
   def self.process_test_steps(test_file_name, test_step_index, step_attributes)
     # print the test step information
-    Report.print_test_step_header(test_file_name, test_step_index, step_attributes)
+    Report.print_test_step_header(test_file_name, test_step_index,
+                                  step_attributes)
     runtest = step_attributes[:skipTestCase]
     step_function = step_attributes[:testFunction]
     handler = handlers[step_function.to_s]
 
     if handler.respond_to?(:perform)
       func = handler.perform(step_attributes) if runtest == false
-      Report.test_pass_fail(func, test_file_name, test_step_index, step_attributes)
+      Report.test_pass_fail(func, test_file_name, test_step_index,
+                            step_attributes)
       Report.check_failure_threshold(test_file_name, test_step_index)
       return true
     else

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,6 +209,7 @@ files:
 - lib/utils/create_directories.rb
 - lib/utils/exceptions.rb
 - lib/utils/logger.rb
+- lib/utils/screenshot.rb
 - lib/utils/test_engine.rb
 - lib/utils/test_steps.rb
 - lib/version.rb