From 16f43451245d2f1831885666766b752076837482 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 3 Oct 2017 14:52:23 +1300 Subject: [PATCH] Remove unnecessary FRAMEWORK_DIR constants --- tests/php/Control/HTTPTest.php | 14 +++++++------- tests/php/Dev/DeprecationTest.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/php/Control/HTTPTest.php b/tests/php/Control/HTTPTest.php index 000f1f489..20cf0eb75 100644 --- a/tests/php/Control/HTTPTest.php +++ b/tests/php/Control/HTTPTest.php @@ -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')); } /** diff --git a/tests/php/Dev/DeprecationTest.php b/tests/php/Dev/DeprecationTest.php index e10037691..21455745a 100644 --- a/tests/php/Dev/DeprecationTest.php +++ b/tests/php/Dev/DeprecationTest.php @@ -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(); }