summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-02-24 20:30:30 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2015-02-24 23:20:00 +0100
commitc6e9d14ceb03d4f1cf2d3a720f1e64c41d3c43b8 (patch)
tree5cf0ccce91c8271d1281544d142bfa8b946256fb /spec/helpers
parent2cedeb48561122f35bfd5004aaa9c59ee3922911 (diff)
downloadgitlab-ce-c6e9d14ceb03d4f1cf2d3a720f1e64c41d3c43b8.tar.gz
Update version sorter to 2.0.0, fixes #8572
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/application_helper_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 9d99b6e33cb..6abf5b98138 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -192,10 +192,12 @@ describe ApplicationHelper do
it 'sorts tags in a natural order' do
# Stub repository.tag_names to make sure we get some valid testing data
expect(@project.repository).to receive(:tag_names).
- and_return(['v1.0.9', 'v1.0.10', 'v2.0', 'v3.1.4.2', 'v1.0.9a'])
+ and_return(['v1.0.9', 'v1.0.10', 'v2.0', 'v3.1.4.2', 'v1.0.9a',
+ 'v2.0-rc1', 'v2.0rc2'])
expect(options[1][1]).
- to eq(['v3.1.4.2', 'v2.0', 'v1.0.10', 'v1.0.9a', 'v1.0.9'])
+ to eq(['v3.1.4.2', 'v2.0', 'v2.0rc2', 'v2.0-rc1', 'v1.0.10', 'v1.0.9',
+ 'v1.0.9a'])
end
end