taf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ff58b175551a2af8c4be802f8f78e01938507f4b2dd05e651a0428a846d006
-  data.tar.gz: 92d745cf353c25157b3cc667a961b3cb98bfdbb851944d68bf79be032aa13281
+  metadata.gz: f83e07b3044b079bd0aac90bf52228be938e046613728c0594ef8b079b63c662
+  data.tar.gz: c2aa622d24653df88fcf322d301598cdbd84a5c2a7fcbef5c7d08bccee8ef916
 SHA512:
-  metadata.gz: 9c27fad29983e3c9fbdaa059b572b843e557b4d744f5d0fbb5c7b129a507bcdba7c7c2c6d3e3d12317eb0b6789a0a92ba093a11a859d9299815bbee385079a6f
-  data.tar.gz: cb893b463b1c38e20b4d18d08261345f8f774a67a946f707e66917f17642e8bc1340d4cbe4aa939e05fc5f56409b427dd31a98f26de02d73b64fefab10ff37dd
+  metadata.gz: 8e8d911dbffacecb97274bd18fcbbf92eeb9290661293f428bc38bb5aacfb264e3fffb26869e578fdfaf3f825ccf954c0adf52d6a63920d405958e157e5ce8c3
+  data.tar.gz: dcd34611500f0451735321a0c27d4fcec4c259f255e228920c600ffc5f54af236d21f0392007d8237175cdf12942f06e4d3b3e0aa0a20a09e12550b939ef00bb

data/lib/parser/json_parser.rb

@@ -23,7 +23,6 @@ module JsonParser
   # parseTestStepData
   def self.parse_test_step_data(parse_json)
     parsed_step = {
-      testStep: parse_json['currentStep'],
       testdesc: parse_json['description'],
       testFunction: parse_json['function'].downcase,
       testvalue: parse_json['value0'],

data/lib/report/junit_report.rb

@@ -43,12 +43,12 @@ module JunitReport
         @test_step_report_summary2.each do |test_step_report_summary2|
           testsuites.testsuite(test_step_report_summary2) do |testsuite|
             $testStep_xml[test_step_report_summary2['name']]
-              .each do |test_step_index, test_step_xml|
+              .each do |test_step_idx, test_step_xml|
               testsuite.testcase(test_step_xml) do |testcase|
                 failure = $failtestStep_xml
-                  &.[](test_step_report_summary2['name'])&.[](test_step_index)
+                  &.[](test_step_report_summary2['name'])&.[](test_step_idx)
                 skipped = $skiptestStep_xml
-                  &.[](test_step_report_summary2['name'])&.[](test_step_index)
+                  &.[](test_step_report_summary2['name'])&.[](test_step_idx)
                 testcase.failure(failure) if failure
                 testcase.skipped(skipped) if skipped
               end

data/lib/report/report.rb

@@ -16,14 +16,14 @@ module Report
   end
 
   # print the test Step info to the test results file
-  def self.print_test_step_header(test_file_name, test_step_index, step_attributes)
+  def self.print_test_step_header(test_file_name, test_step_idx, test_desc)
     @test_start_time = current_time
-    MyLog.log.info "Test step: #{step_attributes[:testStep]} : #{step_attributes[:testdesc]}"
+    MyLog.log.info "Test step: #{test_step_idx} : #{test_desc}"
 
     step = {
-      'id' => step_attributes[:testStep],
-      'classname' => 'SuiteID: ' + $testId.to_s + ' Test Step: ' + step_attributes[:testStep].to_s + ' ' + step_attributes[:testdesc].to_s,
-      'name' => step_attributes[:testdesc],
+      'id' => test_step_idx,
+      'classname' => "SuiteID: #{$testId} Test Step: #{test_step_idx} #{test_desc}",
+      'name' => test_desc,
       'file' => test_file_name
     }
     # output to console to show test step
@@ -33,23 +33,23 @@ module Report
 
     $testStep_xml ||= {}
     $testStep_xml[test_file_name] ||= {}
-    $testStep_xml[test_file_name][test_step_index] = step
+    $testStep_xml[test_file_name][test_step_idx] = step
   end
 
   # print the Pass / Fail status of a test to the test results file
-  def self.test_pass_fail(pass_fail, test_file_name, test_step_index, step_attributes)
+  def self.test_pass_fail(pass_fail, test_file_name, test_step_idx)
     if pass_fail == true
       $previousTestFail = $currentTestFail
       $currentTestFail = false
       $testStepPasses += 1
-      MyLog.log.info "Test #{step_attributes[:testStep]} has Passed ".green
+      MyLog.log.info "Test #{test_step_idx} has Passed ".green
     elsif pass_fail == false
       $previousTestFail = $currentTestFail
       $currentTestFail = true
       $testStepFailures += 1
-      MyLog.log.info "Test #{step_attributes[:testStep]} has FAILED ".red
+      MyLog.log.info "Test #{test_step_idx} has FAILED ".red
       failstep = {
-        'message' => 'SuiteID: ' + $testId.to_s + ' Test Step: ' + step_attributes[:testStep].to_s + ' Test has FAILED - Check logs',
+        'message' => "SuiteID: #{$testId} Test Step: #{test_step_idx} Test has FAILED - Check logs",
         'type' => 'FAILURE',
         'file' => test_file_name
       }
@@ -60,13 +60,13 @@ module Report
 
       $failtestStep_xml ||= {}
       $failtestStep_xml[test_file_name] ||= []
-      $failtestStep_xml[test_file_name][test_step_index] = failstep
+      $failtestStep_xml[test_file_name][test_step_idx] = failstep
     else
       $currentTestFail = false
       $testStepNotrun += 1
-      MyLog.log.info "Test #{step_attributes[:testStep]} no checks performed ".blue
+      MyLog.log.info "Test #{test_step_idx} no checks performed ".blue
       skipstep = {
-        'message' => 'SuiteID: ' + $testId.to_s + ' Test Step: ' + step_attributes[:testStep].to_s + ' No checks performed - Check logs',
+        'message' => "SuiteID: #{$testId} Test Step: #{test_step_idx} No checks performed - Check logs",
         'type' => 'SKIPPED',
         'file' => test_file_name
       }
@@ -77,7 +77,7 @@ module Report
 
       $skiptestStep_xml ||= {}
       $skiptestStep_xml[test_file_name] ||= []
-      $skiptestStep_xml[test_file_name][test_step_index] = skipstep
+      $skiptestStep_xml[test_file_name][test_step_idx] = skipstep
     end
     test_end_time = current_time
 
@@ -90,8 +90,7 @@ module Report
   # check if the test failure threshold has been reached for total failures
   # or consecutive failures.
   # If a certain number of consecutive tests fail then throw an exception
-  def self.check_failure_threshold(test_file_name, _test_step_index,
-                                   _step_attributes)
+  def self.check_failure_threshold(test_file_name)
     consecutive_fail_threshold = 5
     if $previousTestFail && $currentTestFail
       @consecutive_test_fail += 1

data/lib/utils/screenshot.rb

@@ -10,18 +10,18 @@ module Screenshot
 
   # create screenshot filename and save the screenshot if the test has failed or
   # if explictly required
-  def self.save_screenshot(screen_shot, parsed_steps)
+  def self.save_screenshot(screen_shot, test_step_idx)
     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"\
+                        "_Test_step-#{test_step_idx}_Failed"\
                         "_#{time}.png"
                      else
                        "#{sc_dir}/Test_ID-#{$testId.delete(' ')}"\
-                        "_Test_step-#{parsed_steps[:testStep]}_#{time}.png"
+                        "_Test_step-#{test_step_idx}_#{time}.png"
                      end
 
       # Screenshot capture for websites

data/lib/utils/test_engine.rb

@@ -37,14 +37,17 @@ module TestEngine
       $test_case_end_time = Report.current_time
 
       begin
-        tests['steps'].each do |test_step|
+        tests['steps'].each_with_index do |test_step, test_step_idx|
+          test_step_idx += 1
+
           parsed_steps = Parser.parse_test_step_data(test_step)
+
           # process the test step data
-          TestSteps.process_test_steps(test_file_name, parsed_steps[:testStep],
+          TestSteps.process_test_steps(test_file_name, test_step_idx,
                                        parsed_steps)
           # see if screenshot required
           Screenshot.save_screenshot(parsed_steps[:screenShotData],
-                                     parsed_steps)
+                                     test_step_idx)
         end
       rescue TafError => e
         warn e

data/lib/utils/test_steps.rb

@@ -16,20 +16,18 @@ module TestSteps
 
   # process the test step data by matching the test step functions and
   # processing the associated data accordingly
-  def self.process_test_steps(test_file_name, test_step_index, step_attributes)
+  def self.process_test_steps(test_file_name, test_step_idx, 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_idx,
+                                  step_attributes[:testdesc])
     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.check_failure_threshold(test_file_name, test_step_index,
-                                     step_attributes)
+      Report.test_pass_fail(func, test_file_name, test_step_idx)
+      Report.check_failure_threshold(test_file_name)
       return true
     else
       MyLog.log.warn "\nUnable to match function: #{step_function}"

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andy Perrett