diff --git a/.gitignore b/.gitignore index 978054f75..269134a25 100644 --- a/.gitignore +++ b/.gitignore @@ -11,15 +11,13 @@ documents/ .buildpath application/config/development/ tests/codeception/_output/* -tests/codeception/tests/_output/* +!/tests/codeception/_output/.placeholder tests/codeception/codeception.yml tests/codeception/tests/api.suite.yml tests/codeception/tests/functional.suite.yml tests/codeception/tests/acceptance.suite.yml -!/tests/codeception/_output/.placeholder /submodules/d3 composer.lock bin -/tests/codeception/api.suite.yml /application/logs/ /sparks/* \ No newline at end of file diff --git a/application/controllers/api/v1/system/PCRM.php b/application/controllers/api/v1/system/PCRM.php new file mode 100644 index 000000000..fda65796d --- /dev/null +++ b/application/controllers/api/v1/system/PCRM.php @@ -0,0 +1,77 @@ +load->library("PCRMLib"); + } + + /** + * Manages a HTTP get call + */ + public function getCall() + { + // Start me up! + $result = $this->pcrmlib->start($this->get(), PermissionLib::SELECT_RIGHT); + + // Print the result + $this->response($result, REST_Controller::HTTP_OK); + } + + /** + * @return void + */ + public function postCall() + { + // Start me up! + $result = $this->pcrmlib->start($this->post(), PermissionLib::UPDATE_RIGHT); + + // Print the result + $this->response($result, REST_Controller::HTTP_OK); + } + + /** + * @return void + */ + public function putCall() + { + // Start me up! + $result = $this->pcrmlib->start($this->put(), PermissionLib::INSERT_RIGHT); + + // Print the result + $this->response($result, REST_Controller::HTTP_OK); + } + + /** + * @return void + */ + public function deleteCall() + { + // Start me up! + $result = $this->pcrmlib->start($this->delete(), PermissionLib::DELETE_RIGHT); + + // Print the result + $this->response($result, REST_Controller::HTTP_OK); + } +} \ No newline at end of file diff --git a/application/controllers/api/v1/system/Phrase.php b/application/controllers/api/v1/system/Phrase.php index 7821d42f4..31decf540 100644 --- a/application/controllers/api/v1/system/Phrase.php +++ b/application/controllers/api/v1/system/Phrase.php @@ -54,10 +54,11 @@ class Phrase extends APIv1_Controller $phrase = $this->get('phrase'); $orgeinheit_kurzbz = $this->get('orgeinheit_kurzbz'); $orgform_kurzbz = $this->get('orgform_kurzbz'); + $blockTags = $this->get('blockTags'); if (isset($app) && isset($sprache)) { - $result = $this->phraseslib->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz); + $result = $this->phraseslib->getPhrases($app, $sprache, $phrase, $orgeinheit_kurzbz, $orgform_kurzbz, $blockTags); $this->response($result, REST_Controller::HTTP_OK); } diff --git a/application/helpers/fhcdb_helper.php b/application/helpers/fhcdb_helper.php index fd170c462..6316dc674 100644 --- a/application/helpers/fhcdb_helper.php +++ b/application/helpers/fhcdb_helper.php @@ -36,6 +36,14 @@ class basis_db public function __construct($ci) { $this->ci=$ci; + + if (!defined('FHC_INTEGER')) + { + define('FHC_INTEGER',1); + define('FHC_STRING',2); + define('FHC_BOOLEAN',3); + define('FHC_LANG_ARRAY',4); + } } public function db_connect() diff --git a/application/libraries/PCRMLib.php b/application/libraries/PCRMLib.php new file mode 100644 index 000000000..cd5421b5b --- /dev/null +++ b/application/libraries/PCRMLib.php @@ -0,0 +1,396 @@ +ci =& get_instance(); + + // Loads helper message to manage returning messages + $this->ci->load->helper("message"); + + $this->ci->load->library("PermissionLib"); + } + + /** + * Everything starts here... + */ + public function start($callParameters, $permissionType) + { + $result = null; + $parameters = $this->_getParameters($callParameters); + $validation = $this->_validateCall($parameters); + + // If the validation was passed + if ($validation->error == EXIT_SUCCESS) + { + $loaded = null; + // If the given resource is a model + if (strpos($parameters->resourceName, PCRMLib::MODEL_PREFIX) !== false) + { + // Try to load the model + $result = $this->_loadModel($parameters->resourcePath, $parameters->resourceName); + if ($result->error == EXIT_SUCCESS) + { + $loaded = $result->retval; + } + } + // If the given resource is a library + else if (strpos($parameters->resourceName, PCRMLib::LIB_PREFIX) !== false) + { + // Check if the resource is already loaded, it works only with libraries and drivers + $isLoaded = $this->ci->load->is_loaded($parameters->resourceName); + // If not loaded then load it + if ($isLoaded === false) + { + // Checks if the operation is permitted by the API caller + // Only for libraries, permissions are automatically handled by models + $result = $this->checkLibraryPermission( + $parameters->resourcePath, + $parameters->resourceName, + $parameters->function, + $permissionType + ); + if ($result->error == EXIT_ERROR) + { + $loaded = null; + } + else + { + // Try to load the library + $result = $this->_loadLibrary($parameters->resourcePath, $parameters->resourceName); + if ($result->error == EXIT_SUCCESS) + { + $loaded = $result->retval; + } + } + } + // If it is already loaded $isLoaded contains the instance of the library + else + { + $loaded = $isLoaded; + } + } + // Wrong selection! + else + { + $result = $this->_error("Neither a lib nor model: " . $parameters->resourcePath . $parameters->resourceName); + } + + // If the resource was found and loaded + if (!is_null($loaded)) + { + $result = $this->_callThis($parameters->resourceName, $parameters->function, $parameters->parameters); + } + else + { + // Resource not loaded + } + } + else + { + $result = $validation; + } + + return $result; + } + + /** + * Gets the parameters from the call + */ + private function _getParameters($parametersArray) + { + $parameters = new stdClass(); + $parameters->parameters = array(); + $count = 0; + + foreach ($parametersArray as $parameterName => $parameterValue) + { + // The name of the resource, path included + if ($parameterName == PCRMLib::RESOURCE_PARAMETER) + { + // Separates the resource path from the resource name + $splittedResource = preg_split(PCRMLib::REG_SPLIT_EXPR, $parameterValue); + $parameters->resourceName = $splittedResource[count($splittedResource) - 1]; + $parameters->resourcePath = str_replace($parameters->resourceName, "", $parameterValue); + } + // The name of the function + else if ($parameterName == PCRMLib::FUNCTION_PARAMETER) + { + $parameters->function = $parameterValue; + } + // It is assumed that all other parameters are the parameters to be passed to the function + // They will be passed to the function in the same order in which they are passed to + // this controller + else + { + $parameters->parameters[$count++] = $parameterValue; + } + } + + return $parameters; + } + + /** + * Validate the given parameters + */ + private function _validateCall($parameters) + { + if (!is_object($parameters)) + { + return $this->_error("Parameter is not an object"); + } + if (!isset($parameters->resourcePath)) + { + return $this->_error("Resource path is not specified"); + } + if (!isset($parameters->resourceName)) + { + return $this->_error("Resource name is not specified"); + } + if (!isset($parameters->function)) + { + return $this->_error("Function is not specified"); + } + if (!is_array($parameters->parameters)) + { + return $this->_error("Parameters are not specified"); + } + if (in_array($parameters->resourceName, PCRMLib::$RESOURCES_BLACK_LIST)) + { + return $this->_error("You are trying to access to unauthorized resources"); + } + + return $this->_success("Input data are valid"); + } + + /** + * Loads a model using the given path and name + * + * NOTE: the models automatically handle the permissions + */ + private function _loadModel($resourcePath, $resourceName) + { + $loaded = null; + $result = null; + + try + { + $loaded = $this->ci->load->model($resourcePath . $resourceName); + } + catch (Exception $e) + { + // Errors while loading the model + $result = $this->_error("Errors while loading the model: " . $e->getMessage()); + } + + if (!is_null($loaded)) + { + $result = $this->_success($loaded); + } + + return $result; + } + + private function checkLibraryPermission($resourcePath, $resourceName, $function, $permissionType) + { + $result = null; + $permissionPath = ""; + + if ($resourcePath != "") + { + $permissionPath = $resourcePath; + } + + $permissionPath .= $resourceName . "." . $function; + + if ($this->ci->permissionlib->hasPermission($permissionPath, $permissionType) === false) + { + $result = $this->_error(lang("fhc_".FHC_NORIGHT)." -> ".$permissionPath, FHC_NORIGHT); + } + else + { + $result = $this->_success("Has permission"); + } + + return $result; + } + + /** + * Loads a library using the given path and name + * + * The method "library" of the class CI_Loader provided by CI has some limitations, + * so to be able to check errors was used a workaround. + * It consists in: + * - Checking if the file (identified by parameters $resourcePath and $resourceName) exists + * - If exists it will be loaded using the method "file" from CI_Loader + * - Checks if the loaded file contains a class identified by parameter $resourceName + * + * If one of the previous tests fails, it will be returned a null value + */ + private function _loadLibrary($resourcePath, $resourceName) + { + $loaded = null; + + try + { + // Gets all the configured resources paths + $packagePaths = $this->ci->load->get_package_paths(); + // Looking for a file in every paths with the same name of the resource + $found = null; + for ($i = 0; $i < count($packagePaths) && is_null($found); $i++) + { + $file = $packagePaths[$i] . PCRMLib::LIBS_PATH . DIRECTORY_SEPARATOR . + $resourcePath . $resourceName . PCRMLib::LIB_FILE_EXTENSION; + if (file_exists($file)) + { + $found = $file; + } + } + + // If the file was found + if (!is_null($found)) + { + // Load the file + $loaded = $this->ci->load->file($found); + // If the resource is not present inside the file + if (!class_exists($resourceName)) + { + $loaded = null; + // Same phrase error as load->model() provided by CI + $result = $this->_error($found . " exists, but doesn't declare class " . $resourceName); + } + } + else + { + $loaded = null; + // Same phrase error as load->model() provided by CI + $result = $this->_error("Unable to load the requested class: " . $resourceName); + } + } + catch (Exception $e) + { + // Errors while loading the library + $result = $this->_error("Errors while loading the library: " . $e->getMessage()); + } + + if (!is_null($loaded)) + { + $result = $this->_success($loaded); + } + + return $result; + } + + /** + * Calls a method of a class with the given parameters and returns its result + * + * @param string $resourceName identifies the class name + * @param string $function identifies the method name + * @param array $parameters contains the parameters to be passed to the method + */ + private function _callThis($resourceName, $function, $parameters) + { + $result = null; + + try + { + // Get informations about the function + $reflectionMethod = new ReflectionMethod($resourceName, $function); + // If the number of given parameters is greater or equal to the number of + // parameters required by the function + if (count($parameters) >= $reflectionMethod->getNumberOfRequiredParameters()) + { + // If the function is static + if ($reflectionMethod->isStatic() === true) + { + $classMethod = $resourceName . "::" . $function; + } + // If the function is not static + else + { + $classMethod = array(new $resourceName(), $function); + } + + // If the resource's function is callable + if (is_callable($classMethod)) + { + + // Call resource->function() + // @ was applied to prevent really ugly and unmanageable errors + $resultCall = @call_user_func_array($classMethod, $parameters); + // If errors occurred while running it + // NOTE: if the called function via call_user_func_array returns a boolean set as false, + // it will be recognized like a running error. A little bit tricky ;) + if ($resultCall === false) + { + $result = $this->_error("Error running " . $resourceName . "->" . $function . "()"); + } + // Returns the result of resource->function() + else + { + $result = $this->_success($resultCall); + } + } + else + { + $result = $this->_error($resourceName . "->" . $function . "() is not callable!"); + } + } + else + { + $result = $this->_error( + "Number of required parameters: " . $reflectionMethod->getNumberOfRequiredParameters() . + ". Given: " . count($parameters) + ); + } + } + catch (Exception $e) + { + $result = $this->_error($e->getMessage()); + } + + return $result; + } + + /* + * + */ + private function _error($retval = '', $message = EXIT_ERROR) + { + return error($retval, $message); + } + + /* + * + */ + private function _success($retval, $message = EXIT_SUCCESS) + { + return success($retval, $message); + } +} \ No newline at end of file diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php index de9b43844..880568d0c 100644 --- a/application/libraries/PermissionLib.php +++ b/application/libraries/PermissionLib.php @@ -34,32 +34,54 @@ require_once(FCPATH.'include/benutzerberechtigung.class.php'); class PermissionLib { + const SELECT_RIGHT = "s"; + const UPDATE_RIGHT = "u"; + const INSERT_RIGHT = "i"; + const DELETE_RIGHT = "d"; + public $bb; /** - * Auth Username, Password over FH-Complete - * - * @param string $username - * @param string $password - * @return bool + * */ function __construct() { - $this->CI =& get_instance(); - $this->CI->load->helper('fhcauth'); + // Loads CI instance + $this->ci =& get_instance(); + + // Loads the library to manage the rights system + $this->ci->load->library("FHC_DB_ACL"); + + // Loads the array of resources + $this->ci->fhc_db_acl->acl = $this->ci->config->item('fhc_acl'); } + /** + * @return bool true if a user has the right to access to the specified + * resource with a specified permission type, false otherwise + */ + public function hasPermission($sourceName, $permissionType) + { + // If the resource exists + if (isset($this->ci->fhc_db_acl->acl[$sourceName])) + { + // Checks permission + return $this->ci->fhc_db_acl->isBerechtigt($this->ci->fhc_db_acl->acl[$sourceName], $permissionType); + } + // if the resource does not exist, do not lose useful clock cycles + else + { + return false; + } + } + function isBerechtigt($berechtigung_kurzbz, $art = null, $oe_kurzbz = null, $kostenstelle_id = null) { $this->bb->getBerechtigungen(getAuthUID()); return $this->bb->isBerechtigt($berechtigung_kurzbz, $oe_kurzbz, $art, $kostenstelle_id); } - - function getPermissions($uid) - { - } - function isEntitled($berechtigung_kurzbz, $oe_kurzbz=null, $art=null, $kostenstelle_id=null) - { - } + function getPermissions($uid) {} + + function isEntitled($berechtigung_kurzbz, $oe_kurzbz=null, $art=null, $kostenstelle_id=null) {} } \ No newline at end of file diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 5a1ca48f8..d4fa939e6 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -111,7 +111,7 @@ class PhrasesLib * * @return struct */ - function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null) + function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null) { if (isset($app) && isset($sprache)) { @@ -123,7 +123,19 @@ class PhrasesLib for ($i = 0; $i < count($result->retval); $i++) { - $result->retval[$i]->text = $parser->textileThis($result->retval[$i]->text); + // If no

tags required + if ($blockTags == "no") + { + // Removes tags

and

from the beginning and from the end of the string + $tmpText = $parser->textileThis($result->retval[$i]->text); + $tmpText = substr($tmpText, 3, strlen($tmpText)); + $tmpText = substr($tmpText, 0, strlen($tmpText) - 4); + $result->retval[$i]->text = $tmpText; + } + else + { + $result->retval[$i]->text = $parser->textileThis($result->retval[$i]->text); + } } } } diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php index 344f922fa..d1bd334c6 100644 --- a/application/libraries/REST_Controller.php +++ b/application/libraries/REST_Controller.php @@ -967,8 +967,7 @@ abstract class REST_Controller extends CI_Controller { $this->rest->level = NULL; $this->rest->user_id = NULL; $this->rest->ignore_limits = FALSE; -//var_dump($this->_args); -//var_dump($this->input->server($key_name)); + // Find the key from server or arguments if (($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name))) { diff --git a/composer.json b/composer.json index 3b1f37eb5..d8469d498 100755 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "json-forms": "1.4.0", "wikimedia/composer-merge-plugin": "^1.3", "fzaninotto/faker": "1.*", - "netcarver/textile": "3.5.*" + "netcarver/textile": "^3.5" }, "require-dev": { diff --git a/content/dokumentenakt.pdf.php b/content/dokumentenakt.pdf.php index de6401bdf..b34bcd38b 100755 --- a/content/dokumentenakt.pdf.php +++ b/content/dokumentenakt.pdf.php @@ -31,6 +31,8 @@ $p=new phrasen($sprache); $db = new basis_db(); +$errors = array(); + $user = get_uid(); if(!isset($_GET["prestudent_ids"]) || !isset($_GET["vorlage_kurzbz"])) @@ -38,10 +40,10 @@ if(!isset($_GET["prestudent_ids"]) || !isset($_GET["vorlage_kurzbz"])) $prestudent_ids = explode(";", $_GET["prestudent_ids"]); -if(count($prestudent_ids) < 1) +if(empty($prestudent_ids)) die($p->t('anwesenheitsliste/fehlerhafteParameteruebergabe')); - +( isset($_GET["force"]) ? $force = true : $force = false); /* * Temporaeren Ordner fuer die erstellung der Dokumente generieren @@ -64,121 +66,224 @@ $docExp = new dokument_export(); $allDocs = array(); foreach($prestudent_ids as $pid) { + $preErrors = array(); $prestudent = new prestudent(); + $dokumente = array(); if(!$prestudent->load($pid)) - cleanUpAndDie($p->t('tools/studentWurdeNichtGefunden')."(".$pid.")", $tmpDir); - - - - /* - * Get all Documents - */ - $query= ' - SELECT - titel, dms_id, inhalt - FROM - public.tbl_dokumentstudiengang - JOIN public.tbl_prestudent USING(studiengang_kz) - JOIN public.tbl_akte USING(person_id,dokument_kurzbz) - WHERE - onlinebewerbung - AND prestudent_id='.$db->db_add_param($pid, FHC_INTEGER).'; - '; - - $preDocs = array(); - $result = $db->db_query($query); - while($row = $db->db_fetch_object($result)) { - $filename = ""; - if($row->inhalt != null) - { - $filename = $tmpDir . "/".uniqid(); - $fileData = base64_decode($row->inhalt); - file_put_contents($filename, $fileData); - } - else if($row->dms_id != null) - { - $dms = new dms(); - $dms->load($row->dms_id); - - $filename = DMS_PATH . $dms->filename; - } - - - if($filename == "") - continue; - - - /* - * Determine the filetype - * and convert, if nessecary - */ - $explodedTitle = explode(".", $row->titel); - $type = $explodedTitle[count($explodedTitle)-1]; - if($type == "jpg" || $type = "jpeg") - { - $fullFilename = $tmpDir . "/".uniqid() . ".pdf"; - if(!$pdf->jpegToPdf($filename, $fullFilename)) - cleanUpAndDie($pdf->errormsg, $tmpDir); - } - else if($type == "odt" || $type == "doc" || $type == "docx") - { - $fullFilename = $tmpDir . "/".uniqid() . ".pdf"; - $docExp->convert($filename, $fullFilename, "pdf"); - } - else if($type == "pdf") - { - $fullFilename = $row->titel; - } - - // only filled, if the file is supported - if($fullFilename != "") - { - $preDocs[] = $fullFilename; - } + $preErrors[] = $p->t('tools/studentWurdeNichtGefunden')."(".$pid.")"; } - /* - * Deckblatt - */ - $filename = $tmpDir . "/".uniqid(); - $doc = new dokument_export($_GET["vorlage_kurzbz"]); - $doc->addDataArray(array('vorname' => $prestudent->vorname, 'nachname' => $prestudent->nachname),"bewerberakt"); + if(empty($preErrors)) + { + /* + * Get all Documents + */ + $query= ' + SELECT + titel, dms_id, inhalt, mimetype, dokument_kurzbz, tbl_dokument.bezeichnung, sort + FROM + public.tbl_vorlagedokument + JOIN public.tbl_vorlagestudiengang USING(vorlagestudiengang_id) + JOIN public.tbl_dokument USING(dokument_kurzbz) + JOIN public.tbl_prestudent USING(studiengang_kz) + JOIN public.tbl_akte USING(person_id,dokument_kurzbz) + WHERE + prestudent_id='.$db->db_add_param($pid, FHC_INTEGER).' + ORDER BY sort asc; + '; - if(!$doc->create('pdf')) - die($doc->errormsg); + $preDocs = array(); + $result = $db->db_query($query); + while($row = $db->db_fetch_object($result)) + { + $convertSuccess = true; + $filename = ""; + if($row->inhalt != null) + { + $filename = $tmpDir . "/".uniqid(); + $fileData = base64_decode($row->inhalt); + file_put_contents($filename, $fileData); + } + else if($row->dms_id != null) + { + $dms = new dms(); + $dms->load($row->dms_id); - $document = $doc->output(false); - $filename = $tmpDir.'/'.uniqid(); - file_put_contents($filename, $document); - $doc->close(); - $allDocs[] = $filename; - $allDocs = array_merge($allDocs, $preDocs); + $filename = DMS_PATH . $dms->filename; + + if(!file_exists($filename)) + { + $preErrors[] = "'" . $filename . "': Datei nicht gefunden"; + } + } + + // this should never happen + if($filename == "") + $preErrors[] = "'" . $row->titel . "': Diese Datei hat keinen Inhalt und keine dms_id"; + + if(empty($preErrors)) + { + /* + * Determine the filetype + * and convert if nessecary + */ + $fullFilename = ""; + $explodedTitle = explode(".", $row->titel); + $type = $explodedTitle[count($explodedTitle)-1]; + + if( + $type == "jpg" + || $type == "jpeg" + || $row->mimetype == "image/jpeg" + || $row->mimetype == "image/jpg" + || $row->mimetype == "image/pjpeg" + ) + { + $fullFilename = $tmpDir . "/".uniqid() . ".pdf"; + if(!$pdf->jpegToPdf($filename, $fullFilename)) + cleanUpAndDie($pdf->errormsg, $tmpDir); + } + else if + ( + $type == "odt" + || $type == "doc" + || $type == "docx" + || $row->mimetype == "application/vnd.oasis.opendocument.spreadsheet" + || $row->mimetype == "application/msword" + || $row->mimetype == "application/vnd.openxmlformats-officedocument.wordprocessingml.document" + || $row->mimetype == "application/haansoftdocx" + || $row->mimetype == "application/vnd.ms-word" + || $row->mimetype == "application/vnd.oasis.opendocument.text" + ) + { + $fullFilename = $tmpDir . "/".uniqid() . ".pdf"; + + if(!$docExp->convert($filename, $fullFilename, "pdf")) + { + $convertSuccess = false; + $preErrors[] ="'$row->titel': Konvertierung fehlgeschlagen(".$row->mimetype.")"; + } + } + else if( + $type == "pdf" + || $row->mimetype == "application/pdf" + ) + { + $fullFilename = $filename; + } + + // only filled, if the file is supported + if($fullFilename != "") + { + if(file_exists($fullFilename)) + { + $preDocs[] = $fullFilename; + if(isset($row->bezeichnung) && $row->bezeichnung && $row->bezeichnung != "") + $dokumente[] = array("name" => $row->bezeichnung); + else + $dokumente[] = array("name" => $row->dokument_kurzbz); + } + else + { + $addString = ""; + if($row->dms_id) + $addString = "(DMS)"; + else + $addString = "(DB)"; + if($convertSuccess) + $preErrors[] = '"' . $row->titel . '":' . $addString . ' Dokument nicht gefunden'; + } + } + else + $preErrors[] ="'$row->titel' hat einen nicht unterstützten mimetype: $row->mimetype"; + } + } + + /* + * Deckblatt + */ + $filename = $tmpDir . "/".uniqid(); + $doc = new dokument_export($_GET["vorlage_kurzbz"]); + $doc->addDataArray(array('vorname' => $prestudent->vorname, 'nachname' => $prestudent->nachname, array('dokumente'=> $dokumente)),"dokumentenakt"); + + if(!$doc->create('pdf')) + die($doc->errormsg); + + $filename = $tmpDir.'/'.uniqid(); + file_put_contents($filename, $doc->output(false)); + $doc->close(); + $allDocs[] = $filename; + $allDocs = array_merge($allDocs, $preDocs); + unset($doc); + } + + if(!empty($preErrors)) + { + $errors[$pid] = $preErrors; + } } /* * generate the merged PDF */ -$finishedPdf = $tmpDir . "/Dokumentenakt.pdf"; -if(!$pdf->merge($allDocs, $finishedPdf)) - cleanUpAndDie($pdf->errormsg, $tmpDir); -$fsize = filesize($finishedPdf); - -if(!$handle = fopen($finishedPdf,'r')) - die('load failed'); - -header('Content-type: application/pdf'); -header('Content-Disposition: attachment; filename="'.$finishedPdf); -header('Content-Length: '.$fsize); - -while (!feof($handle)) +if(count($errors) == 0 || $force) { - echo fread($handle, 8192); + $finishedPdf = $tmpDir . "/Dokumentenakt.pdf"; + if(!$pdf->merge($allDocs, $finishedPdf)) + cleanUpAndDie($pdf->errormsg, $tmpDir); + $fsize = filesize($finishedPdf); + + if(!$handle = fopen($finishedPdf,'r')) + die('load failed'); + + header('Content-type: application/pdf'); + header('Content-Disposition: attachment; filename="'.$finishedPdf); + header('Content-Length: '.$fsize); + + while (!feof($handle)) + { + echo fread($handle, 8192); + } + fclose($handle); } -fclose($handle); - +else +{ +?> + + + + + +Es sind folgende Fehler aufgetreten:"; + foreach($errors as $pid => $pre) + { + $ps = new prestudent(); + if(!$ps->load($pid)) + echo "

$pid

"; + else + echo "

$ps->vorname $ps->nachname

"; + echo ""; + } + echo "

Fehlerhafte Dokumente können übersprungen werden:

"; + echo "
"; + echo ''; + echo ''; + echo ''; + echo "
"; + ?> + + + transformToXml($this->xml_data); - $this->temp_folder = '/tmp/fhcunoconv-'.uniqid(); + $this->temp_folder = sys_get_temp_dir().'/fhcunoconv-'.uniqid(); mkdir($this->temp_folder); chdir($this->temp_folder); file_put_contents('content.xml', $contentbuffer); @@ -201,7 +202,8 @@ class dokument_export if(!$vorlage_found) $zipfile = DOC_ROOT.'system/vorlage_zip/'.$this->vorlage_file; - $tempname_zip = 'out.zip'; + $tempname_zip = $this->temp_folder . '/out.zip'; + if(!copy($zipfile, $tempname_zip)) die('copy failed'); @@ -254,7 +256,7 @@ class dokument_export switch($this->outputformat) { case 'pdf': - $this->temp_filename='out.pdf'; + $this->temp_filename = $this->temp_folder . '/out.pdf'; exec("unoconv -e IsSkipEmptyPages=false --stdout -f pdf $tempname_zip > ".$this->temp_filename, $out, $ret); if($ret!=0) @@ -408,7 +410,6 @@ class dokument_export $command = 'unoconv --format %s --output %s %s'; $command = sprintf($command, $format, $outFile, $inFile); - exec($command, $out, $ret); if($ret!=0) { diff --git a/include/studiensemester.class.php b/include/studiensemester.class.php index 13e199655..88770080c 100644 --- a/include/studiensemester.class.php +++ b/include/studiensemester.class.php @@ -40,6 +40,7 @@ class studiensemester extends Studiensemester_model public $bezeichnung; // varchar(32) public $studienjahr_kurzbz; // varchar(16) public $beschreibung; // varchar(16) + public $onlinebewerbung; // boolean /** * Konstruktor - Laedt optional ein StSem @@ -81,6 +82,7 @@ class studiensemester extends Studiensemester_model $this->bezeichnung = $row->bezeichnung; $this->studienjahr_kurzbz = $row->studienjahr_kurzbz; $this->beschreibung = $row->beschreibung; + $this->onlinebewerbung = $row->onlinebewerbung; return true; } @@ -138,16 +140,24 @@ class studiensemester extends Studiensemester_model if($this->new) { - $qry = "INSERT INTO public.tbl_studiensemester (studiensemester_kurzbz, start, ende) + $qry = "INSERT INTO public.tbl_studiensemester (studiensemester_kurzbz, start, ende, bezeichnung, studienjahr_kurzbz, beschreibung, onlinebewerbung) VALUES(".$this->db_add_param($this->studiensemester_kurzbz).",". $this->db_add_param($this->start).','. - $this->db_add_param($this->ende).');'; + $this->db_add_param($this->ende).','. + $this->db_add_param($this->bezeichnung).','. + $this->db_add_param($this->studienjahr_kurzbz).','. + $this->db_add_param($this->beschreibung).','. + $this->db_add_param($this->onlinebewerbung, FHC_BOOLEAN).');'; } else { $qry = 'UPDATE public.tbl_studiensemester SET'. ' start='.$this->db_add_param($this->start).','. - ' ende='.$this->db_add_param($this->ende). + ' ende='.$this->db_add_param($this->ende).','. + ' bezeichnung='.$this->db_add_param($this->bezeichnung).','. + ' studienjahr_kurzbz='.$this->db_add_param($this->studienjahr_kurzbz).','. + ' beschreibung='.$this->db_add_param($this->beschreibung).','. + ' onlinebewerbung='.$this->db_add_param($this->onlinebewerbung, FHC_BOOLEAN). " WHERE studiensemester_kurzbz=".$this->db_add_param($this->studiensemester_kurzbz); } @@ -340,6 +350,7 @@ class studiensemester extends Studiensemester_model $stsem_obj->bezeichnung = $row->bezeichnung; $stsem_obj->studienjahr_kurzbz = $row->studienjahr_kurzbz; $stsem_obj->beschreibung = $row->beschreibung; + $stsem_obj->onlinebewerbung = $row->onlinebewerbung; $this->studiensemester[] = $stsem_obj; } diff --git a/phpci.yml b/phpci.yml index 85b626606..7164a4c48 100644 --- a/phpci.yml +++ b/phpci.yml @@ -8,10 +8,11 @@ build_settings: host: 'localhost;dbname=template1' user: 'fhcomplete' pass: 'fhcomplete' + setup: composer: # directory: "" -# action: "install" + action: "install" prefer_dist: true no_dev: true pgsql: @@ -31,7 +32,10 @@ test: directories: - "application/" recursive: true - php_loc: + codeception: + config: "tests/codeception/" + path: "tests/codeception/_output/" +# php_loc: # php_docblock_checker: # path: "application/controllers/" # allowed_warnings: 100 @@ -41,13 +45,17 @@ test: # standard: "tests/codesniffer/FHComplete" # allowed_errors: 200 # allowed_warnings: 200 - codeception: - config: "tests/codeception/" - path: "tests/codeception/_output/" # php_unit: # directory: "tests/phpunit/" complete: + clean_build: + remove: + - index.php + - config/global.config.inc.php + - config/cis.config.inc.php + - config/vilesci.config.inc.php + - config/system.config.inc.php # xmpp: # username: "fhcomplete" # password: "fhcomplete1q2w3blah.im" @@ -60,17 +68,9 @@ complete: # tls: 1 # alias: "jabber.blah.im" # date_format: "%d.%m.%Y" - clean_build: - remove: - - index.php - - config/global.config.inc.php - - config/cis.config.inc.php - - config/vilesci.config.inc.php - - config/system.config.inc.php success: # shell: # - "cd %BUILD_PATH% && chmod u+x copyBuild.sh && ./copyBuild.sh" # Copy Build # - "curl 'http://localhost/backend/Migrate/'" # DB-Installation -# - "cd /var/www/html/ && sudo -u wsp doxygen Doxyfile" # Doxygen - +# - "cd /var/www/html/ && sudo -u wsp doxygen Doxyfile" # Doxygen \ No newline at end of file diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php index 2ab852b18..13f2d00a4 100755 --- a/system/dbupdate_3.2.php +++ b/system/dbupdate_3.2.php @@ -30,7 +30,7 @@ ALTER TABLE lehre.tbl_studienplan ALTER COLUMN aktiv SET DEFAULT true;"; if(!$db->db_query($qry)) echo 'public.tbl_studiengang: '.$db->db_last_error().'
'; else - echo 'Defaultwerte für tbl_studiengang und tbl_studienplan gesetzt.'; + echo 'Defaultwerte für tbl_studiengang und tbl_studienplan gesetzt.
'; //Spalte studiensemester_kurzbz für Reihungstest @@ -1310,7 +1310,10 @@ if($result = $db->db_query("SELECT * FROM public.tbl_vorlage WHERE vorlage_kurzb $qry = "INSERT INTO public.tbl_vorlage(vorlage_kurzbz, bezeichnung, anmerkung,mimetype) VALUES('Bewerberakt','Bewerberakt Deckblatt', 'wird als Deckblatt fuer den Bewerberakt verwendet', 'application/vnd.oasis.opendocument.text');"; - $text = file_get_contents('xsl/Bewerberakt.xsl'); + $testQuery = "SELECT setval('seq_vorlagestudiengang_vorlagestudiengang_id', max(vorlagestudiengang_id)) FROM tbl_vorlagestudiengang;"; + $testResult = $db->db_query($testQuery); + + $text = file_get_contents('./system/xsl/Bewerberakt.xsl'); while($row = $db->db_fetch_object($result)) { @@ -1330,6 +1333,55 @@ if($result = $db->db_query("SELECT * FROM public.tbl_vorlage WHERE vorlage_kurzb + +// public.tbl_vorlagedokument hinzufuegen +if($result = @$db->db_query("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='public' AND TABLE_NAME='tbl_vorlagedokument';")) +{ + if($db->db_num_rows($result)==0) + { + $qry = " + CREATE TABLE public.tbl_vorlagedokument + ( + vorlagedokument_id integer NOT NULL, + sort integer NOT NULL, + vorlagestudiengang_id bigint NOT NULL, + dokument_kurzbz varchar(8) NOT NULL + ); + + + + CREATE SEQUENCE public.tbl_vorlagedokument_vorlagedokument_id_seq + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + + COMMENT ON TABLE public.tbl_vorlagedokument IS 'Verknuepft mehrere tbl_dokument mit einer tbl_vorlagestudiengang'; + ALTER TABLE public.tbl_vorlagedokument ADD CONSTRAINT pr_vorlagedokument_id PRIMARY KEY (vorlagedokument_id); + ALTER TABLE public.tbl_vorlagedokument ALTER COLUMN vorlagedokument_id SET DEFAULT nextval('public.tbl_vorlagedokument_vorlagedokument_id_seq'); + + ALTER TABLE public.tbl_vorlagedokument ADD CONSTRAINT fk_tbl_vorlagedokument_tbl_dokument FOREIGN KEY (dokument_kurzbz) REFERENCES public.tbl_dokument (dokument_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE; + ALTER TABLE public.tbl_vorlagedokument ADD CONSTRAINT fk_tbl_vorlagedokument_tbl_vorlagestudiengang FOREIGN KEY (vorlagestudiengang_id) REFERENCES public.tbl_vorlagestudiengang (vorlagestudiengang_id) ON DELETE RESTRICT ON UPDATE CASCADE; + + + GRANT SELECT, UPDATE, INSERT, DELETE ON public.tbl_vorlagedokument TO vilesci; + GRANT SELECT ON public.tbl_vorlagedokument TO web; + GRANT SELECT, UPDATE ON public.tbl_vorlagedokument_vorlagedokument_id_seq TO vilesci; + "; + + + if(!$db->db_query($qry)) + echo 'public.tbl_vorlagedokument: '.$db->db_last_error().'
'; + else + echo ' Tabelle public.tbl_vorlagedokument hinzugefuegt!
'; + } +} + + + + + // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen echo '

Pruefe Tabellen und Attribute!

'; diff --git a/system/mlists/mlists_generate.php b/system/mlists/mlists_generate.php index 56465f353..2f43c5c63 100644 --- a/system/mlists/mlists_generate.php +++ b/system/mlists/mlists_generate.php @@ -419,10 +419,10 @@ $error_msg=''; tbl_studiengang.studiengang_kz=tbl_lehrveranstaltung.studiengang_kz AND (studiensemester_kurzbz='$studiensemester' OR studiensemester_kurzbz='$stsem2') AND - mitarbeiter_uid NOT LIKE '\\_%' AND tbl_studiengang.studiengang_kz!=0 AND + mitarbeiter_uid NOT LIKE '\\\\_%' AND tbl_studiengang.studiengang_kz!=0 AND (mitarbeiter_uid,UPPER(typ::varchar(1) || tbl_studiengang.kurzbz || '_lkt')) NOT IN (SELECT uid, UPPER(gruppe_kurzbz) FROM public.tbl_benutzergruppe - WHERE gruppe_kurzbz LIKE '%\\_LKT' AND UPPER(gruppe_kurzbz)!=UPPER('tw_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('tw_fix_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('tw_ext_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('moodle_lkt'))"; + WHERE gruppe_kurzbz LIKE '%\\\\_LKT' AND UPPER(gruppe_kurzbz)!=UPPER('tw_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('tw_fix_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('tw_ext_lkt') AND UPPER(gruppe_kurzbz)!=UPPER('moodle_lkt'))"; //echo $sql_query; if(!($result=$db->db_query($sql_query))) $error_msg.=$db->db_last_error().$sql_query; diff --git a/system/xsl/Bewerberakt.xsl b/system/xsl/Bewerberakt.xsl index d8e5e30ec..a765c757a 100644 --- a/system/xsl/Bewerberakt.xsl +++ b/system/xsl/Bewerberakt.xsl @@ -1,14 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Bewerberakt + + + + + + + + + + + + + + + + + + + + + + - + + + - - - -Bewerberakt - - + + + + + diff --git a/tests/codeception/_support/ApiTester.php b/tests/codeception/_support/ApiTester.php index aba673611..1b707cc30 100644 --- a/tests/codeception/_support/ApiTester.php +++ b/tests/codeception/_support/ApiTester.php @@ -1,6 +1,5 @@ haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/abgabe/Abgabe", array("abgabe_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AblaufCept.php b/tests/codeception/tests/api/v1/AblaufCept.php index dc04c4796..06ef8058a 100644 --- a/tests/codeception/tests/api/v1/AblaufCept.php +++ b/tests/codeception/tests/api/v1/AblaufCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Ablauf/Ablauf", array("ablauf_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php b/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php index 8296e4ef5..002adc8a9 100644 --- a/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php +++ b/tests/codeception/tests/api/v1/AbschlussbeurteilungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/abschlussbeurteilung/Abschlussbeurteilung", array("abschlussbeurteilung_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AbschlusspruefungCept.php b/tests/codeception/tests/api/v1/AbschlusspruefungCept.php index 9d0dcd6a4..638d83207 100644 --- a/tests/codeception/tests/api/v1/AbschlusspruefungCept.php +++ b/tests/codeception/tests/api/v1/AbschlusspruefungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/abschlusspruefung/Abschlusspruefung", array("abschlusspruefung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AdresseCept.php b/tests/codeception/tests/api/v1/AdresseCept.php index b36be6d89..28da6d806 100644 --- a/tests/codeception/tests/api/v1/AdresseCept.php +++ b/tests/codeception/tests/api/v1/AdresseCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/adresse/Adresse", array("person_id" => 0)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AkadgradCept.php b/tests/codeception/tests/api/v1/AkadgradCept.php index 878150dce..208705ccd 100644 --- a/tests/codeception/tests/api/v1/AkadgradCept.php +++ b/tests/codeception/tests/api/v1/AkadgradCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Akadgrad/Akadgrad", array("akadgrad_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AkteCept.php b/tests/codeception/tests/api/v1/AkteCept.php index e3823c2eb..be24e09f3 100644 --- a/tests/codeception/tests/api/v1/AkteCept.php +++ b/tests/codeception/tests/api/v1/AkteCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Akte/Akte", array("akte_id" => "0", "person_id" => "0", "dokument_kurzbz" => "0", "stg_kz" => "0", "prestudent_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AktivitaetCept.php b/tests/codeception/tests/api/v1/AktivitaetCept.php index 1a5d7a315..bf431f36b 100644 --- a/tests/codeception/tests/api/v1/AktivitaetCept.php +++ b/tests/codeception/tests/api/v1/AktivitaetCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Aktivitaet/Aktivitaet", array("aktivitaet_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AmpelCept.php b/tests/codeception/tests/api/v1/AmpelCept.php index 24afaa718..4b65c1d14 100644 --- a/tests/codeception/tests/api/v1/AmpelCept.php +++ b/tests/codeception/tests/api/v1/AmpelCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Ampel/Ampel", array("ampel_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AnrechnungCept.php b/tests/codeception/tests/api/v1/AnrechnungCept.php index 8f9a7f7f8..1cf5911db 100644 --- a/tests/codeception/tests/api/v1/AnrechnungCept.php +++ b/tests/codeception/tests/api/v1/AnrechnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/anrechnung/Anrechnung", array("anrechnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AntwortCept.php b/tests/codeception/tests/api/v1/AntwortCept.php index 344688c19..18d8d495c 100644 --- a/tests/codeception/tests/api/v1/AntwortCept.php +++ b/tests/codeception/tests/api/v1/AntwortCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Antwort/Antwort", array("antwort_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AnwesenheitCept.php b/tests/codeception/tests/api/v1/AnwesenheitCept.php index bb6856edd..c5e21c17f 100644 --- a/tests/codeception/tests/api/v1/AnwesenheitCept.php +++ b/tests/codeception/tests/api/v1/AnwesenheitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/anwesenheit/Anwesenheit", array("anwesenheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AppdatenCept.php b/tests/codeception/tests/api/v1/AppdatenCept.php index 91a5421e9..fd070df03 100644 --- a/tests/codeception/tests/api/v1/AppdatenCept.php +++ b/tests/codeception/tests/api/v1/AppdatenCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/appdaten/Appdaten", array("appdaten_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ArchivCept.php b/tests/codeception/tests/api/v1/ArchivCept.php index cc231757b..d854e6cde 100644 --- a/tests/codeception/tests/api/v1/ArchivCept.php +++ b/tests/codeception/tests/api/v1/ArchivCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Archiv/Archiv", array("archiv_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufmerksamdurchCept.php b/tests/codeception/tests/api/v1/AufmerksamdurchCept.php index 91d37753e..43c1e3727 100644 --- a/tests/codeception/tests/api/v1/AufmerksamdurchCept.php +++ b/tests/codeception/tests/api/v1/AufmerksamdurchCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Aufmerksamdurch/Aufmerksamdurch", array("aufmerksamdurch_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufnahmeschluesselCept.php b/tests/codeception/tests/api/v1/AufnahmeschluesselCept.php index a8859db75..150249d6a 100644 --- a/tests/codeception/tests/api/v1/AufnahmeschluesselCept.php +++ b/tests/codeception/tests/api/v1/AufnahmeschluesselCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Aufnahmeschluessel/Aufnahmeschluessel", array("aufnahmeschluessel" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufnahmeterminCept.php b/tests/codeception/tests/api/v1/AufnahmeterminCept.php index 4f8ef8cde..f9d670a27 100644 --- a/tests/codeception/tests/api/v1/AufnahmeterminCept.php +++ b/tests/codeception/tests/api/v1/AufnahmeterminCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Aufnahmetermin/Aufnahmetermin", array("aufnahmetermin_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufnahmetermintypCept.php b/tests/codeception/tests/api/v1/AufnahmetermintypCept.php index 9bd8f2902..5e2cf83ee 100644 --- a/tests/codeception/tests/api/v1/AufnahmetermintypCept.php +++ b/tests/codeception/tests/api/v1/AufnahmetermintypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Aufnahmetermintyp/Aufnahmetermintyp", array("aufnahmetermintyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufteilungCept.php b/tests/codeception/tests/api/v1/AufteilungCept.php index 5568b8018..f82cdcd1c 100644 --- a/tests/codeception/tests/api/v1/AufteilungCept.php +++ b/tests/codeception/tests/api/v1/AufteilungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Aufteilung/Aufteilung", array("aufteilung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AufwandstypCept.php b/tests/codeception/tests/api/v1/AufwandstypCept.php index 5c1029792..9d8b13664 100644 --- a/tests/codeception/tests/api/v1/AufwandstypCept.php +++ b/tests/codeception/tests/api/v1/AufwandstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Aufwandstyp/Aufwandstyp", array("aufwandstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/AusbildungCept.php b/tests/codeception/tests/api/v1/AusbildungCept.php index 6c230576d..71abd2a18 100644 --- a/tests/codeception/tests/api/v1/AusbildungCept.php +++ b/tests/codeception/tests/api/v1/AusbildungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Ausbildung/Ausbildung", array("ausbildungcode" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BankverbindungCept.php b/tests/codeception/tests/api/v1/BankverbindungCept.php index 90f30b080..d7f654fdc 100644 --- a/tests/codeception/tests/api/v1/BankverbindungCept.php +++ b/tests/codeception/tests/api/v1/BankverbindungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Bankverbindung/Bankverbindung", array("bankverbindung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BeispielCept.php b/tests/codeception/tests/api/v1/BeispielCept.php index 29a4f5aa2..1704a2e16 100644 --- a/tests/codeception/tests/api/v1/BeispielCept.php +++ b/tests/codeception/tests/api/v1/BeispielCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/beispiel/Beispiel", array("beispiel_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BenutzerCept.php b/tests/codeception/tests/api/v1/BenutzerCept.php index f43857a00..6936a85cc 100644 --- a/tests/codeception/tests/api/v1/BenutzerCept.php +++ b/tests/codeception/tests/api/v1/BenutzerCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Benutzer/Benutzer", array("uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BenutzerfunktionCept.php b/tests/codeception/tests/api/v1/BenutzerfunktionCept.php index e3038d7f4..9c64a089d 100644 --- a/tests/codeception/tests/api/v1/BenutzerfunktionCept.php +++ b/tests/codeception/tests/api/v1/BenutzerfunktionCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Benutzerfunktion/Benutzerfunktion", array("benutzerfunktion_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BenutzergruppeCept.php b/tests/codeception/tests/api/v1/BenutzergruppeCept.php index d5c7ba347..82898bd82 100644 --- a/tests/codeception/tests/api/v1/BenutzergruppeCept.php +++ b/tests/codeception/tests/api/v1/BenutzergruppeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Benutzergruppe/Benutzergruppe", array("gruppe_kurzbz" => "0", "uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BenutzerrolleCept.php b/tests/codeception/tests/api/v1/BenutzerrolleCept.php index a64bbfac0..123cbb64d 100644 --- a/tests/codeception/tests/api/v1/BenutzerrolleCept.php +++ b/tests/codeception/tests/api/v1/BenutzerrolleCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Benutzerrolle/Benutzerrolle", array("benutzerrolle_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BerechtigungCept.php b/tests/codeception/tests/api/v1/BerechtigungCept.php index 3e4a9b85b..e386827bd 100644 --- a/tests/codeception/tests/api/v1/BerechtigungCept.php +++ b/tests/codeception/tests/api/v1/BerechtigungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Berechtigung/Berechtigung", array("berechtigung_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BerufstaetigkeitCept.php b/tests/codeception/tests/api/v1/BerufstaetigkeitCept.php index 174f23771..d2c2f6f76 100644 --- a/tests/codeception/tests/api/v1/BerufstaetigkeitCept.php +++ b/tests/codeception/tests/api/v1/BerufstaetigkeitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Berufstaetigkeit/Berufstaetigkeit", array("berufstaetigkeit_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BeschaeftigungsausmassCept.php b/tests/codeception/tests/api/v1/BeschaeftigungsausmassCept.php index 475aaabd8..68a880e25 100644 --- a/tests/codeception/tests/api/v1/BeschaeftigungsausmassCept.php +++ b/tests/codeception/tests/api/v1/BeschaeftigungsausmassCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Beschaeftigungsausmass/Beschaeftigungsausmass", array("beschausmasscode" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BesqualCept.php b/tests/codeception/tests/api/v1/BesqualCept.php index 2f2adc129..7c573d770 100644 --- a/tests/codeception/tests/api/v1/BesqualCept.php +++ b/tests/codeception/tests/api/v1/BesqualCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Besqual/Besqual", array("besqualcode" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BestelldetailCept.php b/tests/codeception/tests/api/v1/BestelldetailCept.php index f2f18a006..12a6be28c 100644 --- a/tests/codeception/tests/api/v1/BestelldetailCept.php +++ b/tests/codeception/tests/api/v1/BestelldetailCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Bestelldetail/Bestelldetail", array("bestelldetail_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BestelldetailtagCept.php b/tests/codeception/tests/api/v1/BestelldetailtagCept.php index cd02c31bc..377660926 100644 --- a/tests/codeception/tests/api/v1/BestelldetailtagCept.php +++ b/tests/codeception/tests/api/v1/BestelldetailtagCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Bestelldetailtag/Bestelldetailtag", array("bestelldetail_id" => "0", "tag" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BestellstatusCept.php b/tests/codeception/tests/api/v1/BestellstatusCept.php index 720bf5349..41556b2e3 100644 --- a/tests/codeception/tests/api/v1/BestellstatusCept.php +++ b/tests/codeception/tests/api/v1/BestellstatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Bestellstatus/Bestellstatus", array("bestellstatus_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BestellungCept.php b/tests/codeception/tests/api/v1/BestellungCept.php index ed0dce8df..f9f87bf12 100644 --- a/tests/codeception/tests/api/v1/BestellungCept.php +++ b/tests/codeception/tests/api/v1/BestellungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Bestellung/Bestellung", array("bestellung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BestellungtagCept.php b/tests/codeception/tests/api/v1/BestellungtagCept.php index 8ed7375d7..9f93371d0 100644 --- a/tests/codeception/tests/api/v1/BestellungtagCept.php +++ b/tests/codeception/tests/api/v1/BestellungtagCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Bestellungtag/Bestellungtag", array("bestellung_id" => "0", "tag" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetreuerartCept.php b/tests/codeception/tests/api/v1/BetreuerartCept.php index 2cab1a9a6..14879ab77 100644 --- a/tests/codeception/tests/api/v1/BetreuerartCept.php +++ b/tests/codeception/tests/api/v1/BetreuerartCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/betreuerart/Betreuerart", array("betreuerart_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetriebsmittelCept.php b/tests/codeception/tests/api/v1/BetriebsmittelCept.php index 1845fbc61..786753aca 100644 --- a/tests/codeception/tests/api/v1/BetriebsmittelCept.php +++ b/tests/codeception/tests/api/v1/BetriebsmittelCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Betriebsmittel/Betriebsmittel", array("betriebsmittel_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php b/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php index c4493cf3d..6432d88db 100644 --- a/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php +++ b/tests/codeception/tests/api/v1/BetriebsmittelpersonCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/betriebsmittelperson/Betriebsmittelperson", array("betriebsmittelperson_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetriebsmittelstatusCept.php b/tests/codeception/tests/api/v1/BetriebsmittelstatusCept.php index dcb7197ea..5038cca25 100644 --- a/tests/codeception/tests/api/v1/BetriebsmittelstatusCept.php +++ b/tests/codeception/tests/api/v1/BetriebsmittelstatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Betriebsmittelstatus/Betriebsmittelstatus", array("betriebsmittelstatus_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BetriebsmitteltypCept.php b/tests/codeception/tests/api/v1/BetriebsmitteltypCept.php index 8d89303eb..798abebe0 100644 --- a/tests/codeception/tests/api/v1/BetriebsmitteltypCept.php +++ b/tests/codeception/tests/api/v1/BetriebsmitteltypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Betriebsmitteltyp/Betriebsmitteltyp", array("betriebsmitteltyp" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BewerbungstermineCept.php b/tests/codeception/tests/api/v1/BewerbungstermineCept.php index b449d3428..864f379f8 100644 --- a/tests/codeception/tests/api/v1/BewerbungstermineCept.php +++ b/tests/codeception/tests/api/v1/BewerbungstermineCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Bewerbungstermine/Bewerbungstermine", array("bewerbungstermine_id" => "0", "studiengang_kz" => "0", "studiensemester_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BisfunktionCept.php b/tests/codeception/tests/api/v1/BisfunktionCept.php index 88c7c9337..d3fca1ef5 100644 --- a/tests/codeception/tests/api/v1/BisfunktionCept.php +++ b/tests/codeception/tests/api/v1/BisfunktionCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Bisfunktion/Bisfunktion", array("studiengang_kz" => "0", "bisverwendung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BisioCept.php b/tests/codeception/tests/api/v1/BisioCept.php index 94e407b11..0ce2a835a 100644 --- a/tests/codeception/tests/api/v1/BisioCept.php +++ b/tests/codeception/tests/api/v1/BisioCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Bisio/Bisio", array("bisio_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BisorgformCept.php b/tests/codeception/tests/api/v1/BisorgformCept.php index ee44a40ad..bce53ed51 100644 --- a/tests/codeception/tests/api/v1/BisorgformCept.php +++ b/tests/codeception/tests/api/v1/BisorgformCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Bisorgform/Bisorgform", array("bisorgform_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BisverwendungCept.php b/tests/codeception/tests/api/v1/BisverwendungCept.php index f1f5e5240..333af1859 100644 --- a/tests/codeception/tests/api/v1/BisverwendungCept.php +++ b/tests/codeception/tests/api/v1/BisverwendungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Bisverwendung/Bisverwendung", array("bisverwendung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BuchungCept.php b/tests/codeception/tests/api/v1/BuchungCept.php index 6d70a5460..bea099fff 100644 --- a/tests/codeception/tests/api/v1/BuchungCept.php +++ b/tests/codeception/tests/api/v1/BuchungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Buchung/Buchung", array("buchung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Buchungstyp2Cept.php b/tests/codeception/tests/api/v1/Buchungstyp2Cept.php index fc33a9322..b03bb3818 100644 --- a/tests/codeception/tests/api/v1/Buchungstyp2Cept.php +++ b/tests/codeception/tests/api/v1/Buchungstyp2Cept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Buchungstyp/Buchungstyp", array("buchungstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BuchungstypCept.php b/tests/codeception/tests/api/v1/BuchungstypCept.php index 74ea11692..cc70dee1b 100644 --- a/tests/codeception/tests/api/v1/BuchungstypCept.php +++ b/tests/codeception/tests/api/v1/BuchungstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Buchungstyp/Buchungstyp", array("buchungstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BudgetCept.php b/tests/codeception/tests/api/v1/BudgetCept.php index 2022697cb..c8a7f2f4d 100644 --- a/tests/codeception/tests/api/v1/BudgetCept.php +++ b/tests/codeception/tests/api/v1/BudgetCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Budget/Budget", array("kostenstelle_id" => "0", "geschaeftsjahr_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/BundeslandCept.php b/tests/codeception/tests/api/v1/BundeslandCept.php index 6da71635b..d544908fd 100644 --- a/tests/codeception/tests/api/v1/BundeslandCept.php +++ b/tests/codeception/tests/api/v1/BundeslandCept.php @@ -1,11 +1,12 @@ wantTo('Test API call v1/codex/bundesland/All'); +$I->wantTo("Test API call v1/codex/bundesland/All"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/codex/bundesland/All'); +$I->sendGET("v1/codex/bundesland/All"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/CeptTemplate.php b/tests/codeception/tests/api/v1/CeptTemplate.php index 3d94ad755..34b0c9a12 100644 --- a/tests/codeception/tests/api/v1/CeptTemplate.php +++ b/tests/codeception/tests/api/v1/CeptTemplate.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("TO_BE_REPLACED_NAME", array(TO_BE_REPLACED_PARAMETERS)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ContentCept.php b/tests/codeception/tests/api/v1/ContentCept.php index e948a59fa..0363f2be4 100644 --- a/tests/codeception/tests/api/v1/ContentCept.php +++ b/tests/codeception/tests/api/v1/ContentCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Content/Content", array("content_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ContentchildCept.php b/tests/codeception/tests/api/v1/ContentchildCept.php index eda1def28..0ed898703 100644 --- a/tests/codeception/tests/api/v1/ContentchildCept.php +++ b/tests/codeception/tests/api/v1/ContentchildCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Contentchild/Contentchild", array("contentchild_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ContentgruppeCept.php b/tests/codeception/tests/api/v1/ContentgruppeCept.php index ab55c4939..f58960089 100644 --- a/tests/codeception/tests/api/v1/ContentgruppeCept.php +++ b/tests/codeception/tests/api/v1/ContentgruppeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Contentgruppe/Contentgruppe", array("gruppe_kurzbz" => "0", "content_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ContentlogCept.php b/tests/codeception/tests/api/v1/ContentlogCept.php index feebcbae6..ba25ac2fe 100644 --- a/tests/codeception/tests/api/v1/ContentlogCept.php +++ b/tests/codeception/tests/api/v1/ContentlogCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Contentlog/Contentlog", array("contentlog_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ContentspracheCept.php b/tests/codeception/tests/api/v1/ContentspracheCept.php index 7f726e368..bd07661f2 100644 --- a/tests/codeception/tests/api/v1/ContentspracheCept.php +++ b/tests/codeception/tests/api/v1/ContentspracheCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Contentsprache/Contentsprache", array("contentsprache_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/CoodleCept.php b/tests/codeception/tests/api/v1/CoodleCept.php index 34ade8fdc..26a35931b 100644 --- a/tests/codeception/tests/api/v1/CoodleCept.php +++ b/tests/codeception/tests/api/v1/CoodleCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Coodle/Coodle", array("coodle_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/CronjobCept.php b/tests/codeception/tests/api/v1/CronjobCept.php index 99708c0f6..b1aae94a9 100644 --- a/tests/codeception/tests/api/v1/CronjobCept.php +++ b/tests/codeception/tests/api/v1/CronjobCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Cronjob/Cronjob", array("cronjob_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/DmsCept.php b/tests/codeception/tests/api/v1/DmsCept.php index fae3894b9..2a54319d6 100644 --- a/tests/codeception/tests/api/v1/DmsCept.php +++ b/tests/codeception/tests/api/v1/DmsCept.php @@ -1,11 +1,12 @@ wantTo('Test API call v1/content/dms/dms'); +$I->wantTo("Test API call v1/content/dms/dms"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/content/dms/Dms', array('dms_id' => 1)); +$I->sendGET("v1/content/dms/Dms", array("dms_id" => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/DokumentCept.php b/tests/codeception/tests/api/v1/DokumentCept.php index 35cb94a5c..c9195ab3b 100644 --- a/tests/codeception/tests/api/v1/DokumentCept.php +++ b/tests/codeception/tests/api/v1/DokumentCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Dokument/Dokument", array("dokument_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/DokumentprestudentCept.php b/tests/codeception/tests/api/v1/DokumentprestudentCept.php index c2b1e09a1..af7d0111b 100644 --- a/tests/codeception/tests/api/v1/DokumentprestudentCept.php +++ b/tests/codeception/tests/api/v1/DokumentprestudentCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Dokumentprestudent/Dokumentprestudent", array("prestudent_id" => "0", "dokument_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/DokumentstudiengangCept.php b/tests/codeception/tests/api/v1/DokumentstudiengangCept.php index 8fb969fd3..b04230e50 100644 --- a/tests/codeception/tests/api/v1/DokumentstudiengangCept.php +++ b/tests/codeception/tests/api/v1/DokumentstudiengangCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Dokumentstudiengang/Dokumentstudiengang", array("studiengang_kz" => "0", "dokument_kurzbz" => "0", "studiengang_kz" => "0", "onlinebewerbung" => "0", "pflicht" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/EntwicklungsteamCept.php b/tests/codeception/tests/api/v1/EntwicklungsteamCept.php index f1fe29ddc..cc74f30fe 100644 --- a/tests/codeception/tests/api/v1/EntwicklungsteamCept.php +++ b/tests/codeception/tests/api/v1/EntwicklungsteamCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Entwicklungsteam/Entwicklungsteam", array("studiengang_kz" => "0", "mitarbeiter_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ErhalterCept.php b/tests/codeception/tests/api/v1/ErhalterCept.php index b2fe37e3a..cc38cd7be 100644 --- a/tests/codeception/tests/api/v1/ErhalterCept.php +++ b/tests/codeception/tests/api/v1/ErhalterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Erhalter/Erhalter", array("erhalter_kz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ErreichbarkeitCept.php b/tests/codeception/tests/api/v1/ErreichbarkeitCept.php index 73068e9d4..7188d9623 100644 --- a/tests/codeception/tests/api/v1/ErreichbarkeitCept.php +++ b/tests/codeception/tests/api/v1/ErreichbarkeitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Erreichbarkeit/Erreichbarkeit", array("erreichbarkeit_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FachbereichCept.php b/tests/codeception/tests/api/v1/FachbereichCept.php index 48aa32f73..a544fc585 100644 --- a/tests/codeception/tests/api/v1/FachbereichCept.php +++ b/tests/codeception/tests/api/v1/FachbereichCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/fachbereich/Fachbereich", array("fachbereich_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FeedbackCept.php b/tests/codeception/tests/api/v1/FeedbackCept.php index a2e735daa..7b070a5a1 100644 --- a/tests/codeception/tests/api/v1/FeedbackCept.php +++ b/tests/codeception/tests/api/v1/FeedbackCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/feedback/Feedback", array("feedback_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FerienCept.php b/tests/codeception/tests/api/v1/FerienCept.php index 1d425bbf4..f4a6dbeb1 100644 --- a/tests/codeception/tests/api/v1/FerienCept.php +++ b/tests/codeception/tests/api/v1/FerienCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Ferien/Ferien", array("studiengang_kz" => "0", "bezeichnung" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FilterCept.php b/tests/codeception/tests/api/v1/FilterCept.php index 8381e2ba3..89239f32d 100644 --- a/tests/codeception/tests/api/v1/FilterCept.php +++ b/tests/codeception/tests/api/v1/FilterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Filter/Filter", array("filter_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FirmaCept.php b/tests/codeception/tests/api/v1/FirmaCept.php index 167f521b3..b64106855 100644 --- a/tests/codeception/tests/api/v1/FirmaCept.php +++ b/tests/codeception/tests/api/v1/FirmaCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Firma/Firma", array("firma_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FirmatagCept.php b/tests/codeception/tests/api/v1/FirmatagCept.php index 2c6db3a79..45dcb375b 100644 --- a/tests/codeception/tests/api/v1/FirmatagCept.php +++ b/tests/codeception/tests/api/v1/FirmatagCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Firmatag/Firmatag", array("tag" => "0", "firma_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FirmentypCept.php b/tests/codeception/tests/api/v1/FirmentypCept.php index ae9d7a023..39adaaf12 100644 --- a/tests/codeception/tests/api/v1/FirmentypCept.php +++ b/tests/codeception/tests/api/v1/FirmentypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Firmentyp/Firmentyp", array("firmentyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FotostatusCept.php b/tests/codeception/tests/api/v1/FotostatusCept.php index 53915f361..2c290d1bc 100644 --- a/tests/codeception/tests/api/v1/FotostatusCept.php +++ b/tests/codeception/tests/api/v1/FotostatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Fotostatus/Fotostatus", array("fotostatus_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FrageCept.php b/tests/codeception/tests/api/v1/FrageCept.php index 1e94ed8f9..048255292 100644 --- a/tests/codeception/tests/api/v1/FrageCept.php +++ b/tests/codeception/tests/api/v1/FrageCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Frage/Frage", array("frage_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FreebusyCept.php b/tests/codeception/tests/api/v1/FreebusyCept.php index 8793c3921..bb561732f 100644 --- a/tests/codeception/tests/api/v1/FreebusyCept.php +++ b/tests/codeception/tests/api/v1/FreebusyCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Freebusy/Freebusy", array("freebusy_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FreebusytypCept.php b/tests/codeception/tests/api/v1/FreebusytypCept.php index 4d5cc2f90..a4ffce588 100644 --- a/tests/codeception/tests/api/v1/FreebusytypCept.php +++ b/tests/codeception/tests/api/v1/FreebusytypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Freebusytyp/Freebusytyp", array("freebusytyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/FunktionCept.php b/tests/codeception/tests/api/v1/FunktionCept.php index 1c6b309b2..d64a009e7 100644 --- a/tests/codeception/tests/api/v1/FunktionCept.php +++ b/tests/codeception/tests/api/v1/FunktionCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Funktion/Funktion", array("funktion_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/GebietCept.php b/tests/codeception/tests/api/v1/GebietCept.php index cb40ef097..c472883fb 100644 --- a/tests/codeception/tests/api/v1/GebietCept.php +++ b/tests/codeception/tests/api/v1/GebietCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Gebiet/Gebiet", array("gebiet_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/GemeindeCept.php b/tests/codeception/tests/api/v1/GemeindeCept.php index dacebe651..e24d49f99 100644 --- a/tests/codeception/tests/api/v1/GemeindeCept.php +++ b/tests/codeception/tests/api/v1/GemeindeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Gemeinde/Gemeinde", array("gemeinde_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php b/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php index 003dfaa4e..0506cd12a 100644 --- a/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php +++ b/tests/codeception/tests/api/v1/Geschaeftsjahr2Cept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/geschaeftsjahr/Geschaeftsjahr", array("geschaeftsjahr_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/GruppeCept.php b/tests/codeception/tests/api/v1/GruppeCept.php index a0187f912..4b8dc7e42 100644 --- a/tests/codeception/tests/api/v1/GruppeCept.php +++ b/tests/codeception/tests/api/v1/GruppeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Gruppe/Gruppe", array("gruppe_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/HauptberufCept.php b/tests/codeception/tests/api/v1/HauptberufCept.php index d0ce0aa5e..5d4954efd 100644 --- a/tests/codeception/tests/api/v1/HauptberufCept.php +++ b/tests/codeception/tests/api/v1/HauptberufCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Hauptberuf/Hauptberuf", array("hauptberufcode" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/InfoscreenCept.php b/tests/codeception/tests/api/v1/InfoscreenCept.php index 70e3e52ed..07d6645c6 100644 --- a/tests/codeception/tests/api/v1/InfoscreenCept.php +++ b/tests/codeception/tests/api/v1/InfoscreenCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Infoscreen/Infoscreen", array("infoscreen_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KategorieCept.php b/tests/codeception/tests/api/v1/KategorieCept.php index aa965ef06..67aa72453 100644 --- a/tests/codeception/tests/api/v1/KategorieCept.php +++ b/tests/codeception/tests/api/v1/KategorieCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Kategorie/Kategorie", array("kategorie_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontactCept.php b/tests/codeception/tests/api/v1/KontactCept.php index 7c0872cfd..3b3291b99 100644 --- a/tests/codeception/tests/api/v1/KontactCept.php +++ b/tests/codeception/tests/api/v1/KontactCept.php @@ -1,21 +1,24 @@ wantTo('Test API call v1/person/kontakt/ kontakt, KontaktByPersonID and KontaktByPersonIDKontaktTyp'); +$I->wantTo("Test API call v1/person/kontakt/ kontakt, KontaktByPersonID and KontaktByPersonIDKontaktTyp"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/person/kontakt/kontakt', array('kontakt_id' => 1)); +$I->sendGET("v1/person/kontakt/kontakt", array("kontakt_id" => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/person/kontakt/KontaktByPersonID', array('person_id' => 3)); +$I->sendGET("v1/person/kontakt/KontaktByPersonID", array("person_id" => 3)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/person/kontakt/KontaktByPersonIDKontaktTyp', array('person_id' => 3, 'kontakttyp' => 'email')); +$I->sendGET("v1/person/kontakt/KontaktByPersonIDKontaktTyp", array("person_id" => 3, "kontakttyp" => "email")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontaktCept.php b/tests/codeception/tests/api/v1/KontaktCept.php index 736d9aad0..d4c16ac65 100644 --- a/tests/codeception/tests/api/v1/KontaktCept.php +++ b/tests/codeception/tests/api/v1/KontaktCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/kontakt/Kontakt", array("kontakt_id" => 0)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontaktmediumCept.php b/tests/codeception/tests/api/v1/KontaktmediumCept.php index bfa509212..08eef8735 100644 --- a/tests/codeception/tests/api/v1/KontaktmediumCept.php +++ b/tests/codeception/tests/api/v1/KontaktmediumCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Kontaktmedium/Kontaktmedium", array("kontaktmedium_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontakttypCept.php b/tests/codeception/tests/api/v1/KontakttypCept.php index ecc822237..60132ef4a 100644 --- a/tests/codeception/tests/api/v1/KontakttypCept.php +++ b/tests/codeception/tests/api/v1/KontakttypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Kontakttyp/Kontakttyp", array("kontakttyp" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Konto2Cept.php b/tests/codeception/tests/api/v1/Konto2Cept.php index 870899d56..09195b535 100644 --- a/tests/codeception/tests/api/v1/Konto2Cept.php +++ b/tests/codeception/tests/api/v1/Konto2Cept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/konto/Konto", array("konto_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KontoCept.php b/tests/codeception/tests/api/v1/KontoCept.php index 8b3260d48..d4ccdbbe4 100644 --- a/tests/codeception/tests/api/v1/KontoCept.php +++ b/tests/codeception/tests/api/v1/KontoCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Konto/Konto", array("buchungsnr" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KostenstelleCept.php b/tests/codeception/tests/api/v1/KostenstelleCept.php index 1e25f7e85..d2aae9684 100644 --- a/tests/codeception/tests/api/v1/KostenstelleCept.php +++ b/tests/codeception/tests/api/v1/KostenstelleCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Kostenstelle/Kostenstelle", array("kostenstelle_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/KriterienCept.php b/tests/codeception/tests/api/v1/KriterienCept.php index b8fc1c1ac..7a5de8344 100644 --- a/tests/codeception/tests/api/v1/KriterienCept.php +++ b/tests/codeception/tests/api/v1/KriterienCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Kriterien/Kriterien", array("kriterien_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LeNotenschluesselCept.php b/tests/codeception/tests/api/v1/LeNotenschluesselCept.php index 11d1654c2..ee3c17953 100644 --- a/tests/codeception/tests/api/v1/LeNotenschluesselCept.php +++ b/tests/codeception/tests/api/v1/LeNotenschluesselCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lenotenschluessel/LeNotenschluessel", array("note" => "0", "lehreinheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LePruefungCept.php b/tests/codeception/tests/api/v1/LePruefungCept.php index 6755266cd..434fbc918 100644 --- a/tests/codeception/tests/api/v1/LePruefungCept.php +++ b/tests/codeception/tests/api/v1/LePruefungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lepruefung/LePruefung", array("lepruefung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LegesamtnoteCept.php b/tests/codeception/tests/api/v1/LegesamtnoteCept.php index 088aab190..c74559099 100644 --- a/tests/codeception/tests/api/v1/LegesamtnoteCept.php +++ b/tests/codeception/tests/api/v1/LegesamtnoteCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/legesamtnote/Legesamtnote", array("lehreinheit_id" => "0", "student_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitCept.php b/tests/codeception/tests/api/v1/LehreinheitCept.php index 71cfe7588..d86b32189 100644 --- a/tests/codeception/tests/api/v1/LehreinheitCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehreinheit/Lehreinheit", array("lehreinheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php b/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php index 27bf6d422..22a7b25ff 100644 --- a/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitgruppeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehreinheitgruppe/Lehreinheitgruppe", array("lehreinheitgruppe_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php b/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php index 6f1999388..6d24ade12 100644 --- a/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php +++ b/tests/codeception/tests/api/v1/LehreinheitmitarbeiterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Lehreinheitmitarbeiter/Lehreinheitmitarbeiter", array("mitarbeiter_uid" => "0", "lehreinheit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrfachCept.php b/tests/codeception/tests/api/v1/LehrfachCept.php index 447f66a98..dd7ca7cf3 100644 --- a/tests/codeception/tests/api/v1/LehrfachCept.php +++ b/tests/codeception/tests/api/v1/LehrfachCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehrfach/Lehrfach", array("lehrfach_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrformCept.php b/tests/codeception/tests/api/v1/LehrformCept.php index e703e6df7..dfe3feaa0 100644 --- a/tests/codeception/tests/api/v1/LehrformCept.php +++ b/tests/codeception/tests/api/v1/LehrformCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Lehrform/Lehrform", array("lehrform_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrfunktionCept.php b/tests/codeception/tests/api/v1/LehrfunktionCept.php index 48ca2ae41..cf7c9ab34 100644 --- a/tests/codeception/tests/api/v1/LehrfunktionCept.php +++ b/tests/codeception/tests/api/v1/LehrfunktionCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehrfunktion/Lehrfunktion", array("lehrfunktion_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrmittelCept.php b/tests/codeception/tests/api/v1/LehrmittelCept.php index 9d6694ae8..35e1bb850 100644 --- a/tests/codeception/tests/api/v1/LehrmittelCept.php +++ b/tests/codeception/tests/api/v1/LehrmittelCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Lehrmittel/Lehrmittel", array("lehrmittel_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrtypCept.php b/tests/codeception/tests/api/v1/LehrtypCept.php index 4ac3355ad..4d0ceb2d1 100644 --- a/tests/codeception/tests/api/v1/LehrtypCept.php +++ b/tests/codeception/tests/api/v1/LehrtypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehrtyp/Lehrtyp", array("lehrtyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrveranstaltungCept.php b/tests/codeception/tests/api/v1/LehrveranstaltungCept.php index c3cefe22a..7e95e8bc0 100644 --- a/tests/codeception/tests/api/v1/LehrveranstaltungCept.php +++ b/tests/codeception/tests/api/v1/LehrveranstaltungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lehrveranstaltung/Lehrveranstaltung", array("lehrveranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LehrverbandCept.php b/tests/codeception/tests/api/v1/LehrverbandCept.php index 2515fcce6..9dc693bdd 100644 --- a/tests/codeception/tests/api/v1/LehrverbandCept.php +++ b/tests/codeception/tests/api/v1/LehrverbandCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Lehrverband/Lehrverband", array("gruppe" => "0", "verband" => "0", "semester" => "0", "studiengang_kz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LgartcodeCept.php b/tests/codeception/tests/api/v1/LgartcodeCept.php index 8ced5f3ff..4c53efef9 100644 --- a/tests/codeception/tests/api/v1/LgartcodeCept.php +++ b/tests/codeception/tests/api/v1/LgartcodeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Lgartcode/Lgartcode", array("lgartcode" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LogCept.php b/tests/codeception/tests/api/v1/LogCept.php index cc5515b10..4d557f160 100644 --- a/tests/codeception/tests/api/v1/LogCept.php +++ b/tests/codeception/tests/api/v1/LogCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Log/Log", array("log_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvangebotCept.php b/tests/codeception/tests/api/v1/LvangebotCept.php index 38351b0bb..6c27633f9 100644 --- a/tests/codeception/tests/api/v1/LvangebotCept.php +++ b/tests/codeception/tests/api/v1/LvangebotCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/lvangebot/Lvangebot", array("lvangebot_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvgesamtnoteCept.php b/tests/codeception/tests/api/v1/LvgesamtnoteCept.php index 46c508aa4..27ef4b24e 100644 --- a/tests/codeception/tests/api/v1/LvgesamtnoteCept.php +++ b/tests/codeception/tests/api/v1/LvgesamtnoteCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Lvgesamtnote/Lvgesamtnote", array("student_uid" => "0", "studiensemester_kurzbz" => "0", "lehrveranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvinfoCept.php b/tests/codeception/tests/api/v1/LvinfoCept.php index 390784532..9edc89c99 100644 --- a/tests/codeception/tests/api/v1/LvinfoCept.php +++ b/tests/codeception/tests/api/v1/LvinfoCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Lvinfo/Lvinfo", array("sprache" => "0", "lehrveranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvregelCept.php b/tests/codeception/tests/api/v1/LvregelCept.php index b8f1d6d7d..bee6f3f75 100644 --- a/tests/codeception/tests/api/v1/LvregelCept.php +++ b/tests/codeception/tests/api/v1/LvregelCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Lvregel/Lvregel", array("lvregel_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/LvregeltypCept.php b/tests/codeception/tests/api/v1/LvregeltypCept.php index ac22b753d..764c6c185 100644 --- a/tests/codeception/tests/api/v1/LvregeltypCept.php +++ b/tests/codeception/tests/api/v1/LvregeltypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Lvregeltyp/Lvregeltyp", array("lvregeltyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/MessageCept.php b/tests/codeception/tests/api/v1/MessageCept.php index 64b129687..5b195b431 100644 --- a/tests/codeception/tests/api/v1/MessageCept.php +++ b/tests/codeception/tests/api/v1/MessageCept.php @@ -9,13 +9,16 @@ $I->sendGET("v1/system/message/MessagesByPersonID", array("person_id" => "1")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); +$I->wait(); $I->sendGET("v1/system/message/MessagesByUID", array("uid" => "mckenzie")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); +$I->wait(); $I->sendGET("v1/system/message/MessagesByToken", array("token" => "token")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/MitarbeiterCept.php b/tests/codeception/tests/api/v1/MitarbeiterCept.php index 7697beee5..c003fab3b 100644 --- a/tests/codeception/tests/api/v1/MitarbeiterCept.php +++ b/tests/codeception/tests/api/v1/MitarbeiterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Mitarbeiter/Mitarbeiter", array("mitarbeiter_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/MobilitaetsprogrammCept.php b/tests/codeception/tests/api/v1/MobilitaetsprogrammCept.php index 9e0c48690..5e8f57852 100644 --- a/tests/codeception/tests/api/v1/MobilitaetsprogrammCept.php +++ b/tests/codeception/tests/api/v1/MobilitaetsprogrammCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Mobilitaetsprogramm/Mobilitaetsprogramm", array("mobilitaetsprogramm_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/MoodleCept.php b/tests/codeception/tests/api/v1/MoodleCept.php index de15052a4..181bf7905 100644 --- a/tests/codeception/tests/api/v1/MoodleCept.php +++ b/tests/codeception/tests/api/v1/MoodleCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Moodle/Moodle", array("moodle_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NationCept.php b/tests/codeception/tests/api/v1/NationCept.php index c4693793e..bfced54c6 100644 --- a/tests/codeception/tests/api/v1/NationCept.php +++ b/tests/codeception/tests/api/v1/NationCept.php @@ -1,16 +1,18 @@ wantTo('Test API call v1/codex/nation/ nation and all'); +$I->wantTo("Test API call v1/codex/nation/ nation and all"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/codex/nation/nation', array('nation_code' => 'A')); +$I->sendGET("v1/codex/nation/nation", array("nation_code" => "A")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/codex/nation/All'); +$I->sendGET("v1/codex/nation/All"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NewsCept.php b/tests/codeception/tests/api/v1/NewsCept.php index 37db55add..059e0402a 100644 --- a/tests/codeception/tests/api/v1/NewsCept.php +++ b/tests/codeception/tests/api/v1/NewsCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/News/News", array("news_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NoteCept.php b/tests/codeception/tests/api/v1/NoteCept.php index 4cc8f0278..ab8cda69c 100644 --- a/tests/codeception/tests/api/v1/NoteCept.php +++ b/tests/codeception/tests/api/v1/NoteCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Note/Note", array("note" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotenschluesselCept.php b/tests/codeception/tests/api/v1/NotenschluesselCept.php index f8bc8ca4c..f1f009f91 100644 --- a/tests/codeception/tests/api/v1/NotenschluesselCept.php +++ b/tests/codeception/tests/api/v1/NotenschluesselCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Notenschluessel/Notenschluessel", array("notenschluessel_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotenschluesselaufteilungCept.php b/tests/codeception/tests/api/v1/NotenschluesselaufteilungCept.php index 413641182..35ea082c8 100644 --- a/tests/codeception/tests/api/v1/NotenschluesselaufteilungCept.php +++ b/tests/codeception/tests/api/v1/NotenschluesselaufteilungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Notenschluesselaufteilung/Notenschluesselaufteilung", array("notenschluesselaufteilung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotenschluesseluebungCept.php b/tests/codeception/tests/api/v1/NotenschluesseluebungCept.php index 4ba0d7421..337b3a5c6 100644 --- a/tests/codeception/tests/api/v1/NotenschluesseluebungCept.php +++ b/tests/codeception/tests/api/v1/NotenschluesseluebungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Notenschluesseluebung/Notenschluesseluebung", array("note" => "0", "uebung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotenschluesselzuordnungCept.php b/tests/codeception/tests/api/v1/NotenschluesselzuordnungCept.php index 0e518be13..388b6e643 100644 --- a/tests/codeception/tests/api/v1/NotenschluesselzuordnungCept.php +++ b/tests/codeception/tests/api/v1/NotenschluesselzuordnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Notenschluesselzuordnung/Notenschluesselzuordnung", array("notenschluesselzuordnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotizCept.php b/tests/codeception/tests/api/v1/NotizCept.php index e0164feb1..514f7b8f7 100644 --- a/tests/codeception/tests/api/v1/NotizCept.php +++ b/tests/codeception/tests/api/v1/NotizCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Notiz/Notiz", array("notiz_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/NotizzuordnungCept.php b/tests/codeception/tests/api/v1/NotizzuordnungCept.php index b03f6a786..7a49afdb3 100644 --- a/tests/codeception/tests/api/v1/NotizzuordnungCept.php +++ b/tests/codeception/tests/api/v1/NotizzuordnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/person/Notizzuordnung/Notizzuordnung", array("notizzuordnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/OrganisationseinheitCept.php b/tests/codeception/tests/api/v1/OrganisationseinheitCept.php index 2fa1736e8..ed3e9a8aa 100644 --- a/tests/codeception/tests/api/v1/OrganisationseinheitCept.php +++ b/tests/codeception/tests/api/v1/OrganisationseinheitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/organisationseinheit/Organisationseinheit", array("oe_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/OrganisationseinheittypCept.php b/tests/codeception/tests/api/v1/OrganisationseinheittypCept.php index 44dd483c7..6df0a4208 100644 --- a/tests/codeception/tests/api/v1/OrganisationseinheittypCept.php +++ b/tests/codeception/tests/api/v1/OrganisationseinheittypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Organisationseinheittyp/Organisationseinheittyp", array("organisationseinheittyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/OrgformCept.php b/tests/codeception/tests/api/v1/OrgformCept.php index 7c9a7d2f5..58203f86b 100644 --- a/tests/codeception/tests/api/v1/OrgformCept.php +++ b/tests/codeception/tests/api/v1/OrgformCept.php @@ -1,21 +1,24 @@ wantTo('Test API call v1/codex/orgform Orgform, OrgformLV and All'); +$I->wantTo("Test API call v1/codex/orgform Orgform, OrgformLV and All"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/codex/orgform/Orgform', array('orgform_kurzbz' => 'VZ')); +$I->sendGET("v1/codex/orgform/Orgform", array("orgform_kurzbz" => "VZ")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/codex/orgform/All'); +$I->sendGET("v1/codex/orgform/All"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/codex/orgform/OrgformLV'); +$I->sendGET("v1/codex/orgform/OrgformLV"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/OrtCept.php b/tests/codeception/tests/api/v1/OrtCept.php index 82a5c30a8..b49f3610a 100644 --- a/tests/codeception/tests/api/v1/OrtCept.php +++ b/tests/codeception/tests/api/v1/OrtCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Ort/Ort", array("ort_kurzbz" => "0", "raumtyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/OrtraumtypCept.php b/tests/codeception/tests/api/v1/OrtraumtypCept.php index bac035007..4799f9d51 100644 --- a/tests/codeception/tests/api/v1/OrtraumtypCept.php +++ b/tests/codeception/tests/api/v1/OrtraumtypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Ortraumtyp/Ortraumtyp", array("hierarchie" => "0", "ort_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PCRMCept.php b/tests/codeception/tests/api/v1/PCRMCept.php new file mode 100644 index 000000000..25c8892eb --- /dev/null +++ b/tests/codeception/tests/api/v1/PCRMCept.php @@ -0,0 +1,23 @@ +wantTo("Test API call v1/system/PCRM/Call"); +$I->amHttpAuthenticated("admin", "1q2w3"); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); + +$I->sendGET("v1/system/PCRM/Call", array( + "resource" => "codex/Bundesland_model", "function" => "load", "bundesland_code" => "1") +); +$I->seeResponseCodeIs(200); +$I->seeResponseIsJson(); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); + +$I->sendGET("v1/system/PCRM/Call", array( + "resource" => "PermissionLib", "function" => "hasPermission", + "sn" => "bis.tbl_archiv", "pt" => "s") +); +$I->seeResponseCodeIs(200); +$I->seeResponseIsJson(); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PaabgabeCept.php b/tests/codeception/tests/api/v1/PaabgabeCept.php index 38d6833e2..eb93b2cb1 100644 --- a/tests/codeception/tests/api/v1/PaabgabeCept.php +++ b/tests/codeception/tests/api/v1/PaabgabeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Paabgabe/Paabgabe", array("paabgabe_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PaabgabetypCept.php b/tests/codeception/tests/api/v1/PaabgabetypCept.php index 24daf1227..0c5985364 100644 --- a/tests/codeception/tests/api/v1/PaabgabetypCept.php +++ b/tests/codeception/tests/api/v1/PaabgabetypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Paabgabetyp/Paabgabetyp", array("paabgabetyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PersonfunktionstandortCept.php b/tests/codeception/tests/api/v1/PersonfunktionstandortCept.php index 94478b045..62dce84c2 100644 --- a/tests/codeception/tests/api/v1/PersonfunktionstandortCept.php +++ b/tests/codeception/tests/api/v1/PersonfunktionstandortCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Personfunktionstandort/Personfunktionstandort", array("personfunktionstandort_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PhraseCept.php b/tests/codeception/tests/api/v1/PhraseCept.php index 4bf6908b5..bec1d6a6e 100644 --- a/tests/codeception/tests/api/v1/PhraseCept.php +++ b/tests/codeception/tests/api/v1/PhraseCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/phrase/Phrase", array("phrase_id" => "1")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PreincomingCept.php b/tests/codeception/tests/api/v1/PreincomingCept.php index bd8449b22..680f6fb26 100644 --- a/tests/codeception/tests/api/v1/PreincomingCept.php +++ b/tests/codeception/tests/api/v1/PreincomingCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Preincoming/Preincoming", array("preincoming_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PreinteressentCept.php b/tests/codeception/tests/api/v1/PreinteressentCept.php index f17c75e52..259cd6c83 100644 --- a/tests/codeception/tests/api/v1/PreinteressentCept.php +++ b/tests/codeception/tests/api/v1/PreinteressentCept.php @@ -1,16 +1,18 @@ wantTo('Test API call v1/crm/preinteressent Preinteressent and PreinteressentByPersonID'); +$I->wantTo("Test API call v1/crm/preinteressent Preinteressent and PreinteressentByPersonID"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/crm/preinteressent/Preinteressent', array('preinteressent_id' => 1)); +$I->sendGET("v1/crm/preinteressent/Preinteressent", array("preinteressent_id" => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/crm/preinteressent/PreinteressentByPersonID', array('person_id' => 3)); +$I->sendGET("v1/crm/preinteressent/PreinteressentByPersonID", array("person_id" => 3)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PreinteressentstudiengangCept.php b/tests/codeception/tests/api/v1/PreinteressentstudiengangCept.php index 6e9687350..a906ea5d1 100644 --- a/tests/codeception/tests/api/v1/PreinteressentstudiengangCept.php +++ b/tests/codeception/tests/api/v1/PreinteressentstudiengangCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Preinteressentstudiengang/Preinteressentstudiengang", array("preinteressent_id" => "0", "studiengang_kz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PreoutgoingCept.php b/tests/codeception/tests/api/v1/PreoutgoingCept.php index e0f5d3960..d40d17bd6 100644 --- a/tests/codeception/tests/api/v1/PreoutgoingCept.php +++ b/tests/codeception/tests/api/v1/PreoutgoingCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Preoutgoing/Preoutgoing", array("preoutgoing_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PrestudentCept.php b/tests/codeception/tests/api/v1/PrestudentCept.php index 07343b933..b9d505ce0 100644 --- a/tests/codeception/tests/api/v1/PrestudentCept.php +++ b/tests/codeception/tests/api/v1/PrestudentCept.php @@ -1,16 +1,18 @@ wantTo('Test API call v1/crm/prestudent Prestudent and PrestudentByPersonID'); +$I->wantTo("Test API call v1/crm/prestudent Prestudent and PrestudentByPersonID"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/crm/prestudent/Prestudent', array('prestudent_id' => 1)); +$I->sendGET("v1/crm/prestudent/Prestudent", array("prestudent_id" => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/crm/prestudent/PrestudentByPersonID', array('person_id' => 3)); +$I->sendGET("v1/crm/prestudent/PrestudentByPersonID", array("person_id" => 3)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PrestudentstatusCept.php b/tests/codeception/tests/api/v1/PrestudentstatusCept.php index 2c31f76e6..de3735c38 100644 --- a/tests/codeception/tests/api/v1/PrestudentstatusCept.php +++ b/tests/codeception/tests/api/v1/PrestudentstatusCept.php @@ -9,8 +9,10 @@ $I->sendGET("v1/crm/Prestudentstatus/Prestudentstatus", array("ausbildungssemest $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); $I->seeResponseContainsJson(["error" => 0]); +$I->wait(); $I->sendGET("v1/crm/Prestudentstatus/LastStatus", array("prestudent_id" => 3)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjektCept.php b/tests/codeception/tests/api/v1/ProjektCept.php index bcc8f33d4..c1fb1d4f8 100644 --- a/tests/codeception/tests/api/v1/ProjektCept.php +++ b/tests/codeception/tests/api/v1/ProjektCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Projekt/Projekt", array("projekt_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Projekt_ressourceCept.php b/tests/codeception/tests/api/v1/Projekt_ressourceCept.php index 9a5bcc56d..fc2544ab3 100644 --- a/tests/codeception/tests/api/v1/Projekt_ressourceCept.php +++ b/tests/codeception/tests/api/v1/Projekt_ressourceCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Projekt_ressource/Projekt_ressource", array("projekt_ressource_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjektarbeitCept.php b/tests/codeception/tests/api/v1/ProjektarbeitCept.php index 6627057b6..acf43fe21 100644 --- a/tests/codeception/tests/api/v1/ProjektarbeitCept.php +++ b/tests/codeception/tests/api/v1/ProjektarbeitCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Projektarbeit/Projektarbeit", array("projektarbeit_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjektbetreuerCept.php b/tests/codeception/tests/api/v1/ProjektbetreuerCept.php index d6b996126..6886120b0 100644 --- a/tests/codeception/tests/api/v1/ProjektbetreuerCept.php +++ b/tests/codeception/tests/api/v1/ProjektbetreuerCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Projektbetreuer/Projektbetreuer", array("betreuerart_kurzbz" => "0", "projektarbeit_id" => "0", "person_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjektphaseCept.php b/tests/codeception/tests/api/v1/ProjektphaseCept.php index f14e76261..cf44f55c3 100644 --- a/tests/codeception/tests/api/v1/ProjektphaseCept.php +++ b/tests/codeception/tests/api/v1/ProjektphaseCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Projektphase/Projektphase", array("projektphase_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjekttaskCept.php b/tests/codeception/tests/api/v1/ProjekttaskCept.php index a46eeb185..f0b748cad 100644 --- a/tests/codeception/tests/api/v1/ProjekttaskCept.php +++ b/tests/codeception/tests/api/v1/ProjekttaskCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Projekttask/Projekttask", array("projekttask_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ProjekttypCept.php b/tests/codeception/tests/api/v1/ProjekttypCept.php index 8a2ab0862..e0473d3f3 100644 --- a/tests/codeception/tests/api/v1/ProjekttypCept.php +++ b/tests/codeception/tests/api/v1/ProjekttypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Projekttyp/Projekttyp", array("projekttyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PrueflingCept.php b/tests/codeception/tests/api/v1/PrueflingCept.php index 95bc5b641..306bce7d6 100644 --- a/tests/codeception/tests/api/v1/PrueflingCept.php +++ b/tests/codeception/tests/api/v1/PrueflingCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Pruefling/Pruefling", array("pruefling_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungCept.php b/tests/codeception/tests/api/v1/PruefungCept.php index b3aa808e9..46475a1f8 100644 --- a/tests/codeception/tests/api/v1/PruefungCept.php +++ b/tests/codeception/tests/api/v1/PruefungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Pruefung/Pruefung", array("pruefung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungsanmeldungCept.php b/tests/codeception/tests/api/v1/PruefungsanmeldungCept.php index 2d08a28c0..8b7e9de3d 100644 --- a/tests/codeception/tests/api/v1/PruefungsanmeldungCept.php +++ b/tests/codeception/tests/api/v1/PruefungsanmeldungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Pruefungsanmeldung/Pruefungsanmeldung", array("pruefungsanmeldung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungsfensterCept.php b/tests/codeception/tests/api/v1/PruefungsfensterCept.php index a4448199a..0bb5d7229 100644 --- a/tests/codeception/tests/api/v1/PruefungsfensterCept.php +++ b/tests/codeception/tests/api/v1/PruefungsfensterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Pruefungsfenster/Pruefungsfenster", array("pruefungsfenster_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungsstatusCept.php b/tests/codeception/tests/api/v1/PruefungsstatusCept.php index a90637753..d644c59ed 100644 --- a/tests/codeception/tests/api/v1/PruefungsstatusCept.php +++ b/tests/codeception/tests/api/v1/PruefungsstatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/pruefungsstatus/Pruefungsstatus", array("status_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungsterminCept.php b/tests/codeception/tests/api/v1/PruefungsterminCept.php index 92ac71544..cf8f793af 100644 --- a/tests/codeception/tests/api/v1/PruefungsterminCept.php +++ b/tests/codeception/tests/api/v1/PruefungsterminCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Pruefungstermin/Pruefungstermin", array("pruefungstermin_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/PruefungstypCept.php b/tests/codeception/tests/api/v1/PruefungstypCept.php index 81af9d187..60b0f16e2 100644 --- a/tests/codeception/tests/api/v1/PruefungstypCept.php +++ b/tests/codeception/tests/api/v1/PruefungstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Pruefungstyp/Pruefungstyp", array("pruefungstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RaumtypCept.php b/tests/codeception/tests/api/v1/RaumtypCept.php index d4fac70cf..1af186603 100644 --- a/tests/codeception/tests/api/v1/RaumtypCept.php +++ b/tests/codeception/tests/api/v1/RaumtypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Raumtyp/Raumtyp", array("raumtyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RechnungCept.php b/tests/codeception/tests/api/v1/RechnungCept.php index 98ba8687f..ce8517eb0 100644 --- a/tests/codeception/tests/api/v1/RechnungCept.php +++ b/tests/codeception/tests/api/v1/RechnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Rechnung/Rechnung", array("rechnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RechnungsbetragCept.php b/tests/codeception/tests/api/v1/RechnungsbetragCept.php index d954363b2..1f40823c1 100644 --- a/tests/codeception/tests/api/v1/RechnungsbetragCept.php +++ b/tests/codeception/tests/api/v1/RechnungsbetragCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Rechnungsbetrag/Rechnungsbetrag", array("rechnungsbetrag_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RechnungstypCept.php b/tests/codeception/tests/api/v1/RechnungstypCept.php index be2a77218..ec76d9922 100644 --- a/tests/codeception/tests/api/v1/RechnungstypCept.php +++ b/tests/codeception/tests/api/v1/RechnungstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Rechnungstyp/Rechnungstyp", array("rechnungstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ReihungstestCept.php b/tests/codeception/tests/api/v1/ReihungstestCept.php index 9959115ad..39b7bbf2f 100644 --- a/tests/codeception/tests/api/v1/ReihungstestCept.php +++ b/tests/codeception/tests/api/v1/ReihungstestCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Reihungstest/Reihungstest", array("reihungstest_id" => "0", "studiengang_kz" => "0", "studiensemester_kurzbz" => "0", "person_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ReservierungCept.php b/tests/codeception/tests/api/v1/ReservierungCept.php index 31c82e659..c14a6bc63 100644 --- a/tests/codeception/tests/api/v1/ReservierungCept.php +++ b/tests/codeception/tests/api/v1/ReservierungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Reservierung/Reservierung", array("reservierung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RessourceCept.php b/tests/codeception/tests/api/v1/RessourceCept.php index 426911e56..875edd7cc 100644 --- a/tests/codeception/tests/api/v1/RessourceCept.php +++ b/tests/codeception/tests/api/v1/RessourceCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/Ressource/Ressource", array("ressource_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ResturlaubCept.php b/tests/codeception/tests/api/v1/ResturlaubCept.php index 8fdb4e371..e3c464e5b 100644 --- a/tests/codeception/tests/api/v1/ResturlaubCept.php +++ b/tests/codeception/tests/api/v1/ResturlaubCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Resturlaub/Resturlaub", array("resturlaub_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RolleCept.php b/tests/codeception/tests/api/v1/RolleCept.php index ddbb2874a..2d4b65f1a 100644 --- a/tests/codeception/tests/api/v1/RolleCept.php +++ b/tests/codeception/tests/api/v1/RolleCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Rolle/Rolle", array("rolle_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/RolleberechtigungCept.php b/tests/codeception/tests/api/v1/RolleberechtigungCept.php index f4c2ee79e..0e2c1dceb 100644 --- a/tests/codeception/tests/api/v1/RolleberechtigungCept.php +++ b/tests/codeception/tests/api/v1/RolleberechtigungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Rolleberechtigung/Rolleberechtigung", array("rolle_kurzbz" => "0", "berechtigung_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ScrumsprintCept.php b/tests/codeception/tests/api/v1/ScrumsprintCept.php index 42b3f4b9c..5bb8f9e04 100644 --- a/tests/codeception/tests/api/v1/ScrumsprintCept.php +++ b/tests/codeception/tests/api/v1/ScrumsprintCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/scrumsprint/Scrumsprint", array("scrumsprint_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ScrumteamCept.php b/tests/codeception/tests/api/v1/ScrumteamCept.php index 4fb373724..117e245bd 100644 --- a/tests/codeception/tests/api/v1/ScrumteamCept.php +++ b/tests/codeception/tests/api/v1/ScrumteamCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/project/scrumteam/Scrumteam", array("scrumteam_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/SemesterwochenCept.php b/tests/codeception/tests/api/v1/SemesterwochenCept.php index f17faffb3..f905c1167 100644 --- a/tests/codeception/tests/api/v1/SemesterwochenCept.php +++ b/tests/codeception/tests/api/v1/SemesterwochenCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Semesterwochen/Semesterwochen", array("studiengang_kz" => "0", "semester" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ServerCept.php b/tests/codeception/tests/api/v1/ServerCept.php index 53e09c574..7b019865e 100644 --- a/tests/codeception/tests/api/v1/ServerCept.php +++ b/tests/codeception/tests/api/v1/ServerCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Server/Server", array("server_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ServiceCept.php b/tests/codeception/tests/api/v1/ServiceCept.php index 0f3bab9bc..d52826a1d 100644 --- a/tests/codeception/tests/api/v1/ServiceCept.php +++ b/tests/codeception/tests/api/v1/ServiceCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Service/Service", array("service_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/SpracheCept.php b/tests/codeception/tests/api/v1/SpracheCept.php index a29bb56ba..5cb44d11a 100644 --- a/tests/codeception/tests/api/v1/SpracheCept.php +++ b/tests/codeception/tests/api/v1/SpracheCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/sprache/Sprache", array("sprache" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StandortCept.php b/tests/codeception/tests/api/v1/StandortCept.php index 354d7d0f4..35d6fd304 100644 --- a/tests/codeception/tests/api/v1/StandortCept.php +++ b/tests/codeception/tests/api/v1/StandortCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Standort/Standort", array("standort_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StatistikCept.php b/tests/codeception/tests/api/v1/StatistikCept.php index b820609b9..bbfaf4690 100644 --- a/tests/codeception/tests/api/v1/StatistikCept.php +++ b/tests/codeception/tests/api/v1/StatistikCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Statistik/Statistik", array("statistik_kurzbz" => "0", "order" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StatistiksCept.php b/tests/codeception/tests/api/v1/StatistiksCept.php index 110e642fd..11f5cbe4e 100644 --- a/tests/codeception/tests/api/v1/StatistiksCept.php +++ b/tests/codeception/tests/api/v1/StatistiksCept.php @@ -1,21 +1,24 @@ wantTo('Test API call v1/organisation/statistik statistik, All and MenueArray'); +$I->wantTo("Test API call v1/organisation/statistik statistik, All and MenueArray"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/organisation/statistik/Statistik', array('statistik_kurzbz' => 'Stromanalyse')); +$I->sendGET("v1/organisation/statistik/Statistik", array("statistik_kurzbz" => "Stromanalyse")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/statistik/All'); +$I->sendGET("v1/organisation/statistik/All"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/statistik/MenueArray'); +$I->sendGET("v1/organisation/statistik/MenueArray"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StatusCept.php b/tests/codeception/tests/api/v1/StatusCept.php index 9e96b1b5a..00b671522 100644 --- a/tests/codeception/tests/api/v1/StatusCept.php +++ b/tests/codeception/tests/api/v1/StatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Status/Status", array("status_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudentCept.php b/tests/codeception/tests/api/v1/StudentCept.php index 1d2ef3ea1..204338981 100644 --- a/tests/codeception/tests/api/v1/StudentCept.php +++ b/tests/codeception/tests/api/v1/StudentCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/crm/Student/Student", array("student_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudentbeispielCept.php b/tests/codeception/tests/api/v1/StudentbeispielCept.php index 1048cd37d..6d774f17c 100644 --- a/tests/codeception/tests/api/v1/StudentbeispielCept.php +++ b/tests/codeception/tests/api/v1/StudentbeispielCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Studentbeispiel/Studentbeispiel", array("beispiel_id" => "0", "student_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudentlehrverbandCept.php b/tests/codeception/tests/api/v1/StudentlehrverbandCept.php index 1ccc9d3c8..950701bc5 100644 --- a/tests/codeception/tests/api/v1/StudentlehrverbandCept.php +++ b/tests/codeception/tests/api/v1/StudentlehrverbandCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Studentlehrverband/Studentlehrverband", array("studiensemester_kurzbz" => "0", "student_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudentuebungCept.php b/tests/codeception/tests/api/v1/StudentuebungCept.php index 8c1451324..08d8fd102 100644 --- a/tests/codeception/tests/api/v1/StudentuebungCept.php +++ b/tests/codeception/tests/api/v1/StudentuebungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Studentuebung/Studentuebung", array("uebung_id" => "0", "student_uid" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudiengangCept.php b/tests/codeception/tests/api/v1/StudiengangCept.php index f6e100bf1..763597d13 100644 --- a/tests/codeception/tests/api/v1/StudiengangCept.php +++ b/tests/codeception/tests/api/v1/StudiengangCept.php @@ -1,16 +1,18 @@ wantTo('Test API call v1/organisation/studiengang Studiengang and AllForBewerbung'); +$I->wantTo("Test API call v1/organisation/studiengang Studiengang and AllForBewerbung"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/organisation/studiengang/Studiengang', array('studiengang_kz' => 1)); +$I->sendGET("v1/organisation/studiengang/Studiengang", array("studiengang_kz" => 1)); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiengang/AllForBewerbung'); +$I->sendGET("v1/organisation/studiengang/AllForBewerbung"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudiengangstypCept.php b/tests/codeception/tests/api/v1/StudiengangstypCept.php index c10ae7bf4..d5f12311d 100644 --- a/tests/codeception/tests/api/v1/StudiengangstypCept.php +++ b/tests/codeception/tests/api/v1/StudiengangstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Studiengangstyp/Studiengangstyp", array("typ" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudienjahrCept.php b/tests/codeception/tests/api/v1/StudienjahrCept.php index dcc707169..0b19e85ab 100644 --- a/tests/codeception/tests/api/v1/StudienjahrCept.php +++ b/tests/codeception/tests/api/v1/StudienjahrCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Studienjahr/Studienjahr", array("studienjahr_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudienordnungCept.php b/tests/codeception/tests/api/v1/StudienordnungCept.php index 49d4307da..4932f9e6f 100644 --- a/tests/codeception/tests/api/v1/StudienordnungCept.php +++ b/tests/codeception/tests/api/v1/StudienordnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Studienordnung/Studienordnung", array("studienordnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudienordnungstatusCept.php b/tests/codeception/tests/api/v1/StudienordnungstatusCept.php index 75887ce69..7da110dcf 100644 --- a/tests/codeception/tests/api/v1/StudienordnungstatusCept.php +++ b/tests/codeception/tests/api/v1/StudienordnungstatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Studienordnungstatus/Studienordnungstatus", array("status_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudienplatzCept.php b/tests/codeception/tests/api/v1/StudienplatzCept.php index 112adb2db..5f5124069 100644 --- a/tests/codeception/tests/api/v1/StudienplatzCept.php +++ b/tests/codeception/tests/api/v1/StudienplatzCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/organisation/Studienplatz/Studienplatz", array("studienplatz_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StudiensemesterCept.php b/tests/codeception/tests/api/v1/StudiensemesterCept.php index 91f760af1..ef0e611ff 100644 --- a/tests/codeception/tests/api/v1/StudiensemesterCept.php +++ b/tests/codeception/tests/api/v1/StudiensemesterCept.php @@ -1,81 +1,96 @@ wantTo('Test API call to all v1/organisation/studiensemester methods'); +$I->wantTo("Test API call to all v1/organisation/studiensemester methods"); $I->amHttpAuthenticated("admin", "1q2w3"); -$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org'); +$I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); -$I->sendGET('v1/organisation/studiensemester/Studiensemester', array('studiensemester_kurzbz' => 'WS2016')); +$I->sendGET("v1/organisation/studiensemester/Studiensemester", array("studiensemester_kurzbz" => "WS2016")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/NextStudiensemester'); +$I->sendGET("v1/organisation/studiensemester/NextStudiensemester"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/NextStudiensemester', array('art' => 'WS')); +$I->sendGET("v1/organisation/studiensemester/NextStudiensemester", array("art" => "WS")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/All'); +$I->sendGET("v1/organisation/studiensemester/All"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Akt'); +$I->sendGET("v1/organisation/studiensemester/Akt"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/AktNext', array('semester' => '1')); +$I->sendGET("v1/organisation/studiensemester/AktNext", array("semester" => "1")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/AktNext', array('semester' => '2')); +$I->sendGET("v1/organisation/studiensemester/AktNext", array("semester" => "2")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/LastOrAktSemester'); +$I->sendGET("v1/organisation/studiensemester/LastOrAktSemester"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/LastOrAktSemester', array('days' => '1024')); +$I->sendGET("v1/organisation/studiensemester/LastOrAktSemester", array("days" => "1024")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/NextFrom', array('studiensemester_kurzbz' => 'WS2015')); +$I->sendGET("v1/organisation/studiensemester/NextFrom", array("studiensemester_kurzbz" => "WS2015")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Previous'); +$I->sendGET("v1/organisation/studiensemester/Previous"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Nearest', array('studiensemester_kurzbz' => 'WS2015')); +$I->sendGET("v1/organisation/studiensemester/Nearest", array("studiensemester_kurzbz" => "WS2015")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Finished'); +$I->sendGET("v1/organisation/studiensemester/Finished"); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Finished', array('limit' => '3')); +$I->sendGET("v1/organisation/studiensemester/Finished", array("limit" => "3")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); -$I->sendGET('v1/organisation/studiensemester/Timestamp', array('studiensemester_kurzbz' => 'WS2015')); +$I->sendGET("v1/organisation/studiensemester/Timestamp", array("studiensemester_kurzbz" => "WS2015")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(['error' => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StundeCept.php b/tests/codeception/tests/api/v1/StundeCept.php index c5908f35b..d49c148d2 100644 --- a/tests/codeception/tests/api/v1/StundeCept.php +++ b/tests/codeception/tests/api/v1/StundeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Stunde/Stunde", array("stunde" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StundenplanCept.php b/tests/codeception/tests/api/v1/StundenplanCept.php index d5218a5cc..a5b018867 100644 --- a/tests/codeception/tests/api/v1/StundenplanCept.php +++ b/tests/codeception/tests/api/v1/StundenplanCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Stundenplan/Stundenplan", array("stundenplan_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/StundenplandevCept.php b/tests/codeception/tests/api/v1/StundenplandevCept.php index 3b343aa8c..bc4a53b4c 100644 --- a/tests/codeception/tests/api/v1/StundenplandevCept.php +++ b/tests/codeception/tests/api/v1/StundenplandevCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Stundenplandev/Stundenplandev", array("stundenplandev_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/TagCept.php b/tests/codeception/tests/api/v1/TagCept.php index 0889325eb..0e91b5ff2 100644 --- a/tests/codeception/tests/api/v1/TagCept.php +++ b/tests/codeception/tests/api/v1/TagCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Tag/Tag", array("tag" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/TemplateCept.php b/tests/codeception/tests/api/v1/TemplateCept.php index 4d0e814c0..0c18ec013 100644 --- a/tests/codeception/tests/api/v1/TemplateCept.php +++ b/tests/codeception/tests/api/v1/TemplateCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Template/Template", array("template_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Thread.php b/tests/codeception/tests/api/v1/Thread.php index faa49d7c2..88d8eef24 100644 --- a/tests/codeception/tests/api/v1/Thread.php +++ b/tests/codeception/tests/api/v1/Thread.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/thread/Thread", array("thread_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/Uebung.php b/tests/codeception/tests/api/v1/Uebung.php index 5cb3c63ad..823d3cb12 100644 --- a/tests/codeception/tests/api/v1/Uebung.php +++ b/tests/codeception/tests/api/v1/Uebung.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Uebung/Uebung", array("uebung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VariableCept.php b/tests/codeception/tests/api/v1/VariableCept.php index a32b9538d..f5a2f9f5b 100644 --- a/tests/codeception/tests/api/v1/VariableCept.php +++ b/tests/codeception/tests/api/v1/VariableCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Variable/Variable", array("uid" => "0", "name" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VeranstaltungCept.php b/tests/codeception/tests/api/v1/VeranstaltungCept.php index c7bf63c51..4cfd95aa7 100644 --- a/tests/codeception/tests/api/v1/VeranstaltungCept.php +++ b/tests/codeception/tests/api/v1/VeranstaltungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Veranstaltung/Veranstaltung", array("veranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VeranstaltungskategorieCept.php b/tests/codeception/tests/api/v1/VeranstaltungskategorieCept.php index 6a6e4c504..206411d36 100644 --- a/tests/codeception/tests/api/v1/VeranstaltungskategorieCept.php +++ b/tests/codeception/tests/api/v1/VeranstaltungskategorieCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/content/Veranstaltungskategorie/Veranstaltungskategorie", array("veranstaltungskategorie_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VertragCept.php b/tests/codeception/tests/api/v1/VertragCept.php index bf3a6a879..be52bc754 100644 --- a/tests/codeception/tests/api/v1/VertragCept.php +++ b/tests/codeception/tests/api/v1/VertragCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Vertrag/Vertrag", array("vertrag_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VertragsstatusCept.php b/tests/codeception/tests/api/v1/VertragsstatusCept.php index 7ecc2b4ed..bcd766a04 100644 --- a/tests/codeception/tests/api/v1/VertragsstatusCept.php +++ b/tests/codeception/tests/api/v1/VertragsstatusCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Vertragsstatus/Vertragsstatus", array("vertragsstatus_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VertragstypCept.php b/tests/codeception/tests/api/v1/VertragstypCept.php index b0a30f7db..010c615d7 100644 --- a/tests/codeception/tests/api/v1/VertragstypCept.php +++ b/tests/codeception/tests/api/v1/VertragstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Vertragstyp/Vertragstyp", array("vertragstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VerwendungCept.php b/tests/codeception/tests/api/v1/VerwendungCept.php index 1794f2e18..0b7d57220 100644 --- a/tests/codeception/tests/api/v1/VerwendungCept.php +++ b/tests/codeception/tests/api/v1/VerwendungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Verwendung/Verwendung", array("verwendung_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VorlageCept.php b/tests/codeception/tests/api/v1/VorlageCept.php index 02f550f52..b264df56e 100644 --- a/tests/codeception/tests/api/v1/VorlageCept.php +++ b/tests/codeception/tests/api/v1/VorlageCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Vorlage/Vorlage", array("vorlage_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VorlagestudiengangCept.php b/tests/codeception/tests/api/v1/VorlagestudiengangCept.php index 53efc7e55..abf3fec54 100644 --- a/tests/codeception/tests/api/v1/VorlagestudiengangCept.php +++ b/tests/codeception/tests/api/v1/VorlagestudiengangCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Vorlagestudiengang/Vorlagestudiengang", array("vorlagestudiengang_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/VorschlagCept.php b/tests/codeception/tests/api/v1/VorschlagCept.php index d103d0135..f44214299 100644 --- a/tests/codeception/tests/api/v1/VorschlagCept.php +++ b/tests/codeception/tests/api/v1/VorschlagCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/testtool/Vorschlag/Vorschlag", array("vorschlag_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/WebservicelogCept.php b/tests/codeception/tests/api/v1/WebservicelogCept.php index 236449e82..5116e69c9 100644 --- a/tests/codeception/tests/api/v1/WebservicelogCept.php +++ b/tests/codeception/tests/api/v1/WebservicelogCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Webservicelog/Webservicelog", array("webservicelog_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/WebservicerechtCept.php b/tests/codeception/tests/api/v1/WebservicerechtCept.php index 0e919ab5a..97c2841ca 100644 --- a/tests/codeception/tests/api/v1/WebservicerechtCept.php +++ b/tests/codeception/tests/api/v1/WebservicerechtCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Webservicerecht/Webservicerecht", array("webservicerecht_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/WebservicetypCept.php b/tests/codeception/tests/api/v1/WebservicetypCept.php index e7957bf96..53d47e5d0 100644 --- a/tests/codeception/tests/api/v1/WebservicetypCept.php +++ b/tests/codeception/tests/api/v1/WebservicetypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/system/Webservicetyp/Webservicetyp", array("webservicetyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZahlungstypCept.php b/tests/codeception/tests/api/v1/ZahlungstypCept.php index c5a91df9c..e22ef0c68 100644 --- a/tests/codeception/tests/api/v1/ZahlungstypCept.php +++ b/tests/codeception/tests/api/v1/ZahlungstypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/accounting/Zahlungstyp/Zahlungstyp", array("zahlungstyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeitaufzeichnungCept.php b/tests/codeception/tests/api/v1/ZeitaufzeichnungCept.php index bc34409a9..7b583e431 100644 --- a/tests/codeception/tests/api/v1/ZeitaufzeichnungCept.php +++ b/tests/codeception/tests/api/v1/ZeitaufzeichnungCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Zeitaufzeichnung/Zeitaufzeichnung", array("zeitaufzeichnung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeitfensterCept.php b/tests/codeception/tests/api/v1/ZeitfensterCept.php index 5024bb510..8b43a85ce 100644 --- a/tests/codeception/tests/api/v1/ZeitfensterCept.php +++ b/tests/codeception/tests/api/v1/ZeitfensterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Zeitfenster/Zeitfenster", array("wochentag" => "0", "studiengang_kz" => "0", "ort_kurzbz" => "0", "stunde" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeitsperreCept.php b/tests/codeception/tests/api/v1/ZeitsperreCept.php index 8b3becaa1..6e951b5da 100644 --- a/tests/codeception/tests/api/v1/ZeitsperreCept.php +++ b/tests/codeception/tests/api/v1/ZeitsperreCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Zeitsperre/Zeitsperre", array("zeitsperre_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeitsperretypCept.php b/tests/codeception/tests/api/v1/ZeitsperretypCept.php index 49608a811..42591f7df 100644 --- a/tests/codeception/tests/api/v1/ZeitsperretypCept.php +++ b/tests/codeception/tests/api/v1/ZeitsperretypCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Zeitsperretyp/Zeitsperretyp", array("zeitsperretyp_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeitwunschCept.php b/tests/codeception/tests/api/v1/ZeitwunschCept.php index 9f9fae25a..7daec3387 100644 --- a/tests/codeception/tests/api/v1/ZeitwunschCept.php +++ b/tests/codeception/tests/api/v1/ZeitwunschCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/ressource/Zeitwunsch/Zeitwunsch", array("tag" => "0", "mitarbeiter_uid" => "0", "stunde" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeugnisCept.php b/tests/codeception/tests/api/v1/ZeugnisCept.php index f4f089cc4..ad7d38ba4 100644 --- a/tests/codeception/tests/api/v1/ZeugnisCept.php +++ b/tests/codeception/tests/api/v1/ZeugnisCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Zeugnis/Zeugnis", array("zeugnis_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZeugnisnoteCept.php b/tests/codeception/tests/api/v1/ZeugnisnoteCept.php index 1cd9e42a1..92ec630ff 100644 --- a/tests/codeception/tests/api/v1/ZeugnisnoteCept.php +++ b/tests/codeception/tests/api/v1/ZeugnisnoteCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/education/Zeugnisnote/Zeugnisnote", array("studiensemester_kurzbz" => "0", "student_uid" => "0", "lehrveranstaltung_id" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZgvCept.php b/tests/codeception/tests/api/v1/ZgvCept.php index 1d23ca1e9..2417e5ac4 100644 --- a/tests/codeception/tests/api/v1/ZgvCept.php +++ b/tests/codeception/tests/api/v1/ZgvCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Zgv/Zgv", array("zgv_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZgvdoktorCept.php b/tests/codeception/tests/api/v1/ZgvdoktorCept.php index 134a4ef20..6d8989207 100644 --- a/tests/codeception/tests/api/v1/ZgvdoktorCept.php +++ b/tests/codeception/tests/api/v1/ZgvdoktorCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Zgvdoktor/Zgvdoktor", array("zgvdoktor_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZgvgruppeCept.php b/tests/codeception/tests/api/v1/ZgvgruppeCept.php index 20ef1c5a2..b8ea33134 100644 --- a/tests/codeception/tests/api/v1/ZgvgruppeCept.php +++ b/tests/codeception/tests/api/v1/ZgvgruppeCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Zgvgruppe/Zgvgruppe", array("gruppe_kurzbz" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZgvmasterCept.php b/tests/codeception/tests/api/v1/ZgvmasterCept.php index b7fda5c59..3a2c8a86f 100644 --- a/tests/codeception/tests/api/v1/ZgvmasterCept.php +++ b/tests/codeception/tests/api/v1/ZgvmasterCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Zgvmaster/Zgvmaster", array("zgvmas_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/tests/codeception/tests/api/v1/ZweckCept.php b/tests/codeception/tests/api/v1/ZweckCept.php index 0bdde12a0..fcfac9261 100644 --- a/tests/codeception/tests/api/v1/ZweckCept.php +++ b/tests/codeception/tests/api/v1/ZweckCept.php @@ -8,4 +8,5 @@ $I->haveHttpHeader("FHC-API-KEY", "testapikey@fhcomplete.org"); $I->sendGET("v1/codex/Zweck/Zweck", array("zweck_code" => "0")); $I->seeResponseCodeIs(200); $I->seeResponseIsJson(); -$I->seeResponseContainsJson(["error" => 0]); \ No newline at end of file +$I->seeResponseContainsJson(["error" => 0]); +$I->wait(); \ No newline at end of file diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php index 5da26c393..f1979fe6e 100644 --- a/vilesci/stammdaten/reihungstestverwaltung.php +++ b/vilesci/stammdaten/reihungstestverwaltung.php @@ -1286,6 +1286,10 @@ else echo ' '; echo ''; } + else + { + echo 'Keine Berechtigung zum zuteilen von Räumen'; + } foreach ($orte->result AS $row) { //echo ' '; diff --git a/vilesci/stammdaten/studiensemester.php b/vilesci/stammdaten/studiensemester.php new file mode 100644 index 000000000..abcda73a2 --- /dev/null +++ b/vilesci/stammdaten/studiensemester.php @@ -0,0 +1,334 @@ + + * Andreas Oesterreicher < andreas.oesterreicher@technikum-wien.at > + * Rudolf Hangl < rudolf.hangl@technikum-wien.at > + * Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at > + * Manfred Kindl + */ +/** + * Studiensemesterverwaltung + * + */ + require_once('../../config/vilesci.config.inc.php'); + require_once('../../include/functions.inc.php'); + require_once('../../include/datum.class.php'); + require_once('../../include/benutzerberechtigung.class.php'); + require_once('../../include/studiensemester.class.php'); + + if (!$db = new basis_db()) + die('Es konnte keine Verbindung zum Server aufgebaut werden.'); + + $user = get_uid(); + $datum_obj = new datum(); + $action = (isset($_GET['action'])?$_GET['action']:''); + $studiensemester_kurzbz=(isset($_REQUEST['studiensemester_kurzbz'])?$_REQUEST['studiensemester_kurzbz']:''); + $von = (isset($_POST['vondatum'])?$_POST['vondatum']:date('d.m.Y')); + $bis = (isset($_POST['bisdatum'])?$_POST['bisdatum']:date('d.m.Y')); + + $rechte = new benutzerberechtigung(); + $rechte->getBerechtigungen($user); + + if(!$rechte->isBerechtigt('admin')) + die($rechte->errormsg); + + $studiensemester = new studiensemester(); + $studiensemester->getAll(); + + echo ' + + + Studiensemesterverwaltung + + + + + + + + + +

Studiensemesterverwaltung

'; + + // Speichern eines Studiensemesters + if(isset($_GET['speichern'])) + { + + if(!$rechte->isBerechtigt('admin')) + { + die($rechte->errormsg); + } + + $studiensemester = new studiensemester(); + + if(isset($_POST['studiensemester_kurzbz']) && $_POST['studiensemester_kurzbz']!='' && $_GET['speichern']!='neu') + { + //Studiensemester laden + if(!$studiensemester->load($_POST['studiensemester_kurzbz'])) + { + die($studiensemester->errormsg); + } + + $studiensemester->new=false; + $studiensemester->studiensemester_kurzbz = $_POST['studiensemester_kurzbz']; + } + else + { + //Neues Studiensemester anlegen + $studiensemester->new=true; + } + + $studiensemester->studiensemester_kurzbz = $_POST['studiensemester_kurzbz']; + $studiensemester->start = $_POST['start']; + $studiensemester->ende = $_POST['ende']; + $startS = substr($studiensemester->start, 8, 9).'-'.substr($studiensemester->start, 5, 2).'-'.substr($studiensemester->start, 0, 4); + $endeS = substr($studiensemester->ende, 8, 9).'-'.substr($studiensemester->ende, 5, 2).'-'.substr($studiensemester->ende, 0, 4); + $timestampStart = strtotime($startS); + $timestampEnde = strtotime($endeS); + if ($timestampEnde - $timestampStart <= 0) { + echo 'Das Enddatum darf nicht vor dem Startdatum sein
'; + } else { + $studiensemester->bezeichnung = $_POST['bezeichnung']; + $studiensemester->studienjahr_kurzbz = $_POST['studienjahr_kurzbz']; + $studiensemester->beschreibung = $_POST['beschreibung']; + if (isset($_POST['onlinebewerbung'])) { + $studiensemester->onlinebewerbung = true; + } else { + $studiensemester->onlinebewerbung = false; + } + //$studiensemester->onlinebewerbung = $_POST['onlinebewerbung']; + + if($studiensemester->save()) + { + echo 'Daten wurden erfolgreich gespeichert'; + } + else + { + echo ''.$db->convert_html_chars($studiensemester->errormsg).''; + } + echo "
"; + } + } + + /* + //Dropdown Auswahl Studiengang + $studiensemester = new Studiensemester(); + $studiensemester->getAll('DESC'); + + echo "'; + */ + + echo "

Neu

"; + + //Studiensemester bearbeiten + if ($studiensemester_kurzbz != '' && !isset($_GET['speichern'])) { + $studiensemester = new Studiensemester(); + $studiensemester->load($studiensemester_kurzbz); + $checked = $studiensemester->onlinebewerbung=='t'?"checked":""; + + //Neues Studiensemester eintragen disabled + echo '
+ + + + + + + + + + + + + + + + + + + + + + +
Studiensemester_kurzbz
Start
Ende
Bezeichnung
Studienjahr_kurzbz
Beschreibung
Onlinebewerbung
+ + +
'; + echo "

Bearbeiten

"; + //Studiensemester bearbeiten enabled + echo '
+ + + + + + + + + + + + + + + + + + + + + + +
Studiensemester_kurzbz
Start
Ende
Bezeichnung
Studienjahr_kurzbz
Beschreibung
Onlinebewerbung
+ + + +
'; + } else { + //Neues Studiensemester eintragen enabled + echo '
+ + + + + + + + + + + + + + + + + + + + + + +
Studiensemester_kurzbz
Start
Ende
Bezeichnung
Studienjahr_kurzbz
Beschreibung
Onlinebewerbung
+ +
'; + echo "

Bearbeiten

"; + //Studiensemester bearbeiten disabled + echo '
+ + + + + + + + + + + + + + + + + + + + + + +
Studiensemester_kurzbz
Start
Ende
Bezeichnung
Studienjahr_kurzbz
Beschreibung
Onlinebewerbung
+ + + +
'; + } + echo "
"; + echo '
'; + + + //Liste der eingetragenen Studiensemester + $studiensemester = new Studiensemester(); + $studiensemester->getAll('DESC'); + + echo " + + + + + + + + + + + + + "; + foreach ($studiensemester->studiensemester as $row) + { + echo " + + + + + + + + + "; + } + echo "
Studiensemester_kurzbzStartEndeBezeichnungStudienjahr_kurzbzBeschreibungOnlinebewerbung
".$row->studiensemester_kurzbz."".$row->start."".$row->ende."".$row->bezeichnung."".$row->studienjahr_kurzbz."".$row->beschreibung."";if ($row->onlinebewerbung=='t') { echo ''; } else { echo ''; } echo "studiensemester_kurzbz."\">edit
"; + + + + echo "
"; + echo ' + + '; +?>