From 6e6a99061dbec4bb45a398a03e8a13a084e44035 Mon Sep 17 00:00:00 2001 From: Ted Hogan Date: Mon, 23 Nov 2015 11:36:47 -0700 Subject: No space required after WIP identifier Modified changelog --- CHANGELOG | 1 + app/models/merge_request.rb | 2 +- spec/models/merge_request_spec.rb | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index fc7b6e75b1d..2453b35ead3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.3.0 (unreleased) - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera) + - WIP identifier on merge requests no longer requires trailing space v 8.2.0 - Improved performance of finding projects and groups in various places diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1b3d6079d2c..2b336ca8927 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -239,7 +239,7 @@ class MergeRequest < ActiveRecord::Base end def work_in_progress? - !!(title =~ /\A\[?WIP\]?:? /i) + !!(title =~ /\A\[?WIP(\]|:| )/i) end def mergeable? diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 567c911425c..edf211c85c1 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -162,6 +162,21 @@ describe MergeRequest do expect(subject).to be_work_in_progress end + it "detects the 'WIP' prefix" do + subject.title = "WIP#{subject.title}" + expect(subject).to be_work_in_progress + end + + it "detects the 'WIP:' prefix" do + subject.title = "WIP:#{subject.title}" + expect(subject).to be_work_in_progress + end + + it "detects the '[WIP]' prefix" do + subject.title = "[WIP]#{subject.title}" + expect(subject).to be_work_in_progress + end + it "doesn't detect WIP for words starting with WIP" do subject.title = "Wipwap #{subject.title}" expect(subject).not_to be_work_in_progress -- cgit v1.2.1 From f0c2f7481febf1e1149cb3dba87780c462759d14 Mon Sep 17 00:00:00 2001 From: Ted Hogan Date: Wed, 6 Jan 2016 10:48:08 -0700 Subject: Removed redundent and incorrect tests on WIP --- spec/models/merge_request_spec.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 0d3901f4d00..ecfbbb0cfc9 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -193,16 +193,6 @@ describe MergeRequest, models: true do expect(subject).to be_work_in_progress end - it "detects the 'WIP' prefix" do - subject.title = "WIP#{subject.title}" - expect(subject).to be_work_in_progress - end - - it "detects the 'WIP:' prefix" do - subject.title = "WIP:#{subject.title}" - expect(subject).to be_work_in_progress - end - it "detects the '[WIP]' prefix" do subject.title = "[WIP]#{subject.title}" expect(subject).to be_work_in_progress -- cgit v1.2.1