1
0
Эх сурвалжийг харах

make tests compatible with newer phpunit

El RIDO 3 жил өмнө
parent
commit
27965d0287

+ 1 - 1
tst/ControllerTest.php

@@ -66,7 +66,7 @@ class ControllerTest extends TestCase
             $content,
             'doesn\'t output shortener button'
         );
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             '# href="https://' . preg_quote($_SERVER['HTTP_HOST']) . '/">switching to HTTPS#',
             $content,
             'outputs configured https URL correctly'

+ 1 - 1
tst/I18nTest.php

@@ -189,7 +189,7 @@ class I18nTest extends TestCase
             foreach (array_keys($languages) as $language) {
                 // most languages don't translate the data size units, ignore those
                 if ($messageId !== 'B' && strlen($messageId) !== 3 && strpos($messageId, 'B', 2) !== 2) {
-                    $this->assertContains(
+                    $this->assertStringContains(
                         $messageId,
                         $languages[$language],
                         "message ID '$messageId' exists in translation file $language.json"

+ 2 - 2
tst/JsonApiTest.php

@@ -287,7 +287,7 @@ class JsonApiTest extends TestCase
         new Controller;
         $content = ob_get_contents();
         ob_end_clean();
-        $this->assertContains('id="pasteurl" href="https://example.com/1"', $content, 'outputs shortened URL correctly');
+        $this->assertStringContains('id="pasteurl" href="https://example.com/1"', $content, 'outputs shortened URL correctly');
     }
 
     /**
@@ -301,6 +301,6 @@ class JsonApiTest extends TestCase
         new Controller;
         $content = ob_get_contents();
         ob_end_clean();
-        $this->assertContains('Error calling YOURLS.', $content, 'outputs error correctly');
+        $this->assertStringContains('Error calling YOURLS.', $content, 'outputs error correctly');
     }
 }