Merge pull request #691 from Fryguy/fix_pr_titles

Fix issue where tags with dashes are ignored
ManageIQ · Jun 12, 2024 · b78c355 · b78c355
2 parents 07d3ef4 + 30fa42e
commit b78c355
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/branch.rb b/app/models/branch.rb
@@ -84,7 +84,7 @@ def fq_pr_number
   end
 
   def pr_title_tags
-    pr_title.to_s.match(/^(?:\s*\[\w+\])+/).to_s.gsub("[", " [").split.map { |s| s[1...-1] }
+    pr_title.to_s.match(/^(?:\s*\[[\w-]+\])+/).to_s.gsub("[", " [").split.map { |s| s[1...-1] }
   end
 
   def github_pr_uri

diff --git a/spec/models/branch_spec.rb b/spec/models/branch_spec.rb
@@ -152,6 +152,11 @@
       expect(branch.pr_title_tags).to eq ["WIP", "foo_bar"]
     end
 
+    it "with a pr_title with tags with dashes" do
+      branch.pr_title = "[WIP] [2-EL9] This is a PR title"
+      expect(branch.pr_title_tags).to eq ["WIP", "2-EL9"]
+    end
+
     it "with a pr_title with tag-like strings not at the start" do
       branch.pr_title = "This is a [PR] title"
       expect(branch.pr_title_tags).to eq []