Skip to content
GitLab
Commit 6b1f556c authored by Robert Lyon's avatar Robert Lyon Committed by Doris Tam
Browse files

Bug 1810990: behat table: clear up name changes and additional fields 

Change-Id: Idfbe13c035d1a73221000838728dc3d06fb41eb9
parent f91d852f
Hide whitespace changes
Inline Side-by-side
htdocs/testing/classes/generator/TestingDataGenerator.php
View file @ 6b1f556c
......@@ -644,7 +644,6 @@ EOD;
*/
public function create_block($record) {
global $USER;
$sql = "SELECT id FROM {view} WHERE LOWER(TRIM(title)) = ?";
$page = strtolower(trim($record['page']));
$ids = get_records_sql_array($sql, array($page));
......@@ -755,36 +754,34 @@ EOD;
* @return array configdata of key and values for db table
**/
public static function generate_configdata_filedownload($data, $ownertype, $ownerid) {
if (!$data) return;
if (!$data) return;
$fields = explode(';', $data);
$configdata = array();
$fields = explode(';', $data);
$configdata = array();
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
$key=trim($key);
$value=trim($value);
if ($key == 'attachments') {
$key = 'artefactids';
$attachments = explode(',',$value);
foreach ($attachments as $attachment) {
$path = get_mahararoot_dir() . '/test/behat/upload_files/' . $attachment;
$mimetype = mime_content_type($path);
list($media, $ext) = explode('/', $mimetype);
$mediatype = $media == 'application' ? 'attachment' : $media;
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactid = get_field('artefact', 'id', 'title', $attachment, $ownertype, $ownerid)) {
$artefactid = TestingDataGenerator::create_file_artefact($file=$attachment, $ownertype, $ownerid, $mediatype);
TestingDataGenerator::file_creation($artefactid, $attachment, $ownertype, $ownerid);
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
$key=trim($key);
$value=trim($value);
if ($key == 'attachments') {
$attachments = explode(',',$value);
foreach ($attachments as $attachment) {
$path = get_mahararoot_dir() . '/test/behat/upload_files/' . $attachment;
$mimetype = mime_content_type($path);
list($media, $ext) = explode('/', $mimetype);
$mediatype = $media == 'application' ? 'attachment' : $media;
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactid = get_field('artefact', 'id', 'title', $attachment, $ownertype, $ownerid)) {
$artefactid = TestingDataGenerator::create_file_artefact($file=$attachment, $ownertype, $ownerid, $mediatype);
TestingDataGenerator::file_creation($artefactid, $attachment, $ownertype, $ownerid);
}
$configdata['artefactids'][] = $artefactid;
}
}
$configdata['artefactids'][] = $artefactid;
}
}
}
return $configdata;
return $configdata;
}
/**
* generate config data for the blocktype folder, which dealts with creating a folder artefact_type
......@@ -795,40 +792,38 @@ EOD;
* @return array configdata of key and values for db table
**/
public static function generate_configdata_folder($data, $ownertype, $ownerid) {
if (!$data) return;
$fields = explode(';', $data);
$configdata = array();
$foldername;
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
if (!$data) return;
if ($key == 'dirname') {
$foldername = $value;
$folderartefactid = ArtefactTypeFolder::get_folder_id($foldername, $foldername, null, true, $ownerid);
$configdata['artefactid'] = $folderartefactid;
}
if ($key == 'folder_files') {
$fields = explode(';', $data);
$configdata = array();
$foldername;
$files = explode(',', $value);
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
// upload each image and put into a folder
foreach($files as $file) {
$path = get_mahararoot_dir() . '/test/behat/upload_files/' . $file;
$mimetype = mime_content_type($path);
list($media, $ext) = explode('/', $mimetype);
$mediatype = $media == 'application' ? 'attachment' : $media;
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactid = get_field('artefact', 'id', 'title', $file, 'parent', $folderartefactid)) {
$artefactid = TestingDataGenerator::create_file_artefact($file, $ownertype, $ownerid, $mediatype, $folderartefactid);
TestingDataGenerator::file_creation($artefactid, $file, $ownertype, $ownerid);
if ($key == 'dirname') {
$foldername = $value;
$folderartefactid = ArtefactTypeFolder::get_folder_id($foldername, $foldername, null, true, $ownerid);
$configdata['artefactid'] = $folderartefactid;
}
if ($key == 'attachments') {
$files = explode(',', $value);
// upload each image and put into a folder
foreach($files as $file) {
$path = get_mahararoot_dir() . '/test/behat/upload_files/' . $file;
$mimetype = mime_content_type($path);
list($media, $ext) = explode('/', $mimetype);
$mediatype = $media == 'application' ? 'attachment' : $media;
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactid = get_field('artefact', 'id', 'title', $file, 'parent', $folderartefactid)) {
$artefactid = TestingDataGenerator::create_file_artefact($file, $ownertype, $ownerid, $mediatype, $folderartefactid);
TestingDataGenerator::file_creation($artefactid, $file, $ownertype, $ownerid);
}
}
}
}
}
}
return $configdata;
return $configdata;
}
/**
......@@ -863,8 +858,25 @@ EOD;
$configdata['artefactids'][] = $artefactid;
}
}
if ($key == 'select' || $key == 'width' || $key == 'showdescription' || $key == 'style' || $key == 'photoframe' ) {
$configdata[$key] = $value;
if ($key == 'imagesel' || $key == 'width' || $key == 'showdesc' || $key == 'imagestyle' || 'photoframe' ) {
//imageselection options are 0,1,2 in the table, changed for tester -_-
if ($key == 'imagesel') {
$value -= 1;
$configdata['select'] = $value;
}
else if ($key == 'showdesc') {
$value = strtolower($value) == 'yes' ? 1:0;
$configdata['showdescription'] = $value;
}
else if ($key == 'imagestyle') {
$value -= 1;
$configdata['style'] = $value;
}
else {
$configdata[$key] = $value;
}
}
}
return $configdata;
......@@ -881,7 +893,7 @@ EOD;
list($key, $value) = explode('=', $field);
$key = trim($key);
$value = trim($value);
if ($key == 'source') {
if ($key == 'attachment') {
//retrieve/create and retrieve artefactid of artefact we are attaching to the block
if (!$artefactid = get_field('artefact', 'id', 'title', $value)) {
//we must create the file artefact as it doesn't exist in the table
......@@ -902,24 +914,31 @@ EOD;
* @return array configdata of key and values for db table
**/
public static function generate_configdata_image($data, $ownertype, $ownerid) {
if (!$data) return;
$fields = explode(';', $data);
$configdata = array();
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
if ($key == 'attachment') {
if (!$data) return;
$fields = explode(';', $data);
$configdata = array();
foreach ($fields as $field) {
list($key, $value) = explode('=', $field);
if ($key == 'attachment') {
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactimageid = get_field('artefact', 'id', 'title', $value, $ownertype, $ownerid)) {
$artefactimageid = TestingDataGenerator::create_file_artefact($file=$value, $ownertype, $ownerid, 'image');
self::file_creation($artefactimageid, $value, $ownertype, $ownerid);
}
$configdata = array('artefactid' => $artefactimageid);
}
if ($key == 'width' || $key == 'showdescription' || $key == 'style' ) {
$configdata[$key] = $value;
}
}
return $configdata;
}
// we need to find the id of the item we are trying to attach and save it as artefactid
if (!$artefactimageid = get_field('artefact', 'id', 'title', $value, $ownertype, $ownerid)) {
$artefactimageid = TestingDataGenerator::create_file_artefact($file=$value, $ownertype, $ownerid, 'image');
self::file_creation($artefactimageid, $value, $ownertype, $ownerid);
}
$configdata = array('artefactid' => $artefactimageid);
}
}
return $configdata;
public static function generate_configdata_internalmedia($data, $ownertype, $ownerid) {
if (!$data) return;
}
/**
......@@ -933,6 +952,9 @@ EOD;
if (!$data) return;
list($key, $value) = explode('=', $data);
$key = trim($key);
$value = trim($value);
if ($key == 'sns') {
//split the values for multiple social profile creation
$medialist = explode(',', $value);
......@@ -993,9 +1015,9 @@ EOD;
* set up configdata for retractable and retractable on load
*/
public function setup_retractable($setting) {
$configdata = array();
$configdata['retractable'] = $setting=='no' ? 0:1;;
$configdata['retractedonload'] = $setting=='auto'? 1:0;
$configdata = array();
$configdata['retractable'] = strtolower($setting) =='no' ? 0:1;;
$configdata['retractedonload'] = strtolower($setting) =='auto'? 1:0;
return $configdata;
}
......
test/behat/features/user_content/test.feature
View file @ 6b1f556c
......@@ -23,22 +23,22 @@ Background:
And the following "blocks" exist:
| title | type | page | row | column | order |retractable | data |
| My text 1 | text | Page UserA_00 | 1 | 1 | 1 | yes | This is some text one |
| image jpg | image | Page UserA_00 | 1 | 1 | 2 | no | attachment=Image1.jpg |
| My text 1 | text | Page UserA_00 | 1 | 1 | 1 | yes | This is some text |
| image jpg | image | Page UserA_00 | 1 | 1 | 2 | no | attachment=Image1.jpg; width=100 |
| image png | image | Page UserA_00 | 1 | 1 | 3 | no | attachment=Image2.png |
| My files 1 | filedownload | Page UserA_00 | 1 | 2 | 1 | auto | attachments=mahara_about.pdf |
| My files 2 | filedownload | Page UserA_00 | 1 | 2 | 2 | no | attachments=mahara_about.pdf,Image2.png |
| Rss news | externalfeed | Page UserA_00 | 1 | 3 | 1 | no | source=http://rss.nzherald.co.nz/rss/xml/nzhtsrsscid_000000698.xml |
| Rss news | externalfeed | Page UserA_00 | 1 | 3 | 1 | No | source=http://rss.nzherald.co.nz/rss/xml/nzhtsrsscid_000000698.xml |
| Rss food | externalfeed | Page UserA_00 | 1 | 3 | 2 | no | source=http://www.thekitchenmaid.com/feed |
| G image 3 | image | Page Grp1 | 1 | 1 | 1 | no | attachment=Image3.png |
| G files 2 | filedownload | Page Grp1 | 1 | 1 | 2 | no | attachments=mahara_about.pdf,Image2.png |
| nzslang | externalvideo| Page Grp1 | 1 | 1 | 3 | no | source=https://youtu.be/yRxFm70nOrY |
| my social | socialprofile| Page UserB_00 | 1 | 1 | 1 | no | sns=instagram,twitter,facebook,tumblr,pinterest |
| gall style1 | gallery | Page UserB_00 | 1 | 2 | 1 | no | attachments=Image1.jpg,Image3.png,Image3.png,Image2.png;select=1;showdescription=1;width=75;style=0;photoframe=1 |
| gall style2 | gallery | Page UserB_00 | 1 | 2 | 2 | no | attachments=Image3.png,Image2.png,Image1.jpg;select=1;showdescription=1;width=75;style=1 |
| gall style3 | gallery | Page UserB_00 | 1 | 2 | 3 | no | attachments=Image3.png,Image2.png,Image1.jpg;select=1;showdescription=1;style=2;photoframe=0|
| myfolder | folder | Page UserB_00 | 1 | 2 | 4 | no | dirname=myfolder;folder_files=mahara_about.pdf,Image2.png,Image1.jpg,Image3.png |
| my html | html | Page UserB_00 | 1 | 3 | 1 | yes | source=test_html.html |
| gall style1 | gallery | Page UserB_00 | 1 | 2 | 1 | no | attachments=Image1.jpg,Image3.png,Image3.png,Image2.png;imagesel=2;showdesc=yes;width=75;imagestyle=1;photoframe=1 |
| gall style2 | gallery | Page UserB_00 | 1 | 2 | 2 | yes | attachments=Image3.png,Image2.png,Image1.jpg;imagesel=2;showdesc=yes;width=75;imagestyle=2 |
| gall style3 | gallery | Page UserB_00 | 1 | 2 | 3 | yes | attachments=Image3.png,Image2.png,Image1.jpg;imagesel=2;showdesc=no;imagestyle=3;photoframe=0|
| myfolder | folder | Page UserB_00 | 1 | 2 | 4 | no | dirname=myfolder;attachments=mahara_about.pdf,Image2.png,Image1.jpg,Image3.png |
| my html | html | Page UserB_00 | 1 | 3 | 1 | yes | attachment=test_html.html |
Scenario: Create Page UserA_00 with text blocks
Given I log in as "UserA" with password "Kupuh1pa!"
......
Supports Markdown
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