Browse Source

Update tests throwing deprecated warning.

ADmad 8 years ago
parent
commit
866a920f32

+ 10 - 7
tests/TestCase/Http/ResponseTest.php

@@ -587,18 +587,21 @@ class ResponseTest extends TestCase
     /**
      * Tests that callable strings are not triggered
      *
+     * @group deprecated
      * @return void
      */
     public function testSendWithCallableStringBody()
     {
-        $response = $this->getMockBuilder('Cake\Http\Response')
-            ->setMethods(['_sendHeader'])
-            ->getMock();
-        $response->body('phpversion');
+        $this->deprecated(function () {
+            $response = $this->getMockBuilder('Cake\Http\Response')
+                ->setMethods(['_sendHeader'])
+                ->getMock();
+            $response->body('phpversion');
 
-        ob_start();
-        $response->send();
-        $this->assertEquals('phpversion', ob_get_clean());
+            ob_start();
+            $response->send();
+            $this->assertEquals('phpversion', ob_get_clean());
+        });
     }
 
     /**

+ 3 - 3
tests/TestCase/I18n/Parser/PoFileParserTest.php

@@ -201,7 +201,7 @@ class PoFileParserTest extends TestCase
         $file = APP . 'Locale' . DS . 'de' . DS . 'wa.po';
         $messages = $parser->parse($file);
 
-        I18n::translator('default', 'de_DE', function () use ($messages) {
+        I18n::getTranslator('default', 'de_DE', function () use ($messages) {
             $package = new Package('default');
             $package->setMessages($messages);
 
@@ -209,9 +209,9 @@ class PoFileParserTest extends TestCase
         });
 
         // Check translated messages
-        I18n::locale('de_DE');
+        I18n::setLocale('de_DE');
         $this->assertEquals('Standorte', __d('wa', 'Locations'));
-        I18n::locale('en_EN');
+        I18n::setLocale('en_EN');
         $this->assertEquals('Locations', __d('wa', 'Locations'));
     }
 }