Implement reviewer feedback

app/models/commit_status.rb

@@ -198,15 +198,15 @@ class CommitStatus < ApplicationRecord
     will_save_change_to_status?
   end
 
-  # Extracts common job name for matrix and parallel builds:
+  def group_name
     # 'rspec:linux: 1/10' => 'rspec:linux'
+    common_name = name.to_s.gsub(%r{\d+[\s:\/\\]+\d+\s*}, '')
+
     # 'rspec:linux: [aws, max memory]' => 'rspec:linux'
-  #
-  def group_name
-    group_name = name.to_s.gsub(%r{\d+[\s:\/\\]+\d+\s*}, '')
-    group_name.gsub!(%r{: \[.+, .+\]\s*\z}, '') if Gitlab::Ci::Features.new_matrix_job_names_enabled?
-    group_name.strip!
-    group_name
+    common_name.gsub!(%r{: \[.*, .*\]\s*\z}, '') if Gitlab::Ci::Features.new_matrix_job_names_enabled?
+
+    common_name.strip!
+    common_name
   end
 
   def failed_but_allowed?

spec/models/commit_status_spec.rb

@@ -517,7 +517,11 @@ RSpec.describe CommitStatus do
       'rspec:linux: [aws, max memory, data]' => 'rspec:linux',
       'rspec: [inception: [something, other thing], value]' => 'rspec',
       'rspec:windows 0/1: [name, other]' => 'rspec:windows',
-      'rspec:windows: [name, other] 0/1' => 'rspec:windows'
+      'rspec:windows: [name, other] 0/1' => 'rspec:windows',
+      'rspec:windows: [name, 0/1] 0/1' => 'rspec:windows',
+      'rspec:windows: [0/1, name]' => 'rspec:windows',
+      'rspec:windows: [, ]' => 'rspec:windows',
+      'rspec:windows: [name]' => 'rspec:windows: [name]'
     }
 
     tests.each do |name, group_name|