Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mahara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
mahara
mahara
Commits
2422dd9d
Commit
2422dd9d
authored
Dec 10, 2014
by
Robert Lyon
Committed by
Gerrit Code Review
Dec 10, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix error in "user" generator. Bug 1399464"
parents
3fc71a29
6005cc62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
htdocs/testing/classes/generator/TestingDataGenerator.php
htdocs/testing/classes/generator/TestingDataGenerator.php
+1
-1
test/behat/features/user/AddusersbyCSV.feature
test/behat/features/user/AddusersbyCSV.feature
+0
-1
No files found.
htdocs/testing/classes/generator/TestingDataGenerator.php
View file @
2422dd9d
...
...
@@ -127,7 +127,7 @@ EOD;
if
(
method_exists
(
$authobj
,
'is_username_valid'
)
&&
!
$authobj
->
is_username_valid
(
$record
[
'username'
]))
{
throw
new
SystemException
(
"New username'"
.
$record
[
'username'
]
.
"' is not valid."
);
}
if
(
record_exists_select
(
'usr'
,
'LOWER(username) = ?'
,
strtolower
(
$record
[
'username'
]
)))
{
if
(
record_exists_select
(
'usr'
,
'LOWER(username) = ?'
,
array
(
strtolower
(
$record
[
'username'
])
)))
{
throw
new
ErrorException
(
"The username'"
.
$record
[
'username'
]
.
"' has been taken."
);
}
if
(
method_exists
(
$authobj
,
'is_password_valid'
)
&&
!
$authobj
->
is_password_valid
(
$record
[
'password'
]))
{
...
...
test/behat/features/user/AddusersbyCSV.feature
View file @
2422dd9d
...
...
@@ -19,7 +19,6 @@ Feature: Mahara admins can add users via CSV files
And
I wait
"1"
seconds
Then
I should see
"Add users by CSV"
When
I attach the file
"users.csv"
to
"uploadcsv_file"
And
I wait
"10"
seconds
And
I uncheck
"uploadcsv_forcepasswordchange"
And
I uncheck
"uploadcsv_emailusers"
And
I press
"uploadcsv_submit"
...
...
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