Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
7ceb55fd
Commit
7ceb55fd
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
too long login should return validation error
parent
12e068f6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!901
Resolve "MINERVANET - Error Report 104"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend-js/src/main/js/gui/admin/EditUserDialog.js
+8
-0
8 additions, 0 deletions
frontend-js/src/main/js/gui/admin/EditUserDialog.js
frontend-js/src/test/js/gui/admin/EditUserDialog-test.js
+27
-16
27 additions, 16 deletions
frontend-js/src/test/js/gui/admin/EditUserDialog-test.js
with
35 additions
and
16 deletions
frontend-js/src/main/js/gui/admin/EditUserDialog.js
+
8
−
0
View file @
7ceb55fd
...
@@ -674,6 +674,10 @@ EditUserDialog.prototype.checkValidity = function () {
...
@@ -674,6 +674,10 @@ EditUserDialog.prototype.checkValidity = function () {
error
+=
"
<li>Login must not be empty</li>
"
;
error
+=
"
<li>Login must not be empty</li>
"
;
isValid
=
false
;
isValid
=
false
;
}
}
if
(
self
.
getLogin
().
length
>
255
)
{
error
+=
"
<li>Login must shorter than 256 characters</li>
"
;
isValid
=
false
;
}
if
(
isValid
)
{
if
(
isValid
)
{
return
Promise
.
resolve
(
true
);
return
Promise
.
resolve
(
true
);
}
else
{
}
else
{
...
@@ -708,6 +712,10 @@ EditUserDialog.prototype.getLogin = function () {
...
@@ -708,6 +712,10 @@ EditUserDialog.prototype.getLogin = function () {
return
$
(
"
[name='userLogin']
"
,
self
.
getElement
()).
val
();
return
$
(
"
[name='userLogin']
"
,
self
.
getElement
()).
val
();
};
};
EditUserDialog
.
prototype
.
setLogin
=
function
(
login
)
{
$
(
"
[name='userLogin']
"
,
this
.
getElement
()).
val
(
login
);
};
/**
/**
*
*
* @returns {string}
* @returns {string}
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/test/js/gui/admin/EditUserDialog-test.js
+
27
−
16
View file @
7ceb55fd
...
@@ -15,10 +15,14 @@ var chai = require('chai');
...
@@ -15,10 +15,14 @@ var chai = require('chai');
var
assert
=
chai
.
assert
;
var
assert
=
chai
.
assert
;
var
expect
=
chai
.
expect
;
var
expect
=
chai
.
expect
;
function
createEditUserDialog
(
project
,
user
)
{
/**
*
* @param {User} user
* @return {EditUserDialog}
*/
function
createEditUserDialog
(
user
)
{
return
new
EditUserDialog
({
return
new
EditUserDialog
({
element
:
testDiv
,
element
:
testDiv
,
project
:
project
,
user
:
user
,
user
:
user
,
configuration
:
helper
.
getConfiguration
(),
configuration
:
helper
.
getConfiguration
(),
serverConnector
:
ServerConnector
serverConnector
:
ServerConnector
...
@@ -33,8 +37,7 @@ describe('EditUserDialog', function () {
...
@@ -33,8 +37,7 @@ describe('EditUserDialog', function () {
var
project
;
var
project
;
var
user
=
new
User
({});
var
user
=
new
User
({});
return
ServerConnector
.
getProject
().
then
(
function
(
result
)
{
return
ServerConnector
.
getProject
().
then
(
function
(
result
)
{
project
=
result
;
dialog
=
createEditUserDialog
(
user
);
dialog
=
createEditUserDialog
(
project
,
user
);
return
dialog
.
init
();
return
dialog
.
init
();
}).
then
(
function
()
{
}).
then
(
function
()
{
assert
.
equal
(
0
,
logger
.
getWarnings
().
length
);
assert
.
equal
(
0
,
logger
.
getWarnings
().
length
);
...
@@ -48,11 +51,9 @@ describe('EditUserDialog', function () {
...
@@ -48,11 +51,9 @@ describe('EditUserDialog', function () {
describe
(
'
checkValidity
'
,
function
()
{
describe
(
'
checkValidity
'
,
function
()
{
it
(
'
empty user
'
,
function
()
{
it
(
'
empty user
'
,
function
()
{
var
dialog
;
var
dialog
;
var
project
;
var
user
=
new
User
({});
var
user
=
new
User
({});
return
ServerConnector
.
getProject
().
then
(
function
(
result
)
{
return
ServerConnector
.
getProject
().
then
(
function
(
result
)
{
project
=
result
;
dialog
=
createEditUserDialog
(
user
);
dialog
=
createEditUserDialog
(
project
,
user
);
return
dialog
.
init
();
return
dialog
.
init
();
}).
then
(
function
()
{
}).
then
(
function
()
{
return
dialog
.
checkValidity
().
then
(
function
()
{
return
dialog
.
checkValidity
().
then
(
function
()
{
...
@@ -65,16 +66,30 @@ describe('EditUserDialog', function () {
...
@@ -65,16 +66,30 @@ describe('EditUserDialog', function () {
});
});
});
});
it
(
'
too long user login
'
,
function
()
{
var
dialog
;
var
user
=
new
User
({});
dialog
=
createEditUserDialog
(
user
);
return
dialog
.
init
().
then
(
function
()
{
dialog
.
setLogin
(
"
x
"
.
repeat
(
256
));
return
dialog
.
checkValidity
().
then
(
function
()
{
assert
.
ok
(
null
);
}).
catch
(
function
(
error
)
{
assert
.
ok
(
error
instanceof
ValidationError
);
});
}).
then
(
function
()
{
dialog
.
destroy
();
});
});
it
(
'
existing user
'
,
function
()
{
it
(
'
existing user
'
,
function
()
{
var
dialog
;
var
dialog
;
var
project
;
var
user
;
var
user
;
return
ServerConnector
.
getUser
(
"
anonymous
"
).
then
(
function
(
result
)
{
return
ServerConnector
.
getUser
(
"
anonymous
"
).
then
(
function
(
result
)
{
user
=
result
;
user
=
result
;
return
ServerConnector
.
getProject
();
return
ServerConnector
.
getProject
();
}).
then
(
function
(
result
)
{
}).
then
(
function
(
result
)
{
project
=
result
;
dialog
=
createEditUserDialog
(
user
);
dialog
=
createEditUserDialog
(
project
,
user
);
return
dialog
.
init
();
return
dialog
.
init
();
}).
then
(
function
()
{
}).
then
(
function
()
{
return
dialog
.
checkValidity
();
return
dialog
.
checkValidity
();
...
@@ -90,14 +105,12 @@ describe('EditUserDialog', function () {
...
@@ -90,14 +105,12 @@ describe('EditUserDialog', function () {
it
(
'
existing user
'
,
function
()
{
it
(
'
existing user
'
,
function
()
{
helper
.
loginAsAdmin
();
helper
.
loginAsAdmin
();
var
dialog
;
var
dialog
;
var
project
;
var
user
;
var
user
;
return
ServerConnector
.
getUser
(
"
admin
"
).
then
(
function
(
result
)
{
return
ServerConnector
.
getUser
(
"
admin
"
).
then
(
function
(
result
)
{
user
=
result
;
user
=
result
;
return
ServerConnector
.
getProject
();
return
ServerConnector
.
getProject
();
}).
then
(
function
(
result
)
{
}).
then
(
function
(
result
)
{
project
=
result
;
dialog
=
createEditUserDialog
(
user
);
dialog
=
createEditUserDialog
(
project
,
user
);
return
dialog
.
init
();
return
dialog
.
init
();
}).
then
(
function
()
{
}).
then
(
function
()
{
return
dialog
.
onSaveClicked
();
return
dialog
.
onSaveClicked
();
...
@@ -111,7 +124,6 @@ describe('EditUserDialog', function () {
...
@@ -111,7 +124,6 @@ describe('EditUserDialog', function () {
it
(
'
existing user
'
,
function
()
{
it
(
'
existing user
'
,
function
()
{
helper
.
loginAsAdmin
();
helper
.
loginAsAdmin
();
var
dialog
;
var
dialog
;
var
project
;
var
user
;
var
user
;
var
serializedPrivileges
;
var
serializedPrivileges
;
return
ServerConnector
.
getUser
(
"
anonymous
"
).
then
(
function
(
result
)
{
return
ServerConnector
.
getUser
(
"
anonymous
"
).
then
(
function
(
result
)
{
...
@@ -119,8 +131,7 @@ describe('EditUserDialog', function () {
...
@@ -119,8 +131,7 @@ describe('EditUserDialog', function () {
serializedPrivileges
=
user
.
getPrivileges
().
slice
();
serializedPrivileges
=
user
.
getPrivileges
().
slice
();
return
ServerConnector
.
getProject
();
return
ServerConnector
.
getProject
();
}).
then
(
function
(
result
)
{
}).
then
(
function
(
result
)
{
project
=
result
;
dialog
=
createEditUserDialog
(
user
);
dialog
=
createEditUserDialog
(
project
,
user
);
return
dialog
.
init
();
return
dialog
.
init
();
}).
then
(
function
()
{
}).
then
(
function
()
{
var
checkbox
=
$
(
"
[name=privilege-checkbox]
"
,
dialog
.
getElement
())[
0
];
var
checkbox
=
$
(
"
[name=privilege-checkbox]
"
,
dialog
.
getElement
())[
0
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment