tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #661 from creative-commoners/pulls/3/sapphire-test-nine

Browse Source 
API phpunit9 support
This commit is contained in:
Maxime Rainville 2021-11-01 22:55:00 +13:00 committed by GitHub
commit 363a115300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -8,6 +8,7 @@
],
"type": "silverstripe-vendormodule",
"require": {
"php": "^7.3 || ^8.0",
"silverstripe/cms": "^4.0",
"silverstripe/lumberjack": "^2.0",
"silverstripe/tagfield": "^2.0",
@ -15,7 +16,7 @@
"silverstripe/asset-admin": "^1.0"
},
"require-dev": {
"sminnee/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0"
},
"extra": {

9
phpunit.xml.dist
View File

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

7
tests/BlogCategoryTest.php
View File

@ -13,9 +13,6 @@ use SilverStripe\ORM\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
/**
* @mixin PHPUnit_Framework_TestCase
*/
class BlogCategoryTest extends FunctionalTest
{
/**
@ -26,7 +23,7 @@ class BlogCategoryTest extends FunctionalTest
/**
* {@inheritdoc}
*/
public function setUp()
protected function setUp(): void
{
parent::setUp();
@ -36,7 +33,7 @@ class BlogCategoryTest extends FunctionalTest
/**
* {@inheritdoc}
*/
public function tearDown()
protected function tearDown(): void
{
DBDatetime::clear_mock_now();

6
tests/BlogFunctionalTest.php
View File

@ -13,7 +13,7 @@ class BlogFunctionalTest extends FunctionalTest
protected static $use_draft_site = true;
protected function setUp()
protected function setUp(): void
{
Config::modify()->set(URLSegmentFilter::class, 'default_allow_multibyte', true);
i18n::set_locale('fa_IR');
@ -33,7 +33,7 @@ class BlogFunctionalTest extends FunctionalTest
$result = $this->get(rawurlencode('آبید') . '/profile/' . rawurlencode('عبّاس-آبان'));
$this->assertEquals(200, $result->getStatusCode());
$this->assertContains('My Blog Post', $result->getBody());
$this->assertStringContainsString('My Blog Post', $result->getBody());
}
public function testMemberProfileWithMultibyteUrlAndEnglishName()
@ -41,6 +41,6 @@ class BlogFunctionalTest extends FunctionalTest
$result = $this->get(rawurlencode('آبید') . '/profile/bob-jones');
$this->assertEquals(200, $result->getStatusCode());
$this->assertContains('My Blog Post', $result->getBody());
$this->assertStringContainsString('My Blog Post', $result->getBody());
}
}

5
tests/BlogPostFilterTest.php
View File

@ -8,7 +8,6 @@ use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\Security\Security;
/**
* @mixin PHPUnit_Framework_TestCase
* @coversDefaultClass \SilverStripe\Blog\Model\BlogPostFilter
*/
class BlogPostFilterTest extends SapphireTest
@ -18,14 +17,14 @@ class BlogPostFilterTest extends SapphireTest
*/
protected static $fixture_file = 'blog.yml';
public function setUp()
protected function setUp(): void
{
parent::setUp();
DBDatetime::set_mock_now('2013-10-10 20:00:00');
}
public function tearDown()
protected function tearDown(): void
{
DBDatetime::clear_mock_now();

6
tests/BlogPostTest.php
View File

@ -13,7 +13,7 @@ class BlogPostTest extends SapphireTest
{
protected static $fixture_file = 'blog.yml';
protected function tearDown()
protected function tearDown(): void
{
DBDatetime::clear_mock_now();
parent::tearDown();
@ -159,7 +159,7 @@ class BlogPostTest extends SapphireTest
$blogPost = $this->objFromFixture(BlogPost::class, 'FirstBlogPost');
$archiveLink = $blogPost->getMonthlyArchiveLink($type);
$this->assertContains('archive/', $archiveLink);
$this->assertStringContainsString('archive/', $archiveLink);
$this->assertStringEndsWith($expected, $archiveLink);
}
@ -181,7 +181,7 @@ class BlogPostTest extends SapphireTest
$blogPost = $this->objFromFixture(BlogPost::class, 'FirstBlogPost');
$archiveLink = $blogPost->getYearlyArchiveLink();
$this->assertContains('archive/', $archiveLink);
$this->assertStringContainsString('archive/', $archiveLink);
$this->assertStringEndsWith('/2013', $archiveLink);
}
}

8
tests/BlogTagTest.php
View File

@ -2,7 +2,6 @@
namespace SilverStripe\Blog\Tests;
use PHPUnit_Framework_TestCase;
use SilverStripe\Blog\Model\Blog;
use SilverStripe\Blog\Model\BlogPost;
use SilverStripe\Blog\Model\BlogTag;
@ -13,21 +12,18 @@ use SilverStripe\ORM\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
/**
* @mixin PHPUnit_Framework_TestCase
*/
class BlogTagTest extends FunctionalTest
{
protected static $fixture_file = 'blog.yml';
protected function setUp()
protected function setUp(): void
{
parent::setUp();
DBDatetime::set_mock_now('2013-10-10 20:00:00');
}
protected function tearDown()
protected function tearDown(): void
{
DBDatetime::clear_mock_now();

15
tests/BlogTest.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\Blog\Tests;
use PHPUnit_Framework_TestCase;
use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Blog\Model\Blog;
use SilverStripe\Blog\Model\BlogController;
use SilverStripe\Blog\Model\BlogPost;
@ -17,14 +17,11 @@ use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\SS_List;
use SilverStripe\Security\Member;
/**
* @mixin PHPUnit_Framework_TestCase
*/
class BlogTest extends SapphireTest
{
protected static $fixture_file = 'blog.yml';
protected function setUp()
protected function setUp(): void
{
parent::setUp();
@ -37,7 +34,7 @@ class BlogTest extends SapphireTest
$blog->publishRecursive();
}
protected function tearDown()
protected function tearDown(): void
{
DBDatetime::clear_mock_now();
@ -327,12 +324,10 @@ class BlogTest extends SapphireTest
);
}
/**
* @expectedException \SilverStripe\Control\HTTPResponse_Exception
* @expectedExceptionCode 404
*/
public function testDisabledProfiles()
{
$this->expectException(HTTPResponse_Exception::class);
$this->expectExceptionCode(404);
Config::modify()->set(BlogController::class, 'disable_profiles', true);
$controller = BlogController::create();

6
tests/Model/BlogControllerFunctionalTest.php
View File

@ -13,7 +13,7 @@ class BlogControllerFunctionalTest extends FunctionalTest
protected static $use_draft_site = true;
protected function setUp()
protected function setUp(): void
{
Config::modify()->set(URLSegmentFilter::class, 'default_allow_multibyte', true);
i18n::set_locale('fa_IR');
@ -26,7 +26,7 @@ class BlogControllerFunctionalTest extends FunctionalTest
$result = $this->get('my-blog/category/' . rawurlencode('آبید'));
$this->assertEquals(200, $result->getStatusCode());
$this->assertContains('آبید', $result->getBody());
$this->assertStringContainsString('آبید', $result->getBody());
}
public function testGetTagsWithMultibyteUrl()
@ -34,6 +34,6 @@ class BlogControllerFunctionalTest extends FunctionalTest
$result = $this->get('my-blog/tag/' . rawurlencode('برتراند'));
$this->assertEquals(200, $result->getStatusCode());
$this->assertContains('برتراند', $result->getBody());
$this->assertStringContainsString('برتراند', $result->getBody());
}
}

4
tests/Widgets/BlogArchiveWidgetTest.php
View File

@ -15,7 +15,7 @@ class BlogArchiveWidgetTest extends SapphireTest
{
protected static $fixture_file = 'BlogArchiveWidgetTest.yml';
protected function setUp()
protected function setUp(): void
{
if (!class_exists(Widget::class)) {
self::$fixture_file = null;
@ -28,7 +28,7 @@ class BlogArchiveWidgetTest extends SapphireTest
parent::setUp();
}
protected function tearDown()
protected function tearDown(): void
{
parent::tearDown();