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
ea4d6c87
Commit
ea4d6c87
authored
Jul 26, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Project#to_param to keep invalid project suitable for use in URLs
parent
6dfaf4fe
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
35 deletions
+26
-35
app/models/project.rb
app/models/project.rb
+5
-1
app/services/projects/update_service.rb
app/services/projects/update_service.rb
+0
-10
app/views/projects/update.js.haml
app/views/projects/update.js.haml
+1
-1
spec/features/projects/project_settings_spec.rb
spec/features/projects/project_settings_spec.rb
+2
-2
spec/models/project_spec.rb
spec/models/project_spec.rb
+18
-0
spec/services/projects/update_service_spec.rb
spec/services/projects/update_service_spec.rb
+0
-21
No files found.
app/models/project.rb
View file @
ea4d6c87
...
@@ -586,8 +586,12 @@ class Project < ActiveRecord::Base
...
@@ -586,8 +586,12 @@ class Project < ActiveRecord::Base
end
end
def
to_param
def
to_param
if
persisted?
&&
errors
.
include?
(
:path
)
path_was
else
path
path
end
end
end
def
to_reference
(
_from_project
=
nil
)
def
to_reference
(
_from_project
=
nil
)
path_with_namespace
path_with_namespace
...
...
app/services/projects/update_service.rb
View file @
ea4d6c87
...
@@ -23,17 +23,7 @@ module Projects
...
@@ -23,17 +23,7 @@ module Projects
if
project
.
previous_changes
.
include?
(
'path'
)
if
project
.
previous_changes
.
include?
(
'path'
)
project
.
rename_repo
project
.
rename_repo
end
end
else
restore_attributes
false
end
end
end
end
private
def
restore_attributes
project
.
path
=
project
.
path_was
if
project
.
errors
.
include?
(
:path
)
project
.
name
=
project
.
name_was
if
project
.
errors
.
include?
(
:name
)
end
end
end
end
end
app/views/projects/update.js.haml
View file @
ea4d6c87
-
if
@project
.
errors
.
blank
?
-
if
@project
.
valid
?
:plain
:plain
location.href = "
#{
edit_namespace_project_path
(
@project
.
namespace
,
@project
)
}
";
location.href = "
#{
edit_namespace_project_path
(
@project
.
namespace
,
@project
)
}
";
-
else
-
else
...
...
spec/features/projects/project_settings_spec.rb
View file @
ea4d6c87
...
@@ -32,8 +32,8 @@ describe 'Edit Project Settings', feature: true do
...
@@ -32,8 +32,8 @@ describe 'Edit Project Settings', feature: true do
click_button
'Rename project'
click_button
'Rename project'
expect
(
page
).
to
have_field
'Project name'
,
with:
'
sample
'
expect
(
page
).
to
have_field
'Project name'
,
with:
'
foo&bar
'
expect
(
page
).
to
have_field
'Path'
,
with:
'
gitlab
'
expect
(
page
).
to
have_field
'Path'
,
with:
'
foo&bar
'
expect
(
page
).
to
have_content
"Name can contain only letters, digits, '_', '.', dash and space. It must start with letter, digit or '_'."
expect
(
page
).
to
have_content
"Name can contain only letters, digits, '_', '.', dash and space. It must start with letter, digit or '_'."
expect
(
page
).
to
have_content
"Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'"
expect
(
page
).
to
have_content
"Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'"
end
end
...
...
spec/models/project_spec.rb
View file @
ea4d6c87
...
@@ -372,6 +372,24 @@ describe Project, models: true do
...
@@ -372,6 +372,24 @@ describe Project, models: true do
it
{
expect
(
@project
.
to_param
).
to
eq
(
'gitlabhq'
)
}
it
{
expect
(
@project
.
to_param
).
to
eq
(
'gitlabhq'
)
}
end
end
context
'with invalid path'
do
it
'returns previous path to keep project suitable for use in URLs when persisted'
do
project
=
create
(
:empty_project
,
path:
'gitlab'
)
project
.
path
=
'foo&bar'
expect
(
project
).
not_to
be_valid
expect
(
project
.
to_param
).
to
eq
'gitlab'
end
it
'returns current path when new record'
do
project
=
build
(
:empty_project
,
path:
'gitlab'
)
project
.
path
=
'foo&bar'
expect
(
project
).
not_to
be_valid
expect
(
project
.
to_param
).
to
eq
'foo&bar'
end
end
end
end
describe
'#repository'
do
describe
'#repository'
do
...
...
spec/services/projects/update_service_spec.rb
View file @
ea4d6c87
...
@@ -139,27 +139,6 @@ describe Projects::UpdateService, services: true do
...
@@ -139,27 +139,6 @@ describe Projects::UpdateService, services: true do
end
end
end
end
context
'for invalid project path/name'
do
let
(
:user
)
{
create
(
:user
,
admin:
true
)
}
let
(
:project
)
{
create
(
:empty_project
,
path:
'gitlab'
,
name:
'sample'
)
}
let
(
:params
)
{
{
path:
'foo&bar'
,
name:
'foo&bar'
}
}
it
'resets to previous values to keep project in a valid state'
do
update_project
(
project
,
user
,
params
)
expect
(
project
.
path
).
to
eq
'gitlab'
expect
(
project
.
name
).
to
eq
'sample'
end
it
'keeps error messages'
do
update_project
(
project
,
user
,
params
)
expect
(
project
.
errors
).
not_to
be_blank
expect
(
project
.
errors
[
:name
]).
to
include
(
"can contain only letters, digits, '_', '.', dash and space. It must start with letter, digit or '_'."
)
expect
(
project
.
errors
[
:path
]).
to
include
(
"can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'"
)
end
end
def
update_project
(
project
,
user
,
opts
)
def
update_project
(
project
,
user
,
opts
)
Projects
::
UpdateService
.
new
(
project
,
user
,
opts
).
execute
Projects
::
UpdateService
.
new
(
project
,
user
,
opts
).
execute
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