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
f9d61717
Commit
f9d61717
authored
Mar 06, 2018
by
Mario de la Ossa
Committed by
Sean McGivern
Mar 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gitlab::Utils - backport `.ensure_array_from_string` from EE
parent
135ef031
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
lib/gitlab/utils.rb
lib/gitlab/utils.rb
+8
-0
spec/lib/gitlab/utils_spec.rb
spec/lib/gitlab/utils_spec.rb
+15
-1
No files found.
lib/gitlab/utils.rb
View file @
f9d61717
...
@@ -67,5 +67,13 @@ module Gitlab
...
@@ -67,5 +67,13 @@ module Gitlab
nil
nil
end
end
# Used in EE
# Accepts either an Array or a String and returns an array
def
ensure_array_from_string
(
string_or_array
)
return
string_or_array
if
string_or_array
.
is_a?
(
Array
)
string_or_array
.
split
(
','
).
map
(
&
:strip
)
end
end
end
end
end
spec/lib/gitlab/utils_spec.rb
View file @
f9d61717
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
Utils
do
describe
Gitlab
::
Utils
do
delegate
:to_boolean
,
:boolean_to_yes_no
,
:slugify
,
:random_string
,
:which
,
to: :described_class
delegate
:to_boolean
,
:boolean_to_yes_no
,
:slugify
,
:random_string
,
:which
,
:ensure_array_from_string
,
to: :described_class
describe
'.slugify'
do
describe
'.slugify'
do
{
{
...
@@ -83,4 +83,18 @@ describe Gitlab::Utils do
...
@@ -83,4 +83,18 @@ describe Gitlab::Utils do
expect
(
which
(
'sh'
,
'PATH'
=>
'/bin'
)).
to
eq
(
'/bin/sh'
)
expect
(
which
(
'sh'
,
'PATH'
=>
'/bin'
)).
to
eq
(
'/bin/sh'
)
end
end
end
end
describe
'.ensure_array_from_string'
do
it
'returns the same array if given one'
do
arr
=
[
'a'
,
4
,
true
,
{
test:
1
}]
expect
(
ensure_array_from_string
(
arr
)).
to
eq
(
arr
)
end
it
'turns comma-separated strings into arrays'
do
str
=
'seven, eight, 9, 10'
expect
(
ensure_array_from_string
(
str
)).
to
eq
(
%w[seven eight 9 10]
)
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