diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-28 22:52:04 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-28 22:52:04 +0100 |
| commit | 66a82fd8da04ca77df714f051508e950970e1343 (patch) | |
| tree | e25618272431a528d053c37b6604fb768e5acfca | |
| parent | 82a9a4c034eab240330696df578045336f34675e (diff) | |
| parent | 1c7947ace0e4f79f1c354a3d63b5f2caedbe1e35 (diff) | |
| download | gitlab-ce-66a82fd8da04ca77df714f051508e950970e1343.tar.gz | |
Merge pull request #8858 from Razer6/update-version-sorter
Update version sorter to 2.0.0, fixes #8572
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 467ef1c7c3d..37880c45a29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -617,7 +617,7 @@ GEM raindrops (~> 0.7) unicorn-worker-killer (0.4.2) unicorn (~> 4) - version_sorter (1.1.0) + version_sorter (2.0.0) virtus (1.0.1) axiom-types (~> 0.0.5) coercible (~> 1.0) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 9d99b6e33cb..5a868ad6098 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', 'v2.0rc1¿', + '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.0rc1¿', 'v2.0-rc1', 'v1.0.10', + 'v1.0.9', 'v1.0.9a']) end end |