gitlab-qa 7.0.4 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94fd458767a2190eeba5094962dca4d1eb9d1ec2769c3ed6815e0750c4d95d3e
-  data.tar.gz: 38f5336f05c2bb558c7099d410ceea33cf1f0ea254b978e18c32c96f5e7fdc62
+  metadata.gz: 11257d04b7148f3f1a25b08136c44734701fbf20fc3e1bd8cb8cc2315e67a4a4
+  data.tar.gz: 97585ca75030f229cc2eea291eebf1b85b31017a6ba0f31c8450eaebea636c74
 SHA512:
-  metadata.gz: 8a146c677f1b78dde5755e9d0d0445c100f4264d2e862dc98c75c8bf7265b84df9167565702c88556877c48747eb18b677a6deb4ff4489bf5e05a54c0fb0bd5c
-  data.tar.gz: e386131381bdfc7e1f7c4f9644586279af44e8996c0f4fc23a70559d821f127856e56ec37391407346982058b9377f78979f269e2d0d49b49d074845fad7c37a
+  metadata.gz: 587cf192a0d5ef209e7b94110510424078cbb765f81c0d4c1aab79eddfa690837a4da28e4f6121f031ac95cfbe760efe4ceffa3badebdbb83dad28ba0459de03
+  data.tar.gz: 66cadfafda69cf92cfece41609ad62de5dbfa5973c710d263f3848dbf8fbcd0d618d43b8ed0797ba30dd48f76c35e0e105ada659127f9a6f701b220aed1ea801

data/lib/gitlab/qa/runner.rb

@@ -57,7 +57,10 @@ module Gitlab
           end
         end
 
-        args.reject! { |arg| gitlab_qa_options.include?(arg) }
+        # Remove arguments passed into GitLab QA preventing them from being
+        # passed into the specs
+        args = remove_gitlab_qa_args(args)
+
         if args.size >= 1
           load_omnibus_configurations
 
@@ -79,7 +82,22 @@ module Gitlab
       end
 
       def self.gitlab_qa_options
-        @gitlab_qa_options ||= @options.top.list.map(&:long).flatten
+        @gitlab_qa_options ||= @options.top.list
+      end
+
+      # Take a set of arguments and remove them from the set of
+      # predefined GitLab QA arguments
+      # @param args Array the arguments to parse through and remove GitLab QA opts
+      # @return Arguments to be passed ultimately to the RSpec runner
+      def self.remove_gitlab_qa_args(args)
+        args.each_with_index do |arg, i|
+          gitlab_qa_options.each do |opt|
+            next unless opt.long.flatten.first == arg
+
+            args[i] = nil
+            args[i + 1] = nil if opt.is_a? OptionParser::Switch::RequiredArgument
+          end
+        end.compact
       end
 
       def self.load_omnibus_configurations
@@ -100,8 +118,8 @@ module Gitlab
           end
         rescue NameError
           raise <<~ERROR
-                Invalid Omnibus Configuration `#{config}`.
-                Possible configurations: #{Runtime::OmnibusConfigurations.constants.map { |c| c.to_s.underscore }.join(',')}"
+            Invalid Omnibus Configuration `#{config}`.
+            Possible configurations: #{Runtime::OmnibusConfigurations.constants.map { |c| c.to_s.underscore }.join(',')}"
           ERROR
         end
       end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.0.4'.freeze
+    VERSION = '7.0.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.5
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control