From 4abbc2d725ad28a991c936cc90d7562e5632b5ee Mon Sep 17 00:00:00 2001
From: Recca Tsai <recca0120.gmail.com>
Date: Tue, 12 Jul 2016 00:02:40 +0800
Subject: [PATCH] fix laravel 5.1

---
 resources/views/panel.blade.php             |   3 -
 src/Http/Controllers/TerminalController.php |  11 +-
 tests/TerminalTest.php                      | 310 +++++++++++++++++---
 3 files changed, 281 insertions(+), 43 deletions(-)

diff --git a/resources/views/panel.blade.php b/resources/views/panel.blade.php
index be00223..fa38023 100644
--- a/resources/views/panel.blade.php
+++ b/resources/views/panel.blade.php
@@ -1,6 +1,3 @@
-@php
-    $id = str_random(30);
-@endphp
 <div id="panel-terminal-shell-{{ $id }}" class="terminal-panel"></div>
 <script>
 (function() {
diff --git a/src/Http/Controllers/TerminalController.php b/src/Http/Controllers/TerminalController.php
index a955346..fd04005 100644
--- a/src/Http/Controllers/TerminalController.php
+++ b/src/Http/Controllers/TerminalController.php
@@ -40,12 +40,8 @@ public function __construct(ConsoleKernel $consoleKernel)
      *
      * @return mixed
      */
-    public function index(
-        ApplicationContract $app,
-        SessionManager $sessionManager,
-        Request $request,
-        $view = 'index'
-    ) {
+    public function index(ApplicationContract $app, SessionManager $sessionManager, Request $request, $view = 'index')
+    {
         $session = $sessionManager->driver();
         if ($session->isStarted() === false) {
             $session->setId($request->cookies->get($session->getName()));
@@ -79,8 +75,9 @@ public function index(
                 ],
             ],
         ]);
+        $id = ($view === 'panel') ? str_random(30) : null;
 
-        return view('terminal::'.$view, compact('options', 'resources'));
+        return view('terminal::'.$view, compact('options', 'resources', 'id'));
     }
 
     /**
diff --git a/tests/TerminalTest.php b/tests/TerminalTest.php
index d9e4f51..d7b7aa6 100644
--- a/tests/TerminalTest.php
+++ b/tests/TerminalTest.php
@@ -26,48 +26,106 @@ public function tearDown()
         m::close();
     }
 
-    public function test_kernel()
+    public function testKernel()
     {
-        $events = m::mock(DispatcherContract::class)
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
+        $events = m::mock(DispatcherContract::class);
+        $app = m::mock(ApplicationContract::class.','.ArrayAccess::class);
+        $kernel = new Kernel($app, $events);
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
+        $events
             ->shouldReceive('fire')
-            ->shouldReceive('firing')
-            ->mock();
+            ->shouldReceive('firing');
 
-        $app = m::mock(ApplicationContract::class.','.ArrayAccess::class)
+        $app
             ->shouldReceive('offsetGet')->with('request')->andReturn(m::mock(Request::class))
             ->shouldReceive('offsetGet')->with('events')->andReturn($events)
             ->shouldReceive('version')->andReturn('testing')
             ->shouldReceive('make')->andReturnUsing(function ($class) {
                 return new $class();
-            })
-            ->mock();
+            });
 
         $kernel = new Kernel($app, $events);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $kernel->call('list');
     }
 
-    public function test_artisan()
+    public function testArtisan()
     {
-        $events = m::mock(DispatcherContract::class)
-            ->shouldReceive('fire')
-            ->mock();
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
+        $events = m::mock(DispatcherContract::class);
+        $app = m::mock(ApplicationContract::class.','.ArrayAccess::class);
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
 
-        $app = m::mock(ApplicationContract::class.','.ArrayAccess::class)
+        $events->shouldReceive('fire');
+        $app
             ->shouldReceive('offsetGet')->with('request')->andReturn(m::mock(Request::class))
             ->shouldReceive('basePath')->andReturn(__DIR__)
-            ->shouldReceive('storagePath')->andReturn(__DIR__)
-            ->mock();
+            ->shouldReceive('storagePath')->andReturn(__DIR__);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
 
         return new Application($app, $events, 'testing');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_artisan_command($artisan)
+    public function testArtisanCommand($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Artisan();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $artisan = m::mock(ArtisanContract::class);
             $artisan->shouldReceive('handle')->with(m::on(function ($input) {
@@ -79,14 +137,34 @@ public function test_artisan_command($artisan)
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      *
      * @expectedException InvalidArgumentException
      */
-    public function test_artisan_command_exception($artisan)
+    public function testArtisanCommandException($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Artisan();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $artisan = m::mock(ArtisanContract::class);
             $command->handle($artisan);
@@ -96,12 +174,32 @@ public function test_artisan_command_exception($artisan)
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_artisan_thinker_command($artisan)
+    public function testArtisanTinkerCommand($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new ArtisanTinker();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $command->handle();
         })->times(4);
@@ -112,12 +210,32 @@ public function test_artisan_thinker_command($artisan)
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_cleanup_command($artisan)
+    public function testCleanUpCommand($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Cleanup();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $filesystem = m::mock(Filesystem::class)
                 ->shouldReceive('glob')
@@ -130,12 +248,32 @@ public function test_cleanup_command($artisan)
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_find_command($artisan)
+    public function testFindCommand($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Find();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $finder = m::mock(Finder::class)
                 ->shouldReceive('in')->with(__DIR__)
@@ -147,16 +285,37 @@ public function test_find_command($artisan)
             $filesystem = m::mock(Filesystem::class);
             $command->handle($finder, $filesystem);
         })->once();
+
         $artisan->call('find ./ -name * -type f -maxdepth 1 -delete');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_mysql($artisan)
+    public function testMysql($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Mysql();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $connection = m::mock(ConnectionInterface::class)
                 ->shouldReceive('setFetchMode')->once()
@@ -164,30 +323,72 @@ public function test_mysql($artisan)
                 ->mock();
             $command->handle($connection);
         })->once();
+
         $artisan->call('mysql --command="select * from users;"');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
     public function test_tail_command($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Tail();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $filesystem = m::mock(Filesystem::class);
             $command->handle($filesystem);
         })->once();
+
         $artisan->call('tail TerminalTest.php --lines 5');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_tail_command_glob($artisan)
+    public function testTailCommandGlob($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Tail();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $filesystem = m::mock(Filesystem::class)
                 ->shouldReceive('glob')->once()->andReturn([
@@ -196,38 +397,81 @@ public function test_tail_command_glob($artisan)
                 ->mock();
             $command->handle($filesystem);
         })->once();
+
         $artisan->call('tail --lines 5');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_vi_command_read($artisan)
+    public function testViCommandRead($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Vi();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $filesystem = m::mock(Filesystem::class)
                 ->shouldReceive('get')->with(realpath(__DIR__.'/TerminalTest.php'))
                 ->mock();
             $command->handle($filesystem);
         })->once();
+
         $artisan->call('vi TerminalTest.php');
     }
 
     /**
-     * @depends test_artisan
+     * @depends testArtisan
      */
-    public function test_vi_command_write($artisan)
+    public function testViCommandWrite($artisan)
     {
+        /*
+        |------------------------------------------------------------
+        | Set
+        |------------------------------------------------------------
+        */
+
         $command = new Vi();
+
+        /*
+        |------------------------------------------------------------
+        | Expectation
+        |------------------------------------------------------------
+        */
+
         $artisan->add($command);
+
+        /*
+        |------------------------------------------------------------
+        | Assertion
+        |------------------------------------------------------------
+        */
+
         $artisan->getLaravel()->shouldReceive('call')->andReturnUsing(function () use ($command) {
             $filesystem = m::mock(Filesystem::class)
                 ->shouldReceive('put')->with(realpath(__DIR__.'/TerminalTest.php'), 'abc')
                 ->mock();
             $command->handle($filesystem);
         })->once();
+
         $artisan->call('vi TerminalTest.php --text="abc"');
     }
 }