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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c809b104
Commit
c809b104
authored
Feb 21, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/ColonMethodCall
parent
24e7e0be
Changes
27
Show whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
36 additions
and
38 deletions
+36
-38
.rubocop.yml
.rubocop.yml
+3
-0
.rubocop_todo.yml
.rubocop_todo.yml
+0
-5
app/controllers/profiles/two_factor_auths_controller.rb
app/controllers/profiles/two_factor_auths_controller.rb
+1
-1
app/models/commit.rb
app/models/commit.rb
+1
-1
app/models/project_services/drone_ci_service.rb
app/models/project_services/drone_ci_service.rb
+2
-2
app/models/repository.rb
app/models/repository.rb
+1
-1
app/services/projects/download_service.rb
app/services/projects/download_service.rb
+1
-1
app/workers/irker_worker.rb
app/workers/irker_worker.rb
+3
-3
lib/api/notes.rb
lib/api/notes.rb
+1
-1
lib/bitbucket/representation/repo.rb
lib/bitbucket/representation/repo.rb
+1
-1
lib/gitlab/gon_helper.rb
lib/gitlab/gon_helper.rb
+1
-1
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+1
-1
spec/features/atom/dashboard_issues_spec.rb
spec/features/atom/dashboard_issues_spec.rb
+1
-1
spec/features/atom/issues_spec.rb
spec/features/atom/issues_spec.rb
+2
-2
spec/features/dashboard_issues_spec.rb
spec/features/dashboard_issues_spec.rb
+2
-2
spec/features/projects/import_export/export_file_spec.rb
spec/features/projects/import_export/export_file_spec.rb
+1
-1
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+1
-1
spec/features/projects/import_export/namespace_export_file_spec.rb
...ures/projects/import_export/namespace_export_file_spec.rb
+1
-1
spec/lib/gitlab/git/blob_spec.rb
spec/lib/gitlab/git/blob_spec.rb
+1
-1
spec/lib/gitlab/git_spec.rb
spec/lib/gitlab/git_spec.rb
+3
-3
spec/lib/gitlab/import_export/avatar_saver_spec.rb
spec/lib/gitlab/import_export/avatar_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/file_importer_spec.rb
spec/lib/gitlab/import_export/file_importer_spec.rb
+1
-1
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/repo_bundler_spec.rb
spec/lib/gitlab/import_export/repo_bundler_spec.rb
+1
-1
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb
+1
-1
spec/lib/gitlab/kubernetes_spec.rb
spec/lib/gitlab/kubernetes_spec.rb
+1
-1
spec/workers/git_garbage_collect_worker_spec.rb
spec/workers/git_garbage_collect_worker_spec.rb
+2
-2
No files found.
.rubocop.yml
View file @
c809b104
...
@@ -959,6 +959,9 @@ Style/BracesAroundHashParameters:
...
@@ -959,6 +959,9 @@ Style/BracesAroundHashParameters:
Style/CaseEquality
:
Style/CaseEquality
:
Enabled
:
false
Enabled
:
false
Style/ColonMethodCall
:
Enabled
:
true
Style/CommentAnnotation
:
Style/CommentAnnotation
:
Enabled
:
false
Enabled
:
false
...
...
.rubocop_todo.yml
View file @
c809b104
...
@@ -38,11 +38,6 @@ RSpec/SingleArgumentMessageChain:
...
@@ -38,11 +38,6 @@ RSpec/SingleArgumentMessageChain:
Exclude
:
Exclude
:
-
'
spec/requests/api/internal_spec.rb'
-
'
spec/requests/api/internal_spec.rb'
# Offense count: 33
# Cop supports --auto-correct.
Style/ColonMethodCall
:
Enabled
:
false
# Offense count: 32
# Offense count: 32
# Cop supports --auto-correct.
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
...
...
app/controllers/profiles/two_factor_auths_controller.rb
View file @
c809b104
...
@@ -80,7 +80,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
...
@@ -80,7 +80,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
def
build_qr_code
def
build_qr_code
uri
=
current_user
.
otp_provisioning_uri
(
account_string
,
issuer:
issuer_host
)
uri
=
current_user
.
otp_provisioning_uri
(
account_string
,
issuer:
issuer_host
)
RQRCode
::
render_qrcode
(
uri
,
:svg
,
level: :m
,
unit:
3
)
RQRCode
.
render_qrcode
(
uri
,
:svg
,
level: :m
,
unit:
3
)
end
end
def
account_string
def
account_string
...
...
app/models/commit.rb
View file @
c809b104
...
@@ -105,7 +105,7 @@ class Commit
...
@@ -105,7 +105,7 @@ class Commit
end
end
def
diff_line_count
def
diff_line_count
@diff_line_count
||=
Commit
::
diff_line_count
(
raw_diffs
)
@diff_line_count
||=
Commit
.
diff_line_count
(
raw_diffs
)
@diff_line_count
@diff_line_count
end
end
...
...
app/models/project_services/drone_ci_service.rb
View file @
c809b104
...
@@ -39,7 +39,7 @@ class DroneCiService < CiService
...
@@ -39,7 +39,7 @@ class DroneCiService < CiService
def
commit_status_path
(
sha
,
ref
)
def
commit_status_path
(
sha
,
ref
)
url
=
[
drone_url
,
url
=
[
drone_url
,
"gitlab/
#{
project
.
full_path
}
/commits/
#{
sha
}
"
,
"gitlab/
#{
project
.
full_path
}
/commits/
#{
sha
}
"
,
"?branch=
#{
URI
::
encode
(
ref
.
to_s
)
}
&access_token=
#{
token
}
"
]
"?branch=
#{
URI
.
encode
(
ref
.
to_s
)
}
&access_token=
#{
token
}
"
]
URI
.
join
(
*
url
).
to_s
URI
.
join
(
*
url
).
to_s
end
end
...
@@ -74,7 +74,7 @@ class DroneCiService < CiService
...
@@ -74,7 +74,7 @@ class DroneCiService < CiService
def
build_page
(
sha
,
ref
)
def
build_page
(
sha
,
ref
)
url
=
[
drone_url
,
url
=
[
drone_url
,
"gitlab/
#{
project
.
full_path
}
/redirect/commits/
#{
sha
}
"
,
"gitlab/
#{
project
.
full_path
}
/redirect/commits/
#{
sha
}
"
,
"?branch=
#{
URI
::
encode
(
ref
.
to_s
)
}
"
]
"?branch=
#{
URI
.
encode
(
ref
.
to_s
)
}
"
]
URI
.
join
(
*
url
).
to_s
URI
.
join
(
*
url
).
to_s
end
end
...
...
app/models/repository.rb
View file @
c809b104
...
@@ -908,7 +908,7 @@ class Repository
...
@@ -908,7 +908,7 @@ class Repository
def
get_committer_and_author
(
user
,
email:
nil
,
name:
nil
)
def
get_committer_and_author
(
user
,
email:
nil
,
name:
nil
)
committer
=
user_to_committer
(
user
)
committer
=
user_to_committer
(
user
)
author
=
Gitlab
::
Git
::
committer_hash
(
email:
email
,
name:
name
)
||
committer
author
=
Gitlab
::
Git
.
committer_hash
(
email:
email
,
name:
name
)
||
committer
{
{
author:
author
,
author:
author
,
...
...
app/services/projects/download_service.rb
View file @
c809b104
...
@@ -25,7 +25,7 @@ module Projects
...
@@ -25,7 +25,7 @@ module Projects
end
end
def
http?
(
url
)
def
http?
(
url
)
url
=~
/\A
#{
URI
::
regexp
([
'http'
,
'https'
])
}
\z/
url
=~
/\A
#{
URI
.
regexp
([
'http'
,
'https'
])
}
\z/
end
end
def
valid_domain?
(
url
)
def
valid_domain?
(
url
)
...
...
app/workers/irker_worker.rb
View file @
c809b104
...
@@ -120,8 +120,8 @@ class IrkerWorker
...
@@ -120,8 +120,8 @@ class IrkerWorker
end
end
def
compare_url
(
data
,
repo_path
)
def
compare_url
(
data
,
repo_path
)
sha1
=
Commit
::
truncate_sha
(
data
[
'before'
])
sha1
=
Commit
.
truncate_sha
(
data
[
'before'
])
sha2
=
Commit
::
truncate_sha
(
data
[
'after'
])
sha2
=
Commit
.
truncate_sha
(
data
[
'after'
])
compare_url
=
"
#{
Gitlab
.
config
.
gitlab
.
url
}
/
#{
repo_path
}
/compare"
compare_url
=
"
#{
Gitlab
.
config
.
gitlab
.
url
}
/
#{
repo_path
}
/compare"
compare_url
+=
"/
#{
sha1
}
...
#{
sha2
}
"
compare_url
+=
"/
#{
sha1
}
...
#{
sha2
}
"
colorize_url
compare_url
colorize_url
compare_url
...
@@ -129,7 +129,7 @@ class IrkerWorker
...
@@ -129,7 +129,7 @@ class IrkerWorker
def
send_one_commit
(
project
,
hook_attrs
,
repo_name
,
branch
)
def
send_one_commit
(
project
,
hook_attrs
,
repo_name
,
branch
)
commit
=
commit_from_id
project
,
hook_attrs
[
'id'
]
commit
=
commit_from_id
project
,
hook_attrs
[
'id'
]
sha
=
colorize_sha
Commit
::
truncate_sha
(
hook_attrs
[
'id'
])
sha
=
colorize_sha
Commit
.
truncate_sha
(
hook_attrs
[
'id'
])
author
=
hook_attrs
[
'author'
][
'name'
]
author
=
hook_attrs
[
'author'
][
'name'
]
files
=
colorize_nb_files
(
files_count
commit
)
files
=
colorize_nb_files
(
files_count
commit
)
title
=
commit
.
title
title
=
commit
.
title
...
...
lib/api/notes.rb
View file @
c809b104
...
@@ -85,7 +85,7 @@ module API
...
@@ -85,7 +85,7 @@ module API
note
=
::
Notes
::
CreateService
.
new
(
user_project
,
current_user
,
opts
).
execute
note
=
::
Notes
::
CreateService
.
new
(
user_project
,
current_user
,
opts
).
execute
if
note
.
valid?
if
note
.
valid?
present
note
,
with:
Entities
::
const_get
(
note
.
class
.
name
)
present
note
,
with:
Entities
.
const_get
(
note
.
class
.
name
)
else
else
not_found!
(
"Note
#{
note
.
errors
.
messages
}
"
)
not_found!
(
"Note
#{
note
.
errors
.
messages
}
"
)
end
end
...
...
lib/bitbucket/representation/repo.rb
View file @
c809b104
...
@@ -23,7 +23,7 @@ module Bitbucket
...
@@ -23,7 +23,7 @@ module Bitbucket
url
=
raw
[
'links'
][
'clone'
].
find
{
|
link
|
link
[
'name'
]
==
'https'
}.
fetch
(
'href'
)
url
=
raw
[
'links'
][
'clone'
].
find
{
|
link
|
link
[
'name'
]
==
'https'
}.
fetch
(
'href'
)
if
token
.
present?
if
token
.
present?
clone_url
=
URI
::
parse
(
url
)
clone_url
=
URI
.
parse
(
url
)
clone_url
.
user
=
"x-token-auth:
#{
token
}
"
clone_url
.
user
=
"x-token-auth:
#{
token
}
"
clone_url
.
to_s
clone_url
.
to_s
else
else
...
...
lib/gitlab/gon_helper.rb
View file @
c809b104
...
@@ -2,7 +2,7 @@ module Gitlab
...
@@ -2,7 +2,7 @@ module Gitlab
module
GonHelper
module
GonHelper
def
add_gon_variables
def
add_gon_variables
gon
.
api_version
=
API
::
API
.
version
gon
.
api_version
=
API
::
API
.
version
gon
.
default_avatar_url
=
URI
::
join
(
Gitlab
.
config
.
gitlab
.
url
,
ActionController
::
Base
.
helpers
.
image_path
(
'no_avatar.png'
)).
to_s
gon
.
default_avatar_url
=
URI
.
join
(
Gitlab
.
config
.
gitlab
.
url
,
ActionController
::
Base
.
helpers
.
image_path
(
'no_avatar.png'
)).
to_s
gon
.
max_file_size
=
current_application_settings
.
max_attachment_size
gon
.
max_file_size
=
current_application_settings
.
max_attachment_size
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
shortcuts_path
=
help_page_path
(
'shortcuts'
)
gon
.
shortcuts_path
=
help_page_path
(
'shortcuts'
)
...
...
lib/gitlab/shell.rb
View file @
c809b104
...
@@ -82,7 +82,7 @@ module Gitlab
...
@@ -82,7 +82,7 @@ module Gitlab
def
import_repository
(
storage
,
name
,
url
)
def
import_repository
(
storage
,
name
,
url
)
# Timeout should be less than 900 ideally, to prevent the memory killer
# Timeout should be less than 900 ideally, to prevent the memory killer
# to silently kill the process without knowing we are timing out here.
# to silently kill the process without knowing we are timing out here.
output
,
status
=
Popen
::
popen
([
gitlab_shell_projects_path
,
'import-project'
,
output
,
status
=
Popen
.
popen
([
gitlab_shell_projects_path
,
'import-project'
,
storage
,
"
#{
name
}
.git"
,
url
,
'800'
])
storage
,
"
#{
name
}
.git"
,
url
,
'800'
])
raise
Error
,
output
unless
status
.
zero?
raise
Error
,
output
unless
status
.
zero?
true
true
...
...
spec/features/atom/dashboard_issues_spec.rb
View file @
c809b104
...
@@ -23,7 +23,7 @@ describe "Dashboard Issues Feed", feature: true do
...
@@ -23,7 +23,7 @@ describe "Dashboard Issues Feed", feature: true do
visit
issues_dashboard_path
(
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
visit
issues_dashboard_path
(
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
link
=
find
(
'link[type="application/atom+xml"]'
)
link
=
find
(
'link[type="application/atom+xml"]'
)
params
=
CGI
::
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
...
...
spec/features/atom/issues_spec.rb
View file @
c809b104
...
@@ -43,7 +43,7 @@ describe 'Issues Feed', feature: true do
...
@@ -43,7 +43,7 @@ describe 'Issues Feed', feature: true do
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
link
=
find
(
'link[type="application/atom+xml"]'
)
link
=
find
(
'link[type="application/atom+xml"]'
)
params
=
CGI
::
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
...
@@ -54,7 +54,7 @@ describe 'Issues Feed', feature: true do
...
@@ -54,7 +54,7 @@ describe 'Issues Feed', feature: true do
visit
issues_group_path
(
group
,
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
visit
issues_group_path
(
group
,
:atom
,
private_token:
user
.
private_token
,
state:
'opened'
,
assignee_id:
user
.
id
)
link
=
find
(
'link[type="application/atom+xml"]'
)
link
=
find
(
'link[type="application/atom+xml"]'
)
params
=
CGI
::
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
expect
(
params
).
to
include
(
'state'
=>
[
'opened'
])
...
...
spec/features/dashboard_issues_spec.rb
View file @
c809b104
...
@@ -49,9 +49,9 @@ describe "Dashboard Issues filtering", feature: true, js: true do
...
@@ -49,9 +49,9 @@ describe "Dashboard Issues filtering", feature: true, js: true do
visit_issues
(
milestone_title:
''
,
assignee_id:
user
.
id
)
visit_issues
(
milestone_title:
''
,
assignee_id:
user
.
id
)
link
=
find
(
'.nav-controls a'
,
text:
'Subscribe'
)
link
=
find
(
'.nav-controls a'
,
text:
'Subscribe'
)
params
=
CGI
::
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
auto_discovery_link
=
find
(
'link[type="application/atom+xml"]'
,
visible:
false
)
auto_discovery_link
=
find
(
'link[type="application/atom+xml"]'
,
visible:
false
)
auto_discovery_params
=
CGI
::
parse
(
URI
.
parse
(
auto_discovery_link
[
:href
]).
query
)
auto_discovery_params
=
CGI
.
parse
(
URI
.
parse
(
auto_discovery_link
[
:href
]).
query
)
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'private_token'
=>
[
user
.
private_token
])
expect
(
params
).
to
include
(
'milestone_title'
=>
[
''
])
expect
(
params
).
to
include
(
'milestone_title'
=>
[
''
])
...
...
spec/features/projects/import_export/export_file_spec.rb
View file @
c809b104
...
@@ -9,7 +9,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
...
@@ -9,7 +9,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
include
ExportFileHelper
include
ExportFileHelper
let
(
:user
)
{
create
(
:admin
)
}
let
(
:user
)
{
create
(
:admin
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/import_file_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/import_file_spec"
}
let
(
:config_hash
)
{
YAML
.
load_file
(
Gitlab
::
ImportExport
.
config_file
).
deep_stringify_keys
}
let
(
:config_hash
)
{
YAML
.
load_file
(
Gitlab
::
ImportExport
.
config_file
).
deep_stringify_keys
}
let
(
:sensitive_words
)
{
%w[pass secret token key]
}
let
(
:sensitive_words
)
{
%w[pass secret token key]
}
...
...
spec/features/projects/import_export/import_file_spec.rb
View file @
c809b104
...
@@ -4,7 +4,7 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
...
@@ -4,7 +4,7 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
include
Select2Helper
include
Select2Helper
let
(
:file
)
{
File
.
join
(
Rails
.
root
,
'spec'
,
'features'
,
'projects'
,
'import_export'
,
'test_project_export.tar.gz'
)
}
let
(
:file
)
{
File
.
join
(
Rails
.
root
,
'spec'
,
'features'
,
'projects'
,
'import_export'
,
'test_project_export.tar.gz'
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/import_file_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/import_file_spec"
}
background
do
background
do
allow_any_instance_of
(
Gitlab
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
allow_any_instance_of
(
Gitlab
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
...
...
spec/features/projects/import_export/namespace_export_file_spec.rb
View file @
c809b104
require
'spec_helper'
require
'spec_helper'
feature
'Import/Export - Namespace export file cleanup'
,
feature:
true
,
js:
true
do
feature
'Import/Export - Namespace export file cleanup'
,
feature:
true
,
js:
true
do
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/import_file_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/import_file_spec"
}
let
(
:config_hash
)
{
YAML
.
load_file
(
Gitlab
::
ImportExport
.
config_file
).
deep_stringify_keys
}
let
(
:config_hash
)
{
YAML
.
load_file
(
Gitlab
::
ImportExport
.
config_file
).
deep_stringify_keys
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
...
...
spec/lib/gitlab/git/blob_spec.rb
View file @
c809b104
...
@@ -292,7 +292,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
...
@@ -292,7 +292,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
it
'should preserve file modes with commit'
do
it
'should preserve file modes with commit'
do
commit_options
[
:file
][
:path
]
=
'files/executables/ls'
commit_options
[
:file
][
:path
]
=
'files/executables/ls'
entry
=
Gitlab
::
Git
::
Blob
::
find_entry_by_path
(
repository
,
commit
.
tree
.
oid
,
commit_options
[
:file
][
:path
])
entry
=
Gitlab
::
Git
::
Blob
.
find_entry_by_path
(
repository
,
commit
.
tree
.
oid
,
commit_options
[
:file
][
:path
])
expect
(
entry
[
:filemode
]).
to
eq
(
0100755
)
expect
(
entry
[
:filemode
]).
to
eq
(
0100755
)
end
end
end
end
...
...
spec/lib/gitlab/git_spec.rb
View file @
c809b104
...
@@ -19,7 +19,7 @@ describe Gitlab::Git, lib: true do
...
@@ -19,7 +19,7 @@ describe Gitlab::Git, lib: true do
describe
'committer_hash'
do
describe
'committer_hash'
do
it
"returns a hash containing the given email and name"
do
it
"returns a hash containing the given email and name"
do
committer_hash
=
Gitlab
::
Git
::
committer_hash
(
email:
committer_email
,
name:
committer_name
)
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
committer_email
,
name:
committer_name
)
expect
(
committer_hash
[
:email
]).
to
eq
(
committer_email
)
expect
(
committer_hash
[
:email
]).
to
eq
(
committer_email
)
expect
(
committer_hash
[
:name
]).
to
eq
(
committer_name
)
expect
(
committer_hash
[
:name
]).
to
eq
(
committer_name
)
...
@@ -28,7 +28,7 @@ describe Gitlab::Git, lib: true do
...
@@ -28,7 +28,7 @@ describe Gitlab::Git, lib: true do
context
'when email is nil'
do
context
'when email is nil'
do
it
"returns nil"
do
it
"returns nil"
do
committer_hash
=
Gitlab
::
Git
::
committer_hash
(
email:
nil
,
name:
committer_name
)
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
nil
,
name:
committer_name
)
expect
(
committer_hash
).
to
be_nil
expect
(
committer_hash
).
to
be_nil
end
end
...
@@ -36,7 +36,7 @@ describe Gitlab::Git, lib: true do
...
@@ -36,7 +36,7 @@ describe Gitlab::Git, lib: true do
context
'when name is nil'
do
context
'when name is nil'
do
it
"returns nil"
do
it
"returns nil"
do
committer_hash
=
Gitlab
::
Git
::
committer_hash
(
email:
committer_email
,
name:
nil
)
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
committer_email
,
name:
nil
)
expect
(
committer_hash
).
to
be_nil
expect
(
committer_hash
).
to
be_nil
end
end
...
...
spec/lib/gitlab/import_export/avatar_saver_spec.rb
View file @
c809b104
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
ImportExport
::
AvatarSaver
,
lib:
true
do
describe
Gitlab
::
ImportExport
::
AvatarSaver
,
lib:
true
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
'test'
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
'test'
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/project_tree_saver_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:project_with_avatar
)
{
create
(
:empty_project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/dk.png"
,
"image/png"
))
}
let
(
:project_with_avatar
)
{
create
(
:empty_project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/dk.png"
,
"image/png"
))
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
...
...
spec/lib/gitlab/import_export/file_importer_spec.rb
View file @
c809b104
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
ImportExport
::
FileImporter
,
lib:
true
do
describe
Gitlab
::
ImportExport
::
FileImporter
,
lib:
true
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
'test'
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
'test'
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/file_importer_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/file_importer_spec"
}
let
(
:valid_file
)
{
"
#{
shared
.
export_path
}
/valid.json"
}
let
(
:valid_file
)
{
"
#{
shared
.
export_path
}
/valid.json"
}
let
(
:symlink_file
)
{
"
#{
shared
.
export_path
}
/invalid.json"
}
let
(
:symlink_file
)
{
"
#{
shared
.
export_path
}
/invalid.json"
}
let
(
:subfolder_symlink_file
)
{
"
#{
shared
.
export_path
}
/subfolder/invalid.json"
}
let
(
:subfolder_symlink_file
)
{
"
#{
shared
.
export_path
}
/subfolder/invalid.json"
}
...
...
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
View file @
c809b104
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
describe
'saves the project tree into a json object'
do
describe
'saves the project tree into a json object'
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:project_tree_saver
)
{
described_class
.
new
(
project:
project
,
current_user:
user
,
shared:
shared
)
}
let
(
:project_tree_saver
)
{
described_class
.
new
(
project:
project
,
current_user:
user
,
shared:
shared
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/project_tree_saver_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
setup_project
}
let
(
:project
)
{
setup_project
}
...
...
spec/lib/gitlab/import_export/repo_bundler_spec.rb
View file @
c809b104
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::RepoSaver, services: true do
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::RepoSaver, services: true do
describe
'bundle a project Git repo'
do
describe
'bundle a project Git repo'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:empty_project
,
:public
,
name:
'searchable_project'
)
}
let!
(
:project
)
{
create
(
:empty_project
,
:public
,
name:
'searchable_project'
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/project_tree_saver_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
let
(
:bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
...
...
spec/lib/gitlab/import_export/wiki_repo_bundler_spec.rb
View file @
c809b104
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::WikiRepoSaver, services: true do
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::WikiRepoSaver, services: true do
describe
'bundle a wiki Git repo'
do
describe
'bundle a wiki Git repo'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:empty_project
,
:public
,
name:
'searchable_project'
)
}
let!
(
:project
)
{
create
(
:empty_project
,
:public
,
name:
'searchable_project'
)
}
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/project_tree_saver_spec"
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:wiki_bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
let
(
:wiki_bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
let!
(
:project_wiki
)
{
ProjectWiki
.
new
(
project
,
user
)
}
let!
(
:project_wiki
)
{
ProjectWiki
.
new
(
project
,
user
)
}
...
...
spec/lib/gitlab/kubernetes_spec.rb
View file @
c809b104
...
@@ -9,7 +9,7 @@ describe Gitlab::Kubernetes do
...
@@ -9,7 +9,7 @@ describe Gitlab::Kubernetes do
let
(
:pod_name
)
{
'pod1'
}
let
(
:pod_name
)
{
'pod1'
}
let
(
:container_name
)
{
'container1'
}
let
(
:container_name
)
{
'container1'
}
subject
(
:result
)
{
URI
::
parse
(
container_exec_url
(
api_url
,
namespace
,
pod_name
,
container_name
))
}
subject
(
:result
)
{
URI
.
parse
(
container_exec_url
(
api_url
,
namespace
,
pod_name
,
container_name
))
}
it
{
expect
(
result
.
scheme
).
to
eq
(
'wss'
)
}
it
{
expect
(
result
.
scheme
).
to
eq
(
'wss'
)
}
it
{
expect
(
result
.
host
).
to
eq
(
'example.com'
)
}
it
{
expect
(
result
.
host
).
to
eq
(
'example.com'
)
}
...
...
spec/workers/git_garbage_collect_worker_spec.rb
View file @
c809b104
...
@@ -102,8 +102,8 @@ describe GitGarbageCollectWorker do
...
@@ -102,8 +102,8 @@ describe GitGarbageCollectWorker do
new_commit_sha
=
Rugged
::
Commit
.
create
(
new_commit_sha
=
Rugged
::
Commit
.
create
(
rugged
,
rugged
,
message:
"hello world
#{
SecureRandom
.
hex
(
6
)
}
"
,
message:
"hello world
#{
SecureRandom
.
hex
(
6
)
}
"
,
author:
Gitlab
::
Git
::
committer_hash
(
email:
'foo@bar'
,
name:
'baz'
),
author:
Gitlab
::
Git
.
committer_hash
(
email:
'foo@bar'
,
name:
'baz'
),
committer:
Gitlab
::
Git
::
committer_hash
(
email:
'foo@bar'
,
name:
'baz'
),
committer:
Gitlab
::
Git
.
committer_hash
(
email:
'foo@bar'
,
name:
'baz'
),
tree:
old_commit
.
tree
,
tree:
old_commit
.
tree
,
parents:
[
old_commit
],
parents:
[
old_commit
],
)
)
...
...
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