gitlab-qa 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43864e3afe1ee61964bdcd2e81646278adb110e183d21e9c3bae0deea67d1f1
-  data.tar.gz: 022cb5a101dc79f9cbca06b4b661acf7fdc45882fdb4754be507175f919a4187
+  metadata.gz: 5740a7e12aba0408c71f2f6c4044f800f451e9219dd07a0f9c47be3a21bb5c86
+  data.tar.gz: 342da269858a882aa2be68d6150e0115dfd5171ca535100dac7d35f306615490
 SHA512:
-  metadata.gz: ef47922f60046f4df91bfeb758d4dd2aa345dd11c1cd2422f0096917549e6bf674a00a46f99c2c500a5688b1c1b742d9ba3fa08cf946ddcd29fc9152015c7a45
-  data.tar.gz: 89fed700c3848962272bf6bf04dee329f9296a89df986403fe7e099b1fa0418e832da36945269e397ef8819265a39a61c1a45b18cef69457fbcf5f5c1df6a977
+  metadata.gz: 10789ef35f2dc2f68f51cb72b51cef717f8fcc13fb454a4bb946a66bca99b37c113d42afbc1ce997c9961e301323c033c8b5e68a42f1591671d3a6787cb47371
+  data.tar.gz: 5f6d6c83d09214a50d48b3274f79e893c0d999d326fd4d93337dcf9ddbd7b44014e66ca58afe3f016df23d899fd4c7671c7cf3ef069fa0d61723fa1b64b736a3

data/bin/qa

@@ -3,6 +3,4 @@
 require 'bundler/setup'
 require 'gitlab/qa'
 
-Gitlab::QA::Scenario
-  .const_get(ARGV.shift)
-  .perform(*ARGV)
+Gitlab::QA::Runner.run(ARGV)

data/exe/gitlab-qa

@@ -1,48 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'gitlab/qa'
-require 'optparse'
 
-# We use OptionParser here in gitlab-qa and in the QA framework in CE/EE, so we
-# need to include a separator, --, before rspec options so that OptionParser
-# doesn't reject them.
-#
-# Since we invoke OptionParser twice, the original command would need 2
-# separators otherwise the 2nd invocation of OptionParser would reject the rspec
-# tags that follow the separator.
-#
-# Rather than have to include 2 separators when we run gitlab-qa, the following
-# adds a 2nd separator if there is one in the command. It is then removed by
-# OptionParser, but when the args are passed on to the QA framework there is
-# still 1 separator so the rspec options don't cause an error when OptionParser
-# parses the options again.
-
-args = ARGV
-index = args.index('--')
-args.insert(index, '--') if index && args.count('--') == 1
-
-options = OptionParser.new do |opts|
-  opts.banner = 'Usage: gitlab-qa [options] Scenario URL [[--] path] [rspec_options]'
-
-  opts.on('-v', '--version', 'Show the version') do
-    require 'gitlab/qa/version'
-    puts "#{$PROGRAM_NAME} : #{Gitlab::QA::VERSION}"
-    exit
-  end
-
-  opts.on('-h', '--help', 'Show the usage') do
-    puts opts
-    exit
-  end
-
-  opts.parse!(args)
-end
-
-if ARGV.size >= 1
-  Gitlab::QA::Scenario
-    .const_get(args.shift)
-    .perform(*args)
-else
-  puts options
-  exit 1
-end
+Gitlab::QA::Runner.run(ARGV)

data/lib/gitlab/qa.rb

@@ -3,6 +3,7 @@ $LOAD_PATH << File.expand_path(__dir__)
 module Gitlab
   module QA
     autoload :Release, 'qa/release'
+    autoload :Runner, 'qa/runner'
 
     module Runtime
       autoload :Env, 'qa/runtime/env'

data/lib/gitlab/qa/runner.rb

@@ -0,0 +1,49 @@
+require 'optparse'
+
+module Gitlab
+  module QA
+    class Runner
+      # These options are implemented in the QA framework (i.e., in the CE/EE codebase)
+      # They're included here so that gitlab-qa treats them as valid options
+      PASS_THROUGH_OPTS = [
+        ['--address URL', 'Address of the instance to test'],
+        ['--mattermost-address URL', 'Address of the Mattermost server'],
+        ['--enable-feature FEATURE_FLAG', 'Enable a feature before running tests']
+      ].freeze
+
+      # rubocop:disable Metrics/AbcSize
+      def self.run(args)
+        options = OptionParser.new do |opts|
+          opts.banner = 'Usage: gitlab-qa [options] Scenario URL [[--] path] [rspec_options]'
+
+          PASS_THROUGH_OPTS.each do |opt|
+            opts.on(*opt)
+          end
+
+          opts.on_tail('-v', '--version', 'Show the version') do
+            require 'gitlab/qa/version'
+            puts "#{$PROGRAM_NAME} : #{VERSION}"
+            exit
+          end
+
+          opts.on_tail('-h', '--help', 'Show the usage') do
+            puts opts
+            exit
+          end
+
+          opts.parse(args)
+        end
+
+        if args.size >= 1
+          Scenario
+            .const_get(args.shift)
+            .perform(*args)
+        else
+          puts options
+          exit 1
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '3.1.0'.freeze
+    VERSION = '3.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -163,6 +163,7 @@ files:
 - lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/docker/volumes.rb
 - lib/gitlab/qa/release.rb
+- lib/gitlab/qa/runner.rb
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/scenario/actable.rb
 - lib/gitlab/qa/scenario/template.rb
@@ -210,7 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab