Add a test for issue sentence generation

Jacob Vosmaer
1 parent 2af8ace1
Showing 3 changed files with 17 additions and 1 deletions Show diff stats
app/helpers/merge_requests_helper.rb
app/views/projects/merge_requests/show/_state_widget.html.haml
spec/helpers/merge_requests_helper.rb
@@ -42,4 +42,8 @@ module MergeRequestsHelper
       "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
     end
   end
+
+  def issues_sentence(issues)
+    issues.map { |i| "##{i.iid}" }.to_sentence
+  end
 end
@@ -37,5 +37,5 @@
         %i.icon-ok
         Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
         = succeed '.' do
-          != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
+          != gfm(issues_sentence(@closes_issues))
  
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe MergeRequestsHelper do
+  describe :issues_sentence do
+    subject { issues_sentence(issues) }
+    let(:issues) do
+      [build(:issue, iid: 1), build(:issue, iid: 2), build(:issue, iid: 3)]
+    end
+
+    it { should eq('#1, #2, and #3') }
+  end
+end
...	...	@@ -42,4 +42,8 @@ module MergeRequestsHelper
42	42	"Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
43	43	end
44	44	end
	45	+
	46	+ def issues_sentence(issues)
	47	+ issues.map { \|i\| "##{i.iid}" }.to_sentence
	48	+ end
45	49	end
...	...
...	...	@@ -37,5 +37,5 @@
37	37	%i.icon-ok
38	38	Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
39	39	= succeed '.' do
40		- != gfm(@closes_issues.map { \|i\| "##{i.iid}" }.to_sentence)
	40	+ != gfm(issues_sentence(@closes_issues))
41	41
...	...
...	...	@@ -0,0 +1,12 @@
	1	+require 'spec_helper'
	2	+
	3	+describe MergeRequestsHelper do
	4	+ describe :issues_sentence do
	5	+ subject { issues_sentence(issues) }
	6	+ let(:issues) do
	7	+ [build(:issue, iid: 1), build(:issue, iid: 2), build(:issue, iid: 3)]
	8	+ end
	9	+
	10	+ it { should eq('#1, #2, and #3') }
	11	+ end
	12	+end
...	...