Merge tag 'v1.5.4' into develop

fix bugs and add testing
recca0120 · Jun 29, 2016 · 5e39df1 · 5e39df1
2 parents 056e9ab + bf3fdf9
commit 5e39df1
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 79 deletions.
diff --git a/tests/DatabasePanelTest.php b/tests/DatabasePanelTest.php
@@ -16,8 +16,6 @@ public function tearDown()
 
     public function test_database_panel_mysql_52()
     {
-        $listeners = [];
-
         $statement = m::mock(PDOStatement::class)
             ->shouldReceive('execute')
             ->shouldReceive('fetchAll')
@@ -35,8 +33,24 @@ public function test_database_panel_mysql_52()
             ->mock();
 
         $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('listen')->andReturnUsing(function ($eventName, $closure) use (&$listeners) {
-                $listeners[$eventName] = $closure;
+            ->shouldReceive('listen')->with(QueryExecuted::class, m::any())->andReturnUsing(function ($eventName, $closure) use ($connection) {
+                $queryExecuted = new QueryExecuted('SELECT DISTINCT * FROM `users` WHERE `id` != (?) ORDER BY RAND(); /** **/', ['1'], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` ORDER BY id', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIMIT 1', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, $connection);
+                $closure($queryExecuted);
             })
             ->mock();
 
@@ -48,32 +62,12 @@ public function test_database_panel_mysql_52()
         $panel = new DatabasePanel();
         $panel->setLaravel($app);
 
-        $queryExecuted = new QueryExecuted('SELECT DISTINCT * FROM `users` WHERE `id` != (?) ORDER BY RAND(); /** **/', ['1'], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` ORDER BY id', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIMIT 1', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
         $panel->getTab();
         $panel->getPanel();
     }
 
     public function test_database_panel_mysql_51()
     {
-        $listeners = [];
-
         $statement = m::mock(PDOStatement::class)
             ->shouldReceive('execute')
             ->shouldReceive('fetchAll')
@@ -92,8 +86,20 @@ public function test_database_panel_mysql_51()
             ->mock();
 
         $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('listen')->andReturnUsing(function ($eventName, $closure) use (&$listeners) {
-                $listeners[$eventName] = $closure;
+            ->shouldReceive('listen')->with('illuminate.query', m::any())->andReturnUsing(function ($eventName, $closure) use ($connection) {
+                $closure('SELECT DISTINCT * FROM `users` WHERE `id` != ? ORDER BY RAND(); /** **/', ['1'], 1.1, 'mysql');
+
+                $closure('SELECT * FROM `users` ORDER BY id', [], 1.1, 'mysql');
+
+                $closure('SELECT * FROM `users` LIMIT 1', [], 1.1, 'mysql');
+
+                $closure('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, 'mysql');
+
+                $closure('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, 'mysql');
+
+                $closure('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, 'mysql');
+
+                $closure('select * from users where id = ?', ['1'], 1.1, 'mysql');
             })
             ->mock();
 
@@ -106,28 +112,12 @@ public function test_database_panel_mysql_51()
         $panel = new DatabasePanel();
         $panel->setLaravel($app);
 
-        $listeners['illuminate.query']('SELECT DISTINCT * FROM `users` WHERE `id` != ? ORDER BY RAND(); /** **/', ['1'], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('SELECT * FROM `users` ORDER BY id', [], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('SELECT * FROM `users` LIMIT 1', [], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, 'mysql');
-
-        $listeners['illuminate.query']('select * from users where id = ?', ['1'], 1.1, 'mysql');
-
         $panel->getTab();
         $panel->getPanel();
     }
 
     public function test_database_panel_mssql_52()
     {
-        $listeners = [];
-
         $pdo = m::mock(PDO::class);
 
         $connection = m::mock(Connection::class)
@@ -136,8 +126,24 @@ public function test_database_panel_mssql_52()
             ->mock();
 
         $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('listen')->andReturnUsing(function ($eventName, $closure) use (&$listeners) {
-                $listeners[$eventName] = $closure;
+            ->shouldReceive('listen')->with(QueryExecuted::class, m::any())->andReturnUsing(function ($eventName, $closure) use ($connection) {
+                $queryExecuted = new QueryExecuted('SELECT DISTINCT * FROM `users` WHERE `id` != ? ORDER BY RAND(); /** **/', ['1'], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` ORDER BY id', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIMIT 1', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, $connection);
+                $closure($queryExecuted);
+
+                $queryExecuted = new QueryExecuted('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, $connection);
+                $closure($queryExecuted);
             })
             ->mock();
 
@@ -149,24 +155,6 @@ public function test_database_panel_mssql_52()
         $panel = new DatabasePanel();
         $panel->setLaravel($app);
 
-        $queryExecuted = new QueryExecuted('SELECT DISTINCT * FROM `users` WHERE `id` != ? ORDER BY RAND(); /** **/', ['1'], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` ORDER BY id', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIMIT 1', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` LIKE "%?%"', ['name'], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('SELECT * FROM `users` WHERE id IN (SELECT `id` FROM `users`)', [], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
-        $queryExecuted = new QueryExecuted('UPDATE `users` SET `name` = ? WHERE `id` = ? AND `created_at` = ?', ['name', '1', new DateTime()], 1.1, $connection);
-        $listeners[QueryExecuted::class]($queryExecuted);
-
         $panel->getTab();
         $panel->getPanel();
     }

diff --git a/tests/EventPanelTest.php b/tests/EventPanelTest.php
@@ -14,11 +14,9 @@ public function tearDown()
 
     public function test_event_panel()
     {
-        $listeners = [];
-
         $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('listen')->andReturnUsing(function ($eventName, $closure) use (&$listeners) {
-                $listeners[$eventName] = $closure;
+            ->shouldReceive('listen')->with('*', m::any())->andReturnUsing(function ($eventName, $closure) {
+                $closure(['a' => '']);
             })
             ->shouldReceive('firing')->andReturn('event')
             ->mock();
@@ -31,8 +29,6 @@ public function test_event_panel()
         $panel = new EventPanel();
         $panel->setLaravel($app);
 
-        $listeners['*'](['a' => '']);
-
         $panel->getTab();
         $panel->getPanel();
     }

diff --git a/tests/TerminalPanelTest.php b/tests/TerminalPanelTest.php
@@ -17,6 +17,7 @@ public function test_terminal_panel()
         $controller = m::mock(TerminalController::class)
             ->shouldReceive('render')
             ->mock();
+
         $app = m::mock(ApplicationContract::class.','.ArrayAccess::class)
             ->shouldReceive('version')->andReturn(5.2)
             ->shouldReceive('make')->with(TerminalController::class)->andReturn($controller)

diff --git a/tests/ViewPanelTest.php b/tests/ViewPanelTest.php
@@ -15,10 +15,15 @@ public function tearDown()
 
     public function test_view_panel()
     {
-        $listeners = [];
         $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('listen')->andReturnUsing(function ($eventName, $closure) use (&$listeners) {
-                $listeners[$eventName] = $closure;
+            ->shouldReceive('listen')->with('composing:*', m::any())->andReturnUsing(function ($eventName, $closure) {
+                $view = m::mock(ViewContract::class)
+                    ->shouldReceive('getName')->andReturn('name')
+                    ->shouldReceive('getData')->andReturn([])
+                    ->shouldReceive('getPath')->andReturn(__FILE__)
+                    ->mock();
+
+                $closure($view);
             })
             ->mock();
 
@@ -30,14 +35,6 @@ public function test_view_panel()
         $panel = new ViewPanel();
         $panel->setLaravel($app);
 
-        $view = m::mock(ViewContract::class)
-            ->shouldReceive('getName')->andReturn('name')
-            ->shouldReceive('getData')->andReturn([])
-            ->shouldReceive('getPath')->andReturn(__FILE__)
-            ->mock();
-
-        $listeners['composing:*']($view);
-
         $panel->getTab();
         $panel->getPanel();
     }