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

Remove unnecessary FRAMEWORK_DIR constants

This commit is contained in:
Damian Mooyman 2017-10-03 14:52:23 +13:00
parent f4a77649a4
commit 16f4345124
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/php/Control/HTTPTest.php
View File

@ -201,16 +201,16 @@ class HTTPTest extends FunctionalTest
*/
public function testGetMimeType()
{
$this->assertEquals('text/plain', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.csv'));
$this->assertEquals('image/gif', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.gif'));
$this->assertEquals('text/html', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.html'));
$this->assertEquals('image/jpeg', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.jpg'));
$this->assertEquals('image/png', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.png'));
$this->assertEquals('text/plain', HTTP::get_mime_type('file.csv'));
$this->assertEquals('image/gif', HTTP::get_mime_type('file.gif'));
$this->assertEquals('text/html', HTTP::get_mime_type('file.html'));
$this->assertEquals('image/jpeg', HTTP::get_mime_type('file.jpg'));
$this->assertEquals('image/png', HTTP::get_mime_type('file.png'));
$this->assertEquals(
'image/vnd.adobe.photoshop',
HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.psd')
HTTP::get_mime_type('file.psd')
);
$this->assertEquals('audio/x-wav', HTTP::get_mime_type(FRAMEWORK_DIR.'/tests/control/files/file.wav'));
$this->assertEquals('audio/x-wav', HTTP::get_mime_type('file.wav'));
}
/**

2
tests/php/Dev/DeprecationTest.php
View File

@ -71,7 +71,7 @@ class DeprecationTest extends SapphireTest
public function testMatchingModuleNotifcationVersionAffectsNotice()
{
Deprecation::notification_version('1.0.0');
Deprecation::notification_version('3.0.0', FRAMEWORK_DIR);
Deprecation::notification_version('3.0.0', 'silverstripe/framework');
$this->callThatOriginatesFromFramework();
}