update Codeception and phpunit, refs #81

5 files changed, 9 insertions, 6 deletions

diff --git a/tests/jsonapi/UserEventsIcalTest.php b/tests/jsonapi/UserEventsIcalTest.php
index 359763f..bf3d2ba 100644
--- a/tests/jsonapi/UserEventsIcalTest.php
+++ b/tests/jsonapi/UserEventsIcalTest.php
@@ -42,7 +42,7 @@ class UserEventsIcalTest extends \Codeception\Test\Unit
         $response = $app($requestBuilder->getRequest(), new \Slim\Http\Response());
 
         $this->tester->assertEquals(200, $response->getStatusCode());
-        $this->tester->assertContains('BEGIN:VEVENT', (string) $response->getBody());
-        $this->tester->assertContains('SUMMARY:blypyp', (string) $response->getBody());
+        $this->tester->assertStringContainsString('BEGIN:VEVENT', (string) $response->getBody());
+        $this->tester->assertStringContainsString('SUMMARY:blypyp', (string) $response->getBody());
     }
 }
diff --git a/tests/jsonapi/WikiCreateTest.php b/tests/jsonapi/WikiCreateTest.php
index 993fe74..114d450 100644
--- a/tests/jsonapi/WikiCreateTest.php
+++ b/tests/jsonapi/WikiCreateTest.php
@@ -55,6 +55,7 @@ class WikiCreateTest extends \Codeception\Test\Unit
             '/courses/{id}/wiki',
             WikiCreate::class
         );
+        $app->get('/wiki-pages/{id}', function () {})->setName('get-wiki-page');
 
         return $this->tester->sendMockRequest(
             $app,
diff --git a/tests/jsonapi/WikiIndexTest.php b/tests/jsonapi/WikiIndexTest.php
index 3fe78a1..1113672 100644
--- a/tests/jsonapi/WikiIndexTest.php
+++ b/tests/jsonapi/WikiIndexTest.php
@@ -23,7 +23,7 @@ class WikiIndexTest extends \Codeception\Test\Unit
     {
         $credentials = $this->tester->getCredentialsForTestAutor();
         $rangeId = 'a07535cf2f8a72df33c12ddfa4b53dde';
-        $body = studip_utf8decode('Es gibt im Moment in diese Mannschaft, oh, einige Spieler vergessen ihren Profi was sie sind. Ich lese nicht sehr viele Zeitungen, aberich habe gehört viele Situationen. Erstens: Wir haben nicht offensivgespielt.');
+        $body = 'Es gibt im Moment in diese Mannschaft, oh, einige Spieler vergessen ihren Profi was sie sind. Ich lese nicht sehr viele Zeitungen, aberich habe gehört viele Situationen. Erstens: Wir haben nicht offensivgespielt.';
 
         $this->createWikiPage($credentials['id'], $rangeId, 'yxilo', $body);
         $this->createWikiPage($credentials['id'], $rangeId, 'ulyq', $body);
@@ -37,7 +37,7 @@ class WikiIndexTest extends \Codeception\Test\Unit
         $this->tester->assertCount(count($countPages), $wikiPages);
 
         $wikiPage = current($wikiPages);
-        $this->tester->assertEquals($body, studip_utf8decode($wikiPage->attribute('content')));
+        $this->tester->assertEquals($body, $wikiPage->attribute('content'));
 
         $this->tester->storeJsonMd('get_wiki_pages', $response, 2, '[...]');
     }
@@ -46,6 +46,7 @@ class WikiIndexTest extends \Codeception\Test\Unit
     private function getWikiIndex($credentials, $rangeId)
     {
         $app = $this->tester->createApp($credentials, 'get', '/courses/{id}/wiki', WikiIndex::class);
+        $app->get('/wiki-pages/{id}', function () {})->setName('get-wiki-page');
 
         return $this->tester->sendMockRequest(
             $app,
diff --git a/tests/jsonapi/WikiShowTest.php b/tests/jsonapi/WikiShowTest.php
index 310708b..51135fc 100644
--- a/tests/jsonapi/WikiShowTest.php
+++ b/tests/jsonapi/WikiShowTest.php
@@ -55,7 +55,7 @@ class WikiShowTest extends \Codeception\Test\Unit
     private function createWikiPage($rangeId, $keyword, $body)
     {
         $wikiPage = new \WikiPage([$rangeId, $keyword, 0]);
-        $wikiPage->body = studip_utf8decode($body);
+        $wikiPage->body = $body;
         $wikiPage->user_id = 'nobody';
         $wikiPage->store();
 
diff --git a/tests/jsonapi/WikiUpdateTest.php b/tests/jsonapi/WikiUpdateTest.php
index 606ae65..380952b 100644
--- a/tests/jsonapi/WikiUpdateTest.php
+++ b/tests/jsonapi/WikiUpdateTest.php
@@ -48,6 +48,7 @@ class WikiUpdateTest extends \Codeception\Test\Unit
             ],
         ];
         $app = $this->tester->createApp($credentials, 'patch', '/wiki-pages/{id}', WikiUpdate::class);
+        $app->get('/wiki-pages/{id}', function () {})->setName('get-wiki-page');
 
         return $this->tester->sendMockRequest(
                 $app,
@@ -62,7 +63,7 @@ class WikiUpdateTest extends \Codeception\Test\Unit
     private function createWikiPage($rangeId, $keyword, $body)
     {
         $wikiPage = new \WikiPage([$rangeId, $keyword, 0]);
-        $wikiPage->body = studip_utf8decode($body);
+        $wikiPage->body = $body;
         $wikiPage->user_id = 'nobody';
         $wikiPage->store();