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

Merge pull request #2599 from open-sausages/pulls/4/remove-broken-resource-dir

Browse Source 
BUG Remove broken RESOURCES_DIR test
This commit is contained in:
Steve Boyd 2020-10-15 15:49:50 +13:00 committed by GitHub
commit c6e0c5441a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/php/Model/SiteTreeTest.php
View File

@ -152,23 +152,14 @@ class SiteTreeTest extends SapphireTest
$this->assertEquals($urlSegment, $page->URLSegment);
}
/**
* Check that explicitly setting a URL segment to the resources dir will rename it to have a -2 suffix
*/
public function testExplicitlyUsingResourcesDirForURLSegment()
{
$page = SiteTree::create(['URLSegment' => RESOURCES_DIR]);
$id = $page->write();
$page = SiteTree::get()->byID($id);
$this->assertSame(RESOURCES_DIR . '-2', $page->URLSegment);
}
/**
* For legacy resources dir values ("resources"), check that URLSegments get a -2 appended
*/
public function testLegacyResourcesDirValuesHaveIncrementedValueAppended()
{
if (RESOURCES_DIR !== 'resources') {
// This test only runs on the CMS build because it doesn't have a `resources-dir` flag on its
// composer.json file
$this->markTestSkipped('This legacy test requires RESOURCES_DIR to be "resources"');
}
@ -185,6 +176,8 @@ class SiteTreeTest extends SapphireTest
public function testDefaultResourcesDirHasLeadingUnderscoreRemovedAndResourcesIsUsed()
{
if (RESOURCES_DIR === 'resources') {
// This test won't runs on the CMS build because it doesn't have a `resources-dir` flag on its
// composer.json file. It will run on the recipe-cms build.
$this->markTestSkipped('This test requires RESOURCES_DIR to be something other than "resources"');
}