tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1684 from open-sausages/pulls/4.0/framework-test-namespace 

API Update tests to reflect renamed services
This commit is contained in:
Daniel Hensby 2016-11-23 20:11:54 +00:00 committed by GitHub
parent c8865761d1 38070ab2d3
commit bbaec8c913
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/model/ErrorPageFileExtensionTest.php
View File

@ -5,6 +5,8 @@ use SilverStripe\Assets\File;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\View\Parsers\ShortcodeParser; use SilverStripe\View\Parsers\ShortcodeParser;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
class ErrorPageFileExtensionTest extends SapphireTest { class ErrorPageFileExtensionTest extends SapphireTest {
@ -17,7 +19,7 @@ class ErrorPageFileExtensionTest extends SapphireTest {
parent::setUp(); parent::setUp();
$this->versionedMode = Versioned::get_reading_mode(); $this->versionedMode = Versioned::get_reading_mode();
Versioned::set_stage(Versioned::DRAFT); Versioned::set_stage(Versioned::DRAFT);
AssetStoreTest_SpyStore::activate('ErrorPageFileExtensionTest'); TestAssetStore::activate('ErrorPageFileExtensionTest');
$file = new File(); $file = new File();
$file->setFromString('dummy', 'dummy.txt'); $file->setFromString('dummy', 'dummy.txt');
$file->write(); $file->write();
@ -25,7 +27,7 @@ class ErrorPageFileExtensionTest extends SapphireTest {
public function tearDown() { public function tearDown() {
Versioned::set_reading_mode($this->versionedMode); Versioned::set_reading_mode($this->versionedMode);
AssetStoreTest_SpyStore::reset(); TestAssetStore::reset();
parent::tearDown(); // TODO: Change the autogenerated stub parent::tearDown(); // TODO: Change the autogenerated stub
} }

12
tests/model/ErrorPageTest.php
View File

@ -4,6 +4,8 @@ use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\CMS\Model\ErrorPage; use SilverStripe\CMS\Model\ErrorPage;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\FunctionalTest; use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
@ -25,14 +27,14 @@ class ErrorPageTest extends FunctionalTest {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
// Set temporary asset backend store // Set temporary asset backend store
AssetStoreTest_SpyStore::activate('ErrorPageTest'); TestAssetStore::activate('ErrorPageTest');
Config::inst()->update('SilverStripe\\CMS\\Model\\ErrorPage', 'enable_static_file', true); Config::inst()->update('SilverStripe\\CMS\\Model\\ErrorPage', 'enable_static_file', true);
Config::inst()->update('SilverStripe\\Control\\Director', 'environment_type', 'live'); Config::inst()->update('SilverStripe\\Control\\Director', 'environment_type', 'live');
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');
} }
public function tearDown() { public function tearDown() {
AssetStoreTest_SpyStore::reset(); TestAssetStore::reset();
parent::tearDown(); parent::tearDown();
} }
@ -88,7 +90,7 @@ class ErrorPageTest extends FunctionalTest {
public function testStaticCaching() { public function testStaticCaching() {
// Test new error code does not have static content // Test new error code does not have static content
$this->assertEmpty(ErrorPage::get_content_for_errorcode('401')); $this->assertEmpty(ErrorPage::get_content_for_errorcode('401'));
$expectedErrorPagePath = AssetStoreTest_SpyStore::base_path() . '/error-401.html'; $expectedErrorPagePath = TestAssetStore::base_path() . '/error-401.html';
$this->assertFileNotExists($expectedErrorPagePath, 'Error page is not automatically cached'); $this->assertFileNotExists($expectedErrorPagePath, 'Error page is not automatically cached');
// Write new 401 page // Write new 401 page
@ -101,7 +103,7 @@ class ErrorPageTest extends FunctionalTest {
// Static cache should now exist // Static cache should now exist
$this->assertNotEmpty(ErrorPage::get_content_for_errorcode('401')); $this->assertNotEmpty(ErrorPage::get_content_for_errorcode('401'));
$expectedErrorPagePath = AssetStoreTest_SpyStore::base_path() . '/error-401.html'; $expectedErrorPagePath = TestAssetStore::base_path() . '/error-401.html';
$this->assertFileExists($expectedErrorPagePath, 'Error page is cached'); $this->assertFileExists($expectedErrorPagePath, 'Error page is cached');
} }
@ -126,7 +128,7 @@ class ErrorPageTest extends FunctionalTest {
// Static content is not available // Static content is not available
$this->assertEmpty(ErrorPage::get_content_for_errorcode('405')); $this->assertEmpty(ErrorPage::get_content_for_errorcode('405'));
$expectedErrorPagePath = AssetStoreTest_SpyStore::base_path() . '/error-405.html'; $expectedErrorPagePath = TestAssetStore::base_path() . '/error-405.html';
$this->assertFileNotExists($expectedErrorPagePath, 'Error page is not cached in static location'); $this->assertFileNotExists($expectedErrorPagePath, 'Error page is not cached in static location');
} }
} }

8
tests/model/FileLinkTrackingTest.php
View File

@ -6,6 +6,8 @@ use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Assets\Filesystem; use SilverStripe\Assets\Filesystem;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
@ -20,13 +22,13 @@ class FileLinkTrackingTest extends SapphireTest {
Versioned::set_stage(Versioned::DRAFT); Versioned::set_stage(Versioned::DRAFT);
AssetStoreTest_SpyStore::activate('FileLinkTrackingTest'); TestAssetStore::activate('FileLinkTrackingTest');
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');
// Write file contents // Write file contents
$files = File::get()->exclude('ClassName', 'SilverStripe\\Assets\\Folder'); $files = File::get()->exclude('ClassName', 'SilverStripe\\Assets\\Folder');
foreach($files as $file) { foreach($files as $file) {
$destPath = AssetStoreTest_SpyStore::getLocalPath($file); $destPath = TestAssetStore::getLocalPath($file);
Filesystem::makeFolder(dirname($destPath)); Filesystem::makeFolder(dirname($destPath));
file_put_contents($destPath, str_repeat('x', 1000000)); file_put_contents($destPath, str_repeat('x', 1000000));
// Ensure files are published, thus have public urls // Ensure files are published, thus have public urls
@ -44,7 +46,7 @@ class FileLinkTrackingTest extends SapphireTest {
} }
public function tearDown() { public function tearDown() {
AssetStoreTest_SpyStore::reset(); TestAssetStore::reset();
parent::tearDown(); parent::tearDown();
} }

6
tests/model/SiteTreeBrokenLinksTest.php
View File

@ -7,6 +7,8 @@ use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\CMS\Model\RedirectorPage;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
@ -23,12 +25,12 @@ class SiteTreeBrokenLinksTest extends SapphireTest {
parent::setUp(); parent::setUp();
Versioned::set_stage(Versioned::DRAFT); Versioned::set_stage(Versioned::DRAFT);
AssetStoreTest_SpyStore::activate('SiteTreeBrokenLinksTest'); TestAssetStore::activate('SiteTreeBrokenLinksTest');
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');
} }
public function tearDown() { public function tearDown() {
AssetStoreTest_SpyStore::reset(); TestAssetStore::reset();
parent::tearDown(); parent::tearDown();
} }

8
tests/model/SiteTreeHTMLEditorFieldTest.php
View File

@ -6,6 +6,8 @@ use SilverStripe\Assets\Filesystem;
use SilverStripe\Forms\HTMLEditor\HTMLEditorField; use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
use SilverStripe\Dev\CSSContentParser; use SilverStripe\Dev\CSSContentParser;
use SilverStripe\Dev\FunctionalTest; use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
class SiteTreeHTMLEditorFieldTest extends FunctionalTest { class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml'; protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml';
@ -14,20 +16,20 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
AssetStoreTest_SpyStore::activate('SiteTreeHTMLEditorFieldTest'); TestAssetStore::activate('SiteTreeHTMLEditorFieldTest');
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');
// Write file contents // Write file contents
$files = File::get()->exclude('ClassName', 'SilverStripe\\Assets\\Folder'); $files = File::get()->exclude('ClassName', 'SilverStripe\\Assets\\Folder');
foreach($files as $file) { foreach($files as $file) {
$destPath = AssetStoreTest_SpyStore::getLocalPath($file); $destPath = TestAssetStore::getLocalPath($file);
Filesystem::makeFolder(dirname($destPath)); Filesystem::makeFolder(dirname($destPath));
file_put_contents($destPath, str_repeat('x', 1000000)); file_put_contents($destPath, str_repeat('x', 1000000));
} }
} }
public function tearDown() { public function tearDown() {
AssetStoreTest_SpyStore::reset(); TestAssetStore::reset();
parent::tearDown(); parent::tearDown();
} }