Merge pull request #56 from creative-commoners/pulls/2/sapphire-test-nine

API phpunit 9 support
This commit is contained in:
Maxime Rainville 2021-11-01 21:47:47 +13:00 committed by GitHub
commit c2c0221ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions

View File

@ -11,10 +11,11 @@
}
],
"require": {
"php": "^7.3 || ^8.0",
"silverstripe/cms": "^4.0"
},
"require-dev": {
"sminnee/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0"
},
"autoload": {

View File

@ -1,7 +1,9 @@
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuite name="Default">
<directory>tests/</directory>
</testsuite>
<testsuites>
<testsuite name="Default">
<directory>tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src/</directory>

View File

@ -19,12 +19,12 @@ class IFramePageTest extends SapphireTest
$iframe->AutoHeight = 1;
$iframe->getClass();
$this->assertContains('iframepage-height-auto', $iframe->getClass());
$this->assertStringContainsString('iframepage-height-auto', $iframe->getClass());
$iframe->AutoHeight = 0;
$iframe->getClass();
$this->assertNotContains('iframepage-height-auto', $iframe->getClass());
$this->assertStringNotContainsString('iframepage-height-auto', $iframe->getClass());
}
public function testGetStyle()
@ -33,19 +33,19 @@ class IFramePageTest extends SapphireTest
$iframe->FixedHeight = 0;
$iframe->getStyle();
$this->assertContains('height: 800px', $iframe->getStyle(), 'Height defaults to 800 if not set.');
$this->assertStringContainsString('height: 800px', $iframe->getStyle(), 'Height defaults to 800 if not set.');
$iframe->FixedHeight = 100;
$iframe->getStyle();
$this->assertContains('height: 100px', $iframe->getStyle(), 'Fixed height is settable');
$this->assertStringContainsString('height: 100px', $iframe->getStyle(), 'Fixed height is settable');
$iframe->AutoWidth = 1;
$iframe->FixedWidth = '200';
$this->assertContains('width: 100%', $iframe->getStyle(), 'Auto width overrides fixed width');
$this->assertStringContainsString('width: 100%', $iframe->getStyle(), 'Auto width overrides fixed width');
$iframe->AutoWidth = 0;
$iframe->FixedWidth = '200';
$this->assertContains('width: 200px', $iframe->getStyle(), 'Fixed width is settable');
$this->assertStringContainsString('width: 200px', $iframe->getStyle(), 'Fixed width is settable');
}
public function testAllowedUrls()
@ -80,12 +80,12 @@ class IFramePageTest extends SapphireTest
foreach ($tests['allowed'] as $url) {
$iframe->IFrameURL = $url;
$iframe->write();
$this->assertContains($iframe->IFrameURL, $url);
$this->assertStringContainsString($iframe->IFrameURL, $url);
}
foreach ($tests['banned'] as $url) {
$iframe->IFrameURL = $url;
$this->setExpectedException(ValidationException::class);
$this->expectException(ValidationException::class);
$iframe->write();
}
}