gitlab-qa 7.9.0 → 7.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24eecf2dd51ae68e0329202fc5af2cea9b8117f8951833773f8a41a446937468
-  data.tar.gz: 0b09b0122282d99f8af09cd075b4c00cdc0ef89b5d8f7b60087143c7038464be
+  metadata.gz: e2c7a87e5b6848fc8a74dba532ff9b5cb11b9f5e4cbb805442c15455581480db
+  data.tar.gz: f52bffc17ce6f6c77438700ac7face46b5c378e47346d1a8fb52d20351002521
 SHA512:
-  metadata.gz: db871aedf8de37c94394776c01f7e93ab08970e85b70ec0e1f67ee7cacf66f4b3b0a21bf32d43e5e92e41906beb0b553bd40ea1d754b0fb721e137060825b460
-  data.tar.gz: 3510bb706ff671ce5b818e5ed4d0457e627c96fadd2e909799aa56947dcaf678ebdc6a2b3a643e45783e0bcbd9b9c8bccff27e36315f37ae45d5c3d5f4119604
+  metadata.gz: 0bed280e7cb760e5bf3f9402ab79f6eb36677002dc11b6f18d03f76963b6a52d21ee0eef3bf0b9cf488556b35be8bd91bab1bb08669ef612256cdd38ceed55b2
+  data.tar.gz: 10797a35e96fdee11549037153e7670f6b3ed7b919aa158df09695027f72f4e86afa89850b1fd5678292c194835f5d40ddc4a0f443b048389cfa8beb7e710280

data/.gitlab-ci.yml

@@ -55,7 +55,7 @@ variables:
 .check-base:
   stage: check
   script:
-    - bundle exec $CI_JOB_NAME
+    - bundle exec $CI_JOB_NAME --color
 
 rubocop:
   extends: .check-base

data/.rubocop.yml

@@ -1,15 +1,21 @@
-inherit_from: .rubocop_todo.yml
-
-require:
-  # Due to a probably bug in rubocop (https://github.com/bbatsov/rubocop/issues/5251)
-  # we need to require rubocop-rspec a second time so that RSpec/FilePath does
-  # not fallback to Rails/FilePath.
-  - rubocop-rspec
-
 inherit_gem:
   gitlab-styles:
     - rubocop-default.yml
 
+inherit_from:
+  <% unless ENV['REVEAL_RUBOCOP_TODO'] == '1' %>
+  - '.rubocop_todo.yml'
+  <% end %>
+
+Lint/HashCompareByIdentity:
+  Enabled: true
+
+Lint/RedundantSafeNavigation:
+  Enabled: true
+
+Style/ClassEqualityComparison:
+  Enabled: true
+
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,17 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-10-31 07:26:03 -0700 using RuboCop version 0.82.0.
+# on 2021-09-17 06:55:33 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 51
+# Offense count: 165
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 210
+CodeReuse/ActiveRecord:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Cop/LineBreakAroundConditionalBlock:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/runtime/env.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'gitlab-qa.gemspec'
+
+# Offense count: 1
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
+
+# Offense count: 5
+Lint/MixedRegexpCaptureTypes:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
+    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -20,6 +44,13 @@ Lint/RedundantCopDisableDirective:
     - 'lib/gitlab/qa/component/staging.rb'
     - 'lib/gitlab/qa/runtime/scenario.rb'
 
+# Offense count: 10
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 26
+  IgnoredMethods:
+    - perform
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
@@ -33,6 +64,13 @@ Performance/RegexpMatch:
   Exclude:
     - 'lib/gitlab/qa/component/gitlab.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/StringInclude:
+  Exclude:
+    - 'lib/gitlab/qa/component/gitlab.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 RSpec/EmptyLineAfterLetBlock:
@@ -51,7 +89,18 @@ RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
-# Offense count: 93
+# Offense count: 221
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 22
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ExplicitBlockArgument:
+  Exclude:
+    - 'lib/gitlab/qa/scenario/test/integration/ldap.rb'
+
+# Offense count: 86
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -64,21 +113,19 @@ Style/HashTransformKeys:
   Exclude:
     - 'lib/gitlab/qa/docker/volumes.rb'
 
-# Offense count: 6
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/HashTransformation:
+  Exclude:
+    - 'lib/gitlab/qa/docker/volumes.rb'
+
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
-    - 'lib/gitlab/qa/component/gitlab.rb'
-    - 'lib/gitlab/qa/release.rb'
     - 'lib/gitlab/qa/runtime/env.rb'
     - 'lib/gitlab/qa/runtime/scenario.rb'
     - 'lib/gitlab/qa/scenario/test/omnibus/upgrade.rb'
-    - 'lib/gitlab/qa/support/http_request.rb'
-
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/gitlab/qa/runtime/scenario.rb'
 
 # Offense count: 1
 Style/MissingRespondToMissing:
@@ -96,3 +143,25 @@ Style/MutableConstant:
     - 'db/geo/migrate/**/*'
     - 'lib/gitlab/qa/release.rb'
     - 'lib/gitlab/qa/report/update_screenshot_path.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/report/generate_test_session.rb'
+    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
+    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/gitlab/qa/reporter.rb'
+
+# Offense count: 126
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 192

data/gitlab-qa.gemspec

@@ -20,17 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # Some dependencies are pinned, to prevent new cops from breaking the CI pipelines
   spec.add_development_dependency 'climate_control', '~> 0.2'
-  spec.add_development_dependency 'gitlab-styles', '~> 4.3.0'
+  spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 12.2'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.82.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
   spec.add_development_dependency 'solargraph', '~> 0.41'
   spec.add_development_dependency 'webmock', '3.7.0'
-  spec.add_runtime_dependency 'activesupport', '~> 6.0.2'
+  spec.add_runtime_dependency 'activesupport', '~> 6.1'
   spec.add_runtime_dependency 'gitlab', '~> 4.16.1'
   spec.add_runtime_dependency 'http', '4.3.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'

data/lib/gitlab/qa/component/specs.rb

@@ -16,7 +16,7 @@ module Gitlab
           @env = {}
         end
 
-        def perform # rubocop:disable Metrics/AbcSize
+        def perform
           return puts "Skipping tests." if skip_tests?
 
           raise ArgumentError unless [suite, release].all?

data/lib/gitlab/qa/docker/shellout.rb

@@ -13,7 +13,7 @@ module Gitlab
           puts "Docker shell command: `#{@command.mask_secrets}`"
         end
 
-        def execute!
+        def execute! # rubocop:disable Metrics/AbcSize
           raise StatusError, 'Command already executed' if @output.any?
 
           Open3.popen2e(@command.to_s) do |_in, out, wait|

data/lib/gitlab/qa/scenario/test/integration/client_ssl.rb

@@ -12,7 +12,6 @@ module Gitlab
               @tag = 'client_ssl'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
@@ -42,7 +41,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
 
             def gitlab_omnibus
               <<~OMNIBUS

data/lib/gitlab/qa/scenario/test/integration/geo.rb

@@ -4,10 +4,7 @@ module Gitlab
       module Test
         module Integration
           class Geo < Scenario::Template
-            ##
             # rubocop:disable Lint/MissingCopEnableDirective
-            # rubocop:disable Metrics/AbcSize
-            #
             def perform(release, *rspec_args)
               release = QA::Release.new(release)
 

data/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

@@ -19,7 +19,6 @@ module Gitlab
               @tag = 'gitaly_cluster'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               gitaly_primary_node = gitaly(@primary_node_name, release)
               gitaly_secondary_node = gitaly(@secondary_node_name, release)
@@ -74,7 +73,6 @@ module Gitlab
               gitaly_secondary_node&.teardown
               gitaly_tertiary_node&.teardown
             end
-            # rubocop:enable Metrics/AbcSize
 
             private
 

data/lib/gitlab/qa/scenario/test/integration/kubernetes.rb

@@ -6,7 +6,6 @@ module Gitlab
       module Test
         module Integration
           class Kubernetes < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Runtime::Env.require_kubernetes_environment!
 
@@ -47,7 +46,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
           end
         end
       end

data/lib/gitlab/qa/scenario/test/integration/mtls.rb

@@ -13,7 +13,6 @@ module Gitlab
               @tag = 'mtls'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitaly|
                 gitaly.release = QA::Release.new(release)
@@ -53,7 +52,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
 
             def gitlab_omnibus
               <<~OMNIBUS

data/lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb

@@ -6,7 +6,6 @@ module Gitlab
       module Test
         module Integration
           class SSHTunnel < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Runtime::Env.override_default_password!
               Runtime::Env.require_ssh_tunnel!
@@ -49,7 +48,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.9.0'.freeze
+    VERSION = '7.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.9.0
+  version: 7.9.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.82.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.82.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement