confiner 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ae8847a7ab0729d5e877f42348713b93f0354c6ea0961f9e5b8cd44a8c18e6
-  data.tar.gz: e8f469de2c467669cc6ebe5cd2c25a8707749b0901f2165049249962bcbb0868
+  metadata.gz: 2aec5b597e2386e03ac5df865c2a0adc622a13ec580047e9a320a5ddf80d486b
+  data.tar.gz: 41d27a7ae0f3e5fb86a8d19d00593a043bd08eefb9d9304d531f4ab46e81c726
 SHA512:
-  metadata.gz: 8f430addea12b346909efd5568a85d9232fd6f4969258d0aaa5cb9e8344fab58791378734e2c89d58069044739218bd45155ef293487b9a93b95ae5185ed55c7
-  data.tar.gz: 190392762988fa1273a0e32aa6f74aa9f467879a93729e7a139204e09fb5206cab90e3fecca13a51734bd8917bb2b153e907fc869a3274534f79f163c1dd8d7b
+  metadata.gz: a265ca1e725d8075bdd17dfb67ffb2e74fccc171581255b71789f6491e9da2cdb7ee0737073d7dbe3cf02dc9e0cbc85ae9f05538e7021ef5d8eb2ffef53e4961
+  data.tar.gz: 35ba5a29c7bed14503fb81db7d791b392167630fe7f8780eb8e93277e0a4dde156d8d358abc68dfe2910eb7ee12fb4338f91d7b627ea5c86f639a2d98c56131d

data/lib/confiner/plugins/gitlab.rb

@@ -24,6 +24,8 @@ module Confiner
 
         ENV['GITLAB_API_HTTPARTY_OPTIONS'] = ENV.fetch('GITLAB_API_HTTPARTY_OPTIONS') { "{read_timeout: #{timeout}}" }
 
+        raise ArgumentError, 'Missing private_token' if private_token.nil?
+
         @gitlab_client = ::Gitlab.client(private_token: private_token, endpoint: endpoint)
       end
 
@@ -184,7 +186,7 @@ module Confiner
       # @param [Gitlab::ObjectifiedHash] failure_issue the existing failure issue
       # @return [Gitlab::ObjectifiedHash] the new branch
       def create_branch(failure_issue, example)
-        branch = @gitlab_client.create_branch(target_project, "#{failure_issue['iid']}-quarantine-#{example.name.tr(' ', '-')}", ref)
+        branch = @gitlab_client.create_branch(target_project, "#{failure_issue['iid']}-quarantine-#{example.name.gsub(/\W/, '-')}", ref)
 
         log :branch, "Created branch #{branch['name']} (#{branch['web_url']})", 4
 
@@ -228,13 +230,15 @@ module Confiner
           end
         end
 
+        meets_or_exceeds_threshold = occurrences.size > threshold ? 'exceeds' : 'meets'
+
         description = <<~MARKDOWN
           ## What does this MR do?
 
           Quarantines the test `#{example.name}` (https://gitlab.com/#{target_project}/-/blob/#{ref}/#{example.file}#L#{changed_line_number})
 
-          This test has been found by [Confiner](https://gitlab.com/gitlab-org/quality/confiner) to have been failing for
-          more than (or equal to) #{threshold} times.  This test has failed #{occurrences.size} times.
+          This test has been found by [Confiner](https://gitlab.com/gitlab-org/quality/confiner) to have failed
+          #{occurrences.size} times, which #{meets_or_exceeds_threshold} the threshold of #{threshold} times.
 
           #{markdown_occurrences.join("\n")}
 

data/lib/confiner/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Confiner
+  VERSION = '0.2.2'
+end

data/lib/confiner.rb

@@ -7,7 +7,5 @@ loader.push_dir(__dir__)
 loader.setup
 
 module Confiner
-  VERSION = '0.2.1'
-
   module Plugins; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confiner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.10.0
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +82,7 @@ files:
 - lib/confiner/plugin.rb
 - lib/confiner/plugins/debug.rb
 - lib/confiner/plugins/gitlab.rb
+- lib/confiner/version.rb
 homepage: https://gitlab.com/gitlab-org/quality/confiner
 licenses:
 - MIT