gitlab_quality-test_tooling 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed3ddf73e69dbf985ff11b7192c25055281b4559b53f3961ff7c4de033872e70
-  data.tar.gz: 30de36dd668dd20ab52a19c12cbf3b68f87041cd12bf495692686f2e813a3332
+  metadata.gz: d201b5e75d11490d7b8a3f7b3abdc883442487d07d19f9c5c7cf02577a867116
+  data.tar.gz: 0b50d503726912d587bb2b3d4bd1e1c2194b8f0773d2a37905afa0c66dfbbaee
 SHA512:
-  metadata.gz: 1dcb1a3f77b47b5ecafd5a425b2de398cedc6caf3b7fa4e4f0a351d467f723329e7382a592936064ff4969b25976e9b3b88553610d33b88db2e22a42c0e2917d
-  data.tar.gz: 0bb812067345d488cfea73ad4d25e396aeea79eaa2a0790de5607e20e3ce08a1e2a96990f8ee1523d52d1c95112e7b99755dfa8857731337a05466d90bbb0925
+  metadata.gz: e5b8c615d62f29710c55a3d39373efb71cf1b7895d3b7ca08d6a4e0077e47b7a0c109f111716d49d7d5adcac4b3ffc8668c20fcb95fc01bfb2244c38bfafba62
+  data.tar.gz: 30b05b1eac9f9b6400e089b1de4e229fcd5769aae2a41066bc43e79e08f6a6c37db8e4b7cbbfd46933021eabafa098be601a546c5cc05d7a93fa4c01d5c14021

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (0.8.0)
-      activesupport (~> 6.1)
+    gitlab_quality-test_tooling (0.8.2)
+      activesupport (>= 6.1, < 7.1)
       gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)

data/lib/gitlab_quality/test_tooling/report/update_screenshot_path.rb

@@ -12,18 +12,12 @@ module GitlabQuality
           @input_files = input_files
         end
 
-        REGEX = %r{(?<gitlab_qa_run>gitlab-qa-run-.*?(?=/))/(?<gitlab_ce_ee_qa>gitlab-(?:ee|ce)-qa-.*?(?=/))}
         CONTAINER_PATH = File.join('/home', 'gitlab', 'qa', 'tmp').freeze
 
         def invoke!
           Dir.glob(input_files).each do |input_file|
-            match_data = input_file.match(REGEX)
-            next unless match_data
-
-            host_relative_path = "#{match_data[:gitlab_qa_run]}/#{match_data[:gitlab_ce_ee_qa]}"
-
-            rewrite_schreenshot_paths_in_junit_file(input_file, host_relative_path)
-            rewrite_schreenshot_paths_in_json_file(input_file.gsub('.xml', '.json'), host_relative_path)
+            rewrite_schreenshot_paths_in_junit_file(input_file)
+            rewrite_schreenshot_paths_in_json_file(input_file.gsub('.xml', '.json'))
           end
         end
 
@@ -31,35 +25,35 @@ module GitlabQuality
 
         attr_reader :input_files
 
-        def rewrite_schreenshot_paths_in_junit_file(junit_file, host_relative_path)
+        def rewrite_schreenshot_paths_in_junit_file(junit_file)
           File.write(
             junit_file,
-            rewrite_each_junit_screenshot_path(junit_file, host_relative_path).to_s
+            rewrite_each_junit_screenshot_path(junit_file).to_s
           )
 
           puts "Saved #{junit_file}"
         end
 
-        def rewrite_schreenshot_paths_in_json_file(json_file, host_relative_path)
+        def rewrite_schreenshot_paths_in_json_file(json_file)
           File.write(
             json_file,
             JSON.pretty_generate(
-              rewrite_each_json_screenshot_path(json_file, host_relative_path)
+              rewrite_each_json_screenshot_path(json_file)
             )
           )
 
           puts "Saved #{json_file}"
         end
 
-        def rewrite_each_junit_screenshot_path(junit_file, host_relative_path)
+        def rewrite_each_junit_screenshot_path(junit_file)
           Nokogiri::XML(File.open(junit_file)).tap do |report|
             report.xpath('//system-out').each do |system_out|
-              system_out.content = remove_container_absolute_path_prefix(system_out.content, host_relative_path)
+              system_out.content = remove_container_absolute_path_prefix(system_out.content, test_artifacts_directory(junit_file))
             end
           end
         end
 
-        def rewrite_each_json_screenshot_path(json_file, host_relative_path)
+        def rewrite_each_json_screenshot_path(json_file)
           JSON.parse(File.read(json_file)).tap do |report|
             examples = report['examples']
 
@@ -67,13 +61,17 @@ module GitlabQuality
               next unless example['screenshot'].present?
 
               example['screenshot']['image'] =
-                remove_container_absolute_path_prefix(example.dig('screenshot', 'image'), host_relative_path)
+                remove_container_absolute_path_prefix(example.dig('screenshot', 'image'), test_artifacts_directory(json_file))
             end
           end
         end
 
-        def remove_container_absolute_path_prefix(image_container_absolute_path, host_relative_path)
-          image_container_absolute_path.gsub(CONTAINER_PATH, host_relative_path)
+        def remove_container_absolute_path_prefix(image_container_absolute_path, test_artifacts_dir)
+          image_container_absolute_path.gsub(CONTAINER_PATH, test_artifacts_dir)
+        end
+
+        def test_artifacts_directory(filepath)
+          File.dirname(filepath)
         end
       end
     end

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "0.8.0"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -182,16 +182,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement