blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging time

Browse Source
This commit is contained in:
paolo
2016-04-27 12:04:42 +02:00
parent 549b0133c2
commit 546483bed7
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/config.php
+1 -1
View File
@@ -514,4 +514,4 @@ spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
require_once $file;
});
});
tests/codeception/_data/dump.sql
+5 -9
View File
@@ -1,10 +1,10 @@
-- EMPTY public.tbl_person
DELETE FROM public.tbl_person WHERE person_id > 2;
-- INSERT Persons (public.tbl_person)
INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '4ffd30cc58718', false);
INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'bd94ef5d5a', false);
INSERT INTO public.tbl_person VALUES (5, NULL, NULL, NULL, NULL, NULL, NULL, 'Harvey', 'Joshuah', 'Halie', '1930-01-18', 'Mitchellville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.634179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (6, NULL, NULL, NULL, NULL, NULL, NULL, 'Kessler', 'Neil', 'Dashawn', '1948-06-10', 'Anitafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.63728', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567A', false);
INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567B', false);
INSERT INTO public.tbl_person VALUES (5, NULL, NULL, NULL, NULL, NULL, NULL, 'Harvey', 'Joshuah', 'Halie', '1930-01-18', 'Mitchellville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.634179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567C', false);
INSERT INTO public.tbl_person VALUES (6, NULL, NULL, NULL, NULL, NULL, NULL, 'Kessler', 'Neil', 'Dashawn', '1948-06-10', 'Anitafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.63728', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567D', false);
INSERT INTO public.tbl_person VALUES (7, NULL, NULL, NULL, NULL, NULL, NULL, 'Little', 'Marvin', 'Hassie', '1933-11-14', 'Chayatown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.641078', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (8, NULL, NULL, NULL, NULL, NULL, NULL, 'Hamill', 'Roselyn', 'Retha', '1931-05-16', 'Horacioview', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.644311', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (9, NULL, NULL, NULL, NULL, NULL, NULL, 'Hartmann', 'Marcel', 'Porter', '1948-01-07', 'Lake Eulaliaborough', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.647474', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
@@ -126,10 +126,6 @@ INSERT INTO public.tbl_person VALUES (124, NULL, NULL, NULL, NULL, NULL, NULL, '
INSERT INTO public.tbl_person VALUES (125, NULL, NULL, NULL, NULL, NULL, NULL, 'Abshire', 'Irwin', 'Janice', '1957-09-23', 'Orastad', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.425969', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (126, NULL, NULL, NULL, NULL, NULL, NULL, 'Wehner', 'Kameron', 'Drake', '1990-03-04', 'Bernadinehaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.430179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (127, NULL, NULL, NULL, NULL, NULL, NULL, 'Terry', 'Clare', 'Genevieve', '1966-09-30', 'North Theodora', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.433865', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567A', false);
INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567B', false);
INSERT INTO public.tbl_person VALUES (5, NULL, NULL, NULL, NULL, NULL, NULL, 'Harvey', 'Joshuah', 'Halie', '1930-01-18', 'Mitchellville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.634179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567C', false);
INSERT INTO public.tbl_person VALUES (6, NULL, NULL, NULL, NULL, NULL, NULL, 'Kessler', 'Neil', 'Dashawn', '1948-06-10', 'Anitafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.63728', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567D', false);
-- EMPTY public.tbl_benutzer
DELETE FROM public.tbl_benutzer WHERE person_id > 2;
@@ -223,4 +219,4 @@ DELETE FROM lehre.tbl_studienplan WHERE tbl_studienplan < 5;
INSERT INTO lehre.tbl_studienplan VALUES (1, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (2, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (3, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
tests/codeception/api/v1/PersonCept.php
+3
View File
@@ -12,6 +12,8 @@ $I->seeResponseContainsJson([
'nachname' => 'McKenzie']);
$I->sendGET('v1/person/person/Person', array('code' => '01234567A'));
$I->wantTo('test the Person code');
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
@@ -31,3 +33,4 @@ $I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
'success' => TRUE,
'message' => 'Person found']);*/