Merge "Fix error in "user" generator. Bug 1399464"

htdocs/testing/classes/generator/TestingDataGenerator.php

@@ -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

@@ -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"