Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
931e9e464f4a
Commit
7f985825
authored
Aug 30, 2018
by
James Lopez
Browse files
fix path bug and update specs
parent
46b9ec80e0d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/services/projects/transfer_service.rb
View file @
931e9e46
...
...
@@ -43,7 +43,7 @@ def transfer(project)
@new_path
=
File
.
join
(
@new_namespace
.
try
(
:full_path
)
||
''
,
project
.
path
)
@old_namespace
=
project
.
namespace
if
Project
.
where
(
namespace_id:
@new_namespace
.
try
(
:id
)).
where
(
'path = ? or name = ?'
,
project
.
path
,
project
.
path
).
exists?
if
Project
.
where
(
namespace_id:
@new_namespace
.
try
(
:id
)).
where
(
'path = ? or name = ?'
,
project
.
path
,
project
.
name
).
exists?
raise
TransferError
.
new
(
"Project with same name or path in target namespace already exists"
)
end
...
...
spec/services/projects/transfer_service_spec.rb
View file @
931e9e46
...
...
@@ -172,8 +172,9 @@ def current_path
context
'target namespace containing the same project name'
do
before
do
group
.
add_owner
(
user
)
project
.
update
(
name:
'new_name'
)
create
(
:project
,
name:
project
.
name
,
group:
group
,
path:
'other'
)
create
(
:project
,
name:
'new_
name
'
,
group:
group
,
path:
'other'
)
@result
=
transfer_project
(
project
,
user
,
group
)
end
...
...
@@ -187,7 +188,7 @@ def current_path
before
do
group
.
add_owner
(
user
)
create
(
:project
,
name:
project
.
name
,
group:
group
)
create
(
:project
,
name:
'other-name'
,
path:
project
.
path
,
group:
group
)
@result
=
transfer_project
(
project
,
user
,
group
)
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