Skip to content

GitLab

mahara
mahara
Commit b3d4158c authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files
Options

Merge changes from topic 'WR 304034' 

* changes:
  Bug 1810990: blocktypes: entireresume, resumefield, reduce code duplication         additional: external feed (small), documentation
  Bug 1810990: blocktypes: profile information and others for get_field checks     additional:         - added tabledata for all file information for table artefact_files_file         - profileicon set for user acccording to latest block (will move to create_user later)         - found bugs after testing with logging in different users, small bug fixes here and there
parents 420bec32 178775cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 882 additions and 246 deletions
htdocs/testing/frameworks/behat/classes/BehatDataGenerators.php
View file @ b3d4158c
......@@ -249,8 +249,127 @@ class BehatDataGenerators extends BehatBase {
'topic' => 'text',
),
'required' => array('group', 'message', 'user')
),
'personalinformation' => array(
'datagenerator' => 'personalinformation',
'available' => array(
'user' => 'text',
'dateofbirth' => 'text',
'placeofbirth' => 'text',
'citizenship' => 'text',
'visastatus' => 'text',
'gender' => 'text',
'maritalstatus' => 'text'
),
'required' => array('user', 'dateofbirth')
),
'goals and skills' => array(
'datagenerator' => 'goals_and_skills',
'available' => array(
'user' => 'text',
'goaltype/skilltype' => 'text',
'title' => 'text',
'description' => 'text',
),
'required' => array('user','goaltype/skilltype','title')
),
'interests' => array(
'datagenerator' => 'interests',
'available' => array(
'user' => 'text',
'interest' => 'text',
'description' => 'text'
),
'required' => array('user','interest','description')
),
'coverletters' => array(
'datagenerator' => 'coverletter',
'available' => array(
'user' => 'text',
'content' => 'text'
),
'required' => array('user','content')
),
'educationhistory' => array(
'datagenerator' => 'educationhistory',
'available' => array(
'user' => 'text',
'startdate' => 'text',
'enddate' => 'text',
'institution' => 'text',
'institutionaddress' => 'text',
'qualtype' => 'text',
'qualname' => 'text',
'qualdescription' => 'text'
),
'required' => array('user','startdate','institution')
),
'employmenthistory' => array(
'datagenerator' => 'employmenthistory',
'available' => array(
'user' => 'text',
'startdate' => 'text',
'enddate' => 'text',
'employer' => 'text',
'employeraddress' => 'text',
'jobtitle' => 'text',
'positiondescription' => 'text'
),
'required' => array ('user','startdate','employer','jobtitle')
),
'contactinformation' => array(
'datagenerator' => 'contactinformation',
'available' => array(
'user' => 'text',
'email' => 'text',
'officialwebsite' => 'text',
'personalwebsite' => 'text',
'blogaddress' => 'text',
'town' => 'text',
'city/region' => 'text',
'country' => 'text',
'homenumber' => 'text',
'businessnumber' => 'text',
'mobilenumber' => 'text',
'faxnumber' => 'text',
),
'required' => array('user','email')
),
'certifications and accreditations' => array(
'datagenerator' => 'certification',
'available' => array(
'user' => 'text',
'date' => 'text',
'title' => 'text',
'description' => 'text'
),
'required' => array('user','title')
),
'books and publications' => array(
'datagenerator' => 'book',
'available' => array(
'user' => 'text',
'date' => 'text',
'title' => 'text',
'contribution' => 'text',
'description' => 'text',
'url' => 'text'
),
'required' => array('user','date','title','contribution')
),
'professionalmemberships' => array(
'datagenerator' => 'membership',
'available' => array(
'user' => 'text',
'startdate' => 'text',
'enddate' => 'text',
'title' => 'text',
'description' => 'text'
),
'required' => array('user','startdate','title')
)
);
);
/**
* Normalise values in a given record
......@@ -262,10 +381,10 @@ class BehatDataGenerators extends BehatBase {
foreach ($record as &$value) {
$value = trim($value);
// Normalise boolean values
if (strtolower($value) == 'on' || $value == '1' || $value == 'yes' || $value == 'true') {
if (strtolower($value) == 'on' || $value == '1' || $value == 'true') {
$value = true;
}
else if (strtolower($value) == 'off' || $value == '0' || $value == 'no' || $value == 'false') {
else if (strtolower($value) == 'off' || $value == '0' || $value == 'false') {
$value = false;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment