taf 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 689534e9c30efe0f07355bb190dc79fc71adc06152a5fda8d79c601e9b1de97d
-  data.tar.gz: 59998580a22f1c1bda658b136aa77a25da75c9b53e5854c9b7b82f8d513c8191
+  metadata.gz: 436860d3248c2b1548a9409a70f6edafe44c1f3239c8ec03fb1991b69e6a45e5
+  data.tar.gz: 97ded2847979e394f7a01680d1274fea84d69aa65b4f46b4612c22c541cf96eb
 SHA512:
-  metadata.gz: b0c9a37bee50a842f2b125dcc1ad091219c8b13a87364d71b23e937851faaa88195e2667542c02fbcc87380663d9ecb5dec1c9724179243f025d90251be462d7
-  data.tar.gz: 06ac73be34a9561fe388747ae48f69649d6961393d34e817fd0f34db7356ebb97d4e6436b56d3e4d8c24dbe1930b68778124fe09f3b06897a8f09af3e06ef4db
+  metadata.gz: 9a814d67bcbc4f17493282b383b4874a2bd6b94e09db6e6478a897ee477f825a3baebdbb14e6ca6630044721a71bd3c105d0aaecd0aafb93538da4820332de04
+  data.tar.gz: '04829e2953ad7ab526f8603ecec94f6373244843f1b353848b9eba45e24d53e431113b7b9059705506097ca364a049c1379b4d7ee007f39285c18d69317586bc'

data/lib/main.rb

@@ -18,15 +18,13 @@ module Main
 
   # process the test files to execute the tests
   total_passes, total_failures, total_skipped = TestEngine.process_testfiles
-
+  total_metrics = [total_passes, total_failures, total_skipped]
   # get the overall test suite end time
   ts_end_time = Report.current_time
 
   # output the overall test summary
-  ReportSummary.overall_test_summary(ts_start_time, ts_end_time, total_passes,
-                                     total_failures, total_skipped)
-  JunitReport.test_summary_junit(ts_start_time, ts_end_time, total_passes,
-                                 total_failures, total_skipped)
+  ReportSummary.overall_test_summary(ts_start_time, ts_end_time, total_metrics)
+  JunitReport.test_summary_junit(ts_start_time, ts_end_time, total_metrics)
 
   # Exit status code.
   Process.exit(total_failures.zero? ? 0 : 1)

data/lib/report/junit_report.rb

@@ -29,17 +29,16 @@ module JunitReport
     }
   end
 
-  def self.test_summary_junit(ts_start_time, ts_end_time, total_passes,
-                              total_failures, total_skipped)
+  def self.test_summary_junit(ts_start_time, ts_end_time, total_metrics)
     # output to XML file format for Junit for CI.
     builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
       testsuite_attrs = {
         'classname' => CMDLine.tests_folder.to_s,
         'name' => CMDLine.tests_folder.to_s,
-        'tests' => total_passes.to_s,
-        'failures' => total_failures.to_s,
+        'tests' => total_metrics[0].to_s,
+        'failures' => total_metrics[1].to_s,
         'timestamp' => ts_start_time.to_s,
-        'skipped' => total_skipped.to_s,
+        'skipped' => total_metrics[2].to_s,
         'time' => TimeDifference.between(ts_end_time, ts_start_time)
                                 .in_seconds
       }
@@ -64,7 +63,9 @@ module JunitReport
 
     # the test suite summary is a XML report generated will be called
     # 'report_uuid.xml'
-    ts_xml_file = "#{$project_iddir}/report_#{SecureRandom.uuid}.xml"
+    project_id = JsonParser.project_id.delete(' ')
+    xml_dir = File.join('Results', project_id)
+    ts_xml_file = "#{xml_dir}/report_#{SecureRandom.uuid}.xml"
 
     ts_summary_file_xml = File.open(ts_xml_file, 'w')
     ts_summary_file_xml.write builder.to_xml

data/lib/report/report.rb

@@ -40,11 +40,11 @@ module Report
   # 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_idx, metrics)
     if pass_fail == true
-      $currentTestFail = false
+      @current_test_fail = false
       metrics.stepPasses += 1
       MyLog.log.info "Test #{test_step_idx} has Passed ".green
     elsif pass_fail == false
-      $currentTestFail = true
+      @current_test_fail = true
       metrics.stepFailures += 1
       MyLog.log.info "Test #{test_step_idx} has FAILED ".red
       sc_file_name = Screenshot.save_screenshot(test_step_idx)
@@ -64,7 +64,7 @@ module Report
       $failtestStep_xml[test_file_name] ||= []
       $failtestStep_xml[test_file_name][test_step_idx] = failstep
     else
-      $currentTestFail = false
+      @current_test_fail = false
       metrics.stepSkipped += 1
       MyLog.log.info "Test #{test_step_idx} no checks performed ".blue
       skipstep = {
@@ -96,7 +96,7 @@ module Report
   # If a certain number of consecutive tests fail then throw an exception
   def self.check_failure_threshold(test_file_name)
     consecutive_fail_threshold = 5
-    if $currentTestFail
+    if @current_test_fail
       @consecutive_test_fail += 1
     else
       @consecutive_test_fail = 0

data/lib/report/report_summary.rb

@@ -24,8 +24,7 @@ module ReportSummary
   end
 
   # output the overall test results summary
-  def self.overall_test_summary(ts_start_time, ts_end_time, total_passes,
-                                total_failures, total_skipped)
+  def self.overall_test_summary(ts_start_time, ts_end_time, total_metrics)
     # output to the console
 
     MyLog.log.info 'Finished processing all test files ' \
@@ -44,11 +43,11 @@ module ReportSummary
     MyLog.log.info "Total Tests started at: #{ts_start_time}"
     MyLog.log.info "Total Tests finished at: #{ts_end_time}"
     MyLog.log.info "Total Tests duration: #{duration}"
-    MyLog.log.info "Total Tests Passed: #{total_passes}".green
-    MyLog.log.info "Total Tests Failed: #{total_failures}".red
-    MyLog.log.info "Total Tests Skipped: #{total_skipped}".blue
-    total_tests = [total_passes, total_failures,
-                   total_skipped].sum
+    MyLog.log.info "Total Tests Passed: #{total_metrics[0]}".green
+    MyLog.log.info "Total Tests Failed: #{total_metrics[1]}".red
+    MyLog.log.info "Total Tests Skipped: #{total_metrics[2]}".blue
+    total_tests = [total_metrics[0], total_metrics[1],
+                   total_metrics[2]].sum
     MyLog.log.info "Total Tests: #{total_tests}\n"
   end
 end

data/lib/utils/create_directories.rb

@@ -21,28 +21,27 @@ module CreateDirectories
     # create top-level directory if it doesn't already exist:
     # Results/Project_id
     project_id = JsonParser.project_id.delete(' ')
-    $project_iddir = File.join('Results', project_id)
+    project_dir = File.join('Results', project_id)
 
-    FileUtils.mkdir_p($project_iddir)
+    FileUtils.mkdir_p(project_dir)
 
     # Generate UUID
-    $run_uuid = SecureRandom.uuid
+    @run_uuid = SecureRandom.uuid
   end
 
   def self.construct_testspecdirs
     # create directories for each test spec for screenshots:
     # Results/Project_id/Run_ID_UUID
-    screenshot_dir = File.join($project_iddir, "Run_ID_#{$run_uuid}")
+    project_id = JsonParser.project_id.delete(' ')
+    screenshot_dir = File.join('Results', project_id, "Run_ID_#{@run_uuid}")
 
     abs_path_screenshot_dir = File.absolute_path(screenshot_dir)
-    # abs_path_run_no_dir = File.absolute_path(runNoDir)
     FileUtils.mkdir_p(abs_path_screenshot_dir)
     # if any issues then set error message and re-raise the exception
   rescue StandardError => e
     # construct the error message from custom text and the actual system error
     # message (converted to a string)
-    error_to_display = 'Error creating the test directory structure or' \
-      ' opening the test results file : ' + e.to_s
+    error_to_display = 'Error creating directory:' + e.to_s
     raise error_to_display
   else
     # if no exception then return the screenshot file directory path

data/lib/version.rb

@@ -3,7 +3,7 @@
 module Taf
   # This module holds the TAF version information.
   module Version
-    STRING = '0.3.6'
+    STRING = '0.3.7'
 
     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.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Andy Perrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler