Merge origin/ci into ci

Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php
This commit is contained in:
paolo
2016-05-24 12:32:32 +02:00
8 changed files with 79 additions and 10 deletions
@@ -1,9 +1,10 @@
<?php
$I = new ApiTester($scenario);
$I->wantTo('Test API call v1/codex/nation All and FederalState');
$I->wantTo('Test API call v1/codex/nation/All');
$I->amHttpAuthenticated("admin", "1q2w3");
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->sendGET('v1/codex/nation/All');
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
@@ -1,9 +1,10 @@
<?php
$I = new ApiTester($scenario);
$I->wantTo('test the Person id');
$I->wantTo('Test API call v1/person/person/person');
$I->amHttpAuthenticated("admin", "1q2w3");
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->sendGET('v1/person/person/Person', array('person_id' => 3));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
@@ -12,7 +13,6 @@ $I->seeResponseContainsJson([
'nachname' => 'McKenzie']);
$I->sendGET('v1/person/person/Person', array('code' => '01234567B'));
$I->wantTo('test the Person code');
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
@@ -20,7 +20,6 @@ $I->seeResponseContainsJson([
'person_id' => '4',
'nachname' => 'Wilderman']);
$I->wantTo('test the Person not found');
$I->sendGET('v1/person/person/Person', array('code' => '12345'));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
@@ -1,9 +1,15 @@
<?php
$I = new ApiTester($scenario);
$I->wantTo('Test API call v1/organisation/studiengang/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->sendGET('v1/organisation/studiengang/Studiengang');
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);
$I->sendGET('v1/organisation/studiengang/AllForBewerbung');
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
@@ -1,10 +1,43 @@
<?php
$I = new ApiTester($scenario);
$I->wantTo('Test API call v1/organisation/studienplan/Studienplaene');
$I->wantTo('Test API call v1/organisation/studienplan studienplaene and studienplaeneFromSem');
$I->amHttpAuthenticated("admin", "1q2w3");
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->sendGET('v1/organisation/studienplan/Studienplaene', array('studiengang_kz' => 1));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);
$I->sendGET('v1/organisation/studienplan/StudienplaeneFromSem', array('studiengang_kz' => 1,
'studiensemester_kurzbz' => 'WS2016'
));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);
$I->sendGET('v1/organisation/studienplan/StudienplaeneFromSem', array('studiengang_kz' => 1,
'studiensemester_kurzbz' => 'WS2016',
'ausbildungssemester' => 1
));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);
$I->sendGET('v1/organisation/studienplan/StudienplaeneFromSem', array('studiengang_kz' => 1,
'studiensemester_kurzbz' => 'WS2016',
'orgform_kurzbz' => 'VZ'
));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);
$I->sendGET('v1/organisation/studienplan/StudienplaeneFromSem', array('studiengang_kz' => 1,
'studiensemester_kurzbz' => 'WS2016',
'ausbildungssemester' => 1,
'orgform_kurzbz' => 'VZ'
));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson(['error' => 0]);