diff options
author | Jeff Stubler <brunsa2@gmail.com> | 2016-10-25 19:03:42 -0500 |
---|---|---|
committer | Jeff Stubler <brunsa2@gmail.com> | 2017-04-25 18:57:08 -0500 |
commit | a78eeefd6e76c956751a2a7f03efeaee28f83b46 (patch) | |
tree | 1216d2d6f63dafa0313c65156a45b2a0b192acc3 /spec/helpers/merge_requests_helper_spec.rb | |
parent | 1af9dfb8a8b163d70a8631a6cbb564709d5a3730 (diff) | |
download | gitlab-ce-a78eeefd6e76c956751a2a7f03efeaee28f83b46.tar.gz |
Change issues sentence to use natural sorting
Diffstat (limited to 'spec/helpers/merge_requests_helper_spec.rb')
-rw-r--r-- | spec/helpers/merge_requests_helper_spec.rb | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 25f23826648..e9037749ef2 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -22,24 +22,51 @@ describe MergeRequestsHelper do end describe '#issues_sentence' do + let(:project) { create :project } + subject { issues_sentence(issues) } let(:issues) do - [build(:issue, iid: 1), build(:issue, iid: 2), build(:issue, iid: 3)] + [build(:issue, iid: 2, project: project), + build(:issue, iid: 3, project: project), + build(:issue, iid: 1, project: project)] end - it { is_expected.to eq('#1, #2, and #3') } + it do + @project = project + + is_expected.to eq('#1, #2, and #3') + end context 'for JIRA issues' do let(:project) { create(:empty_project) } let(:issues) do [ - ExternalIssue.new('JIRA-123', project), ExternalIssue.new('JIRA-456', project), - ExternalIssue.new('FOOBAR-7890', project) + ExternalIssue.new('FOOBAR-7890', project), + ExternalIssue.new('JIRA-123', project) ] end - it { is_expected.to eq('FOOBAR-7890, JIRA-123, and JIRA-456') } + it do + @project = project + is_expected.to eq('FOOBAR-7890, JIRA-123, and JIRA-456') + end + end + + context 'for issues from multiple namespaces' do + let(:project) { create(:project) } + let(:other_project) { create(:project) } + let(:issues) do + [build(:issue, iid: 2, project: project), + build(:issue, iid: 3, project: other_project), + build(:issue, iid: 1, project: project)] + end + + it do + @project = project + + is_expected.to eq("#1, #2, and #{other_project.namespace.path}/#{other_project.path}#3") + end end end |