Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
66a82fd8
Commit
66a82fd8
authored
Feb 28, 2015
by
Jeroen van Baarsen
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8858 from Razer6/update-version-sorter
Update version sorter to 2.0.0, fixes #8572
parents
82a9a4c0
1c7947ac
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Gemfile.lock
Gemfile.lock
+1
-1
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+4
-2
No files found.
Gemfile.lock
View file @
66a82fd8
...
@@ -617,7 +617,7 @@ GEM
...
@@ -617,7 +617,7 @@ GEM
raindrops (~> 0.7)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.2)
unicorn-worker-killer (0.4.2)
unicorn (~> 4)
unicorn (~> 4)
version_sorter (
1.1
.0)
version_sorter (
2.0
.0)
virtus (1.0.1)
virtus (1.0.1)
axiom-types (~> 0.0.5)
axiom-types (~> 0.0.5)
coercible (~> 1.0)
coercible (~> 1.0)
...
...
spec/helpers/application_helper_spec.rb
View file @
66a82fd8
...
@@ -192,10 +192,12 @@ describe ApplicationHelper do
...
@@ -192,10 +192,12 @@ describe ApplicationHelper do
it
'sorts tags in a natural order'
do
it
'sorts tags in a natural order'
do
# Stub repository.tag_names to make sure we get some valid testing data
# Stub repository.tag_names to make sure we get some valid testing data
expect
(
@project
.
repository
).
to
receive
(
:tag_names
).
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
]).
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
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment