Fixed tests broken during merge

cakephp · Jun 28, 2015 · 17902db · 17902db
1 parent 7aded68
commit 17902db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/tests/TestCase/Shell/CommandListShellTest.php b/tests/TestCase/Shell/CommandListShellTest.php
@@ -103,14 +103,13 @@ public function testMainAppPriority()
         $this->Shell->main();
         $output = $this->out->messages();
         $output = implode("\n", $output);
+        rename(APP . 'Shell' . DS . 'I18nShell.php', APP . 'Shell' . DS . 'I18mShell.php');
 
-        $expected = "/\[.*CORE.*\] orm_cache, plugin, server/";
+        $expected = "/\[.*CORE.*\] orm_cache, plugin, routes, server/";
         $this->assertRegExp($expected, $output);
 
         $expected = "/\[.*app.*\] i18n, sample/";
         $this->assertRegExp($expected, $output);
-
-        rename(APP . 'Shell' . DS . 'I18nShell.php', APP . 'Shell' . DS . 'I18mShell.php');
     }
 
     /**

diff --git a/tests/TestCase/Shell/CompletionShellTest.php b/tests/TestCase/Shell/CompletionShellTest.php
@@ -119,8 +119,8 @@ public function testCommands()
         $this->Shell->runCommand(['commands']);
         $output = $this->out->output;
 
-        $expected = "TestPlugin.example TestPlugin.sample " .
-            "TestPluginTwo.example TestPluginTwo.welcome i18n orm_cache plugin routes server i18m sample testing_dispatch\n";
+        $expected = "TestPlugin.example TestPlugin.sample TestPluginTwo.example TestPluginTwo.welcome " .
+            "i18n orm_cache plugin routes server i18m sample testing_dispatch\n";
         $this->assertTextEquals($expected, $output);
     }