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
0d6b9e30
Commit
0d6b9e30
authored
Dec 22, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix import project url not updating project name
parent
e5a9b9a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
17 deletions
+27
-17
app/assets/javascripts/projects/project_new.js
app/assets/javascripts/projects/project_new.js
+4
-3
changelogs/unreleased/jivl-fix-import-project-url-bug.yml
changelogs/unreleased/jivl-fix-import-project-url-bug.yml
+5
-0
spec/javascripts/projects/project_new_spec.js
spec/javascripts/projects/project_new_spec.js
+18
-14
No files found.
app/assets/javascripts/projects/project_new.js
View file @
0d6b9e30
let
hasUserDefinedProjectPath
=
false
;
let
hasUserDefinedProjectPath
=
false
;
const
deriveProjectPathFromUrl
=
(
$projectImportUrl
,
$projectPath
)
=>
{
const
deriveProjectPathFromUrl
=
(
$projectImportUrl
)
=>
{
const
$currentProjectPath
=
$projectImportUrl
.
parents
(
'
.toggle-import-form
'
).
find
(
'
#project_path
'
);
if
(
hasUserDefinedProjectPath
)
{
if
(
hasUserDefinedProjectPath
)
{
return
;
return
;
}
}
...
@@ -21,7 +22,7 @@ const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => {
...
@@ -21,7 +22,7 @@ const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => {
// extract everything after the last slash
// extract everything after the last slash
const
pathMatch
=
/
\/([^/]
+
)
$/
.
exec
(
importUrl
);
const
pathMatch
=
/
\/([^/]
+
)
$/
.
exec
(
importUrl
);
if
(
pathMatch
)
{
if
(
pathMatch
)
{
$
p
rojectPath
.
val
(
pathMatch
[
1
]);
$
currentP
rojectPath
.
val
(
pathMatch
[
1
]);
}
}
};
};
...
@@ -96,7 +97,7 @@ const bindEvents = () => {
...
@@ -96,7 +97,7 @@ const bindEvents = () => {
hasUserDefinedProjectPath
=
$projectPath
.
val
().
trim
().
length
>
0
;
hasUserDefinedProjectPath
=
$projectPath
.
val
().
trim
().
length
>
0
;
});
});
$projectImportUrl
.
keyup
(()
=>
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
));
$projectImportUrl
.
keyup
(()
=>
deriveProjectPathFromUrl
(
$projectImportUrl
));
};
};
document
.
addEventListener
(
'
DOMContentLoaded
'
,
bindEvents
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
bindEvents
);
...
...
changelogs/unreleased/jivl-fix-import-project-url-bug.yml
0 → 100644
View file @
0d6b9e30
---
title
:
Fix import project url not updating project name
merge_request
:
16120
author
:
type
:
fixed
spec/javascripts/projects/project_new_spec.js
View file @
0d6b9e30
...
@@ -6,8 +6,12 @@ describe('New Project', () => {
...
@@ -6,8 +6,12 @@ describe('New Project', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
setFixtures
(
`
setFixtures
(
`
<input id="project_import_url" />
<div class='toggle-import-form'>
<input id="project_path" />
<div class='import-url-data'>
<input id="project_import_url" />
<input id="project_path" />
</div>
</div>
`
);
`
);
$projectImportUrl
=
$
(
'
#project_import_url
'
);
$projectImportUrl
=
$
(
'
#project_import_url
'
);
...
@@ -25,7 +29,7 @@ describe('New Project', () => {
...
@@ -25,7 +29,7 @@ describe('New Project', () => {
it
(
'
does not change project path for disabled $projectImportUrl
'
,
()
=>
{
it
(
'
does not change project path for disabled $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
attr
(
'
disabled
'
,
true
);
$projectImportUrl
.
attr
(
'
disabled
'
,
true
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
});
});
...
@@ -38,7 +42,7 @@ describe('New Project', () => {
...
@@ -38,7 +42,7 @@ describe('New Project', () => {
it
(
'
does not change project path if it is set by user
'
,
()
=>
{
it
(
'
does not change project path if it is set by user
'
,
()
=>
{
$projectPath
.
keyup
();
$projectPath
.
keyup
();
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
});
});
...
@@ -46,7 +50,7 @@ describe('New Project', () => {
...
@@ -46,7 +50,7 @@ describe('New Project', () => {
it
(
'
does not change project path for empty $projectImportUrl
'
,
()
=>
{
it
(
'
does not change project path for empty $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
''
);
$projectImportUrl
.
val
(
''
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
});
});
...
@@ -54,7 +58,7 @@ describe('New Project', () => {
...
@@ -54,7 +58,7 @@ describe('New Project', () => {
it
(
'
does not change project path for whitespace $projectImportUrl
'
,
()
=>
{
it
(
'
does not change project path for whitespace $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
'
);
$projectImportUrl
.
val
(
'
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
});
});
...
@@ -62,7 +66,7 @@ describe('New Project', () => {
...
@@ -62,7 +66,7 @@ describe('New Project', () => {
it
(
'
does not change project path for $projectImportUrl without slashes
'
,
()
=>
{
it
(
'
does not change project path for $projectImportUrl without slashes
'
,
()
=>
{
$projectImportUrl
.
val
(
'
has-no-slash
'
);
$projectImportUrl
.
val
(
'
has-no-slash
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
dummyImportUrl
);
});
});
...
@@ -70,7 +74,7 @@ describe('New Project', () => {
...
@@ -70,7 +74,7 @@ describe('New Project', () => {
it
(
'
changes project path to last $projectImportUrl component
'
,
()
=>
{
it
(
'
changes project path to last $projectImportUrl component
'
,
()
=>
{
$projectImportUrl
.
val
(
'
/this/is/last
'
);
$projectImportUrl
.
val
(
'
/this/is/last
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
last
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
last
'
);
});
});
...
@@ -78,7 +82,7 @@ describe('New Project', () => {
...
@@ -78,7 +82,7 @@ describe('New Project', () => {
it
(
'
ignores trailing slashes in $projectImportUrl
'
,
()
=>
{
it
(
'
ignores trailing slashes in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
/has/trailing/slash/
'
);
$projectImportUrl
.
val
(
'
/has/trailing/slash/
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
slash
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
slash
'
);
});
});
...
@@ -86,7 +90,7 @@ describe('New Project', () => {
...
@@ -86,7 +90,7 @@ describe('New Project', () => {
it
(
'
ignores fragment identifier in $projectImportUrl
'
,
()
=>
{
it
(
'
ignores fragment identifier in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
/this/has/a#fragment-identifier/
'
);
$projectImportUrl
.
val
(
'
/this/has/a#fragment-identifier/
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
a
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
a
'
);
});
});
...
@@ -94,7 +98,7 @@ describe('New Project', () => {
...
@@ -94,7 +98,7 @@ describe('New Project', () => {
it
(
'
ignores query string in $projectImportUrl
'
,
()
=>
{
it
(
'
ignores query string in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
/url/with?query=string
'
);
$projectImportUrl
.
val
(
'
/url/with?query=string
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
with
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
with
'
);
});
});
...
@@ -102,7 +106,7 @@ describe('New Project', () => {
...
@@ -102,7 +106,7 @@ describe('New Project', () => {
it
(
'
ignores trailing .git in $projectImportUrl
'
,
()
=>
{
it
(
'
ignores trailing .git in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
/repository.git
'
);
$projectImportUrl
.
val
(
'
/repository.git
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
repository
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
repository
'
);
});
});
...
@@ -110,7 +114,7 @@ describe('New Project', () => {
...
@@ -110,7 +114,7 @@ describe('New Project', () => {
it
(
'
changes project path for HTTPS URL in $projectImportUrl
'
,
()
=>
{
it
(
'
changes project path for HTTPS URL in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
https://username:password@gitlab.company.com/group/project.git
'
);
$projectImportUrl
.
val
(
'
https://username:password@gitlab.company.com/group/project.git
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
project
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
project
'
);
});
});
...
@@ -118,7 +122,7 @@ describe('New Project', () => {
...
@@ -118,7 +122,7 @@ describe('New Project', () => {
it
(
'
changes project path for SSH URL in $projectImportUrl
'
,
()
=>
{
it
(
'
changes project path for SSH URL in $projectImportUrl
'
,
()
=>
{
$projectImportUrl
.
val
(
'
git@gitlab.com:gitlab-org/gitlab-ce.git
'
);
$projectImportUrl
.
val
(
'
git@gitlab.com:gitlab-org/gitlab-ce.git
'
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
,
$projectPath
);
projectNew
.
deriveProjectPathFromUrl
(
$projectImportUrl
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
gitlab-ce
'
);
expect
(
$projectPath
.
val
()).
toEqual
(
'
gitlab-ce
'
);
});
});
...
...
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