Fix tests

Author: jeroennoten

composer.json

@@ -26,9 +26,8 @@
         "intervention/image": "^2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.20",
-        "orchestra/database": "~3.2.0|~3.3.0|~3.4.0-dev",
-        "orchestra/testbench": "~3.2.4|~3.3.0|~3.4.0-dev",
+        "phpunit/phpunit": "~4.8.20|~5.0",
+        "orchestra/testbench": "~3.2.4|~3.3.0|~3.4.0",
         "mockery/mockery": "^0.9.5",
         "hamcrest/hamcrest-php": "~1.2",
         "league/flysystem-aws-s3-v3": "^1.0.1",

tests/TestCase.php

@@ -1,10 +1,21 @@
 <?php
 
 
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Arr;
+use Laravel\BrowserKitTesting\Concerns\InteractsWithSession;
+use Laravel\BrowserKitTesting\Constraints\HasSource;
+use Laravel\BrowserKitTesting\Constraints\PageConstraint;
+use Laravel\BrowserKitTesting\Constraints\ReversePageConstraint;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
+use PHPUnit_Framework_Assert as PHPUnit;
+
 class TestCase extends \Orchestra\Testbench\TestCase
 {
-    use \Laravel\BrowserKitTesting\Concerns\MakesHttpRequests;
-    use \Laravel\BrowserKitTesting\Concerns\InteractsWithSession;
+    use InteractsWithSession;
+
+    protected $crawler;
+    protected $response;
 
     /** @before */
     public function injectDependencies()
@@ -55,4 +66,132 @@ protected function addDependencyForCallParameter(ReflectionParameter $parameter,
             $dependencies[] = $parameter->getDefaultValue();
         }
     }
+
+    public function assertRedirectedTo($uri, $with = [])
+    {
+        PHPUnit::assertInstanceOf('Illuminate\Http\RedirectResponse', $this->response);
+
+        PHPUnit::assertEquals($this->app['url']->to($uri), $this->response->headers->get('Location'));
+
+        $this->assertSessionHasAll($with);
+
+        return $this;
+    }
+
+    public function see($text, $negate = false)
+    {
+        return $this->_assertInPage(new HasSource($text), $negate);
+    }
+
+    public function seeJson(array $data = null, $negate = false)
+    {
+        if (is_null($data)) {
+            $this->assertJson(
+                $this->response->getContent(), "JSON was not returned from [{$this->currentUri}]."
+            );
+
+            return $this;
+        }
+
+        try {
+            return $this->seeJsonEquals($data);
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            return $this->seeJsonContains($data, $negate);
+        }
+    }
+
+    public function seeJsonEquals(array $data)
+    {
+        $actual = json_encode(Arr::sortRecursive(
+            (array) $this->decodeResponseJson()
+        ));
+
+        $this->assertEquals(json_encode(Arr::sortRecursive($data)), $actual);
+
+        return $this;
+    }
+
+    protected function _assertInPage(PageConstraint $constraint, $reverse = false, $message = '')
+    {
+        if ($reverse) {
+            $constraint = new ReversePageConstraint($constraint);
+        }
+
+        self::assertThat(
+            $this->crawler() ?: $this->response->getContent(),
+            $constraint, $message
+        );
+
+        return $this;
+    }
+
+    protected function crawler()
+    {
+        if (! empty($this->subCrawlers)) {
+            return end($this->subCrawlers);
+        }
+
+        return $this->crawler;
+    }
+
+    public function call($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
+    {
+        $kernel = $this->app->make('Illuminate\Contracts\Http\Kernel');
+
+        $this->currentUri = $this->prepareUrlForRequest($uri);
+
+        $this->resetPageContext();
+
+        $symfonyRequest = SymfonyRequest::create(
+            $this->currentUri, $method, $parameters,
+            $cookies, $this->filterFiles($files), array_replace($this->serverVariables, $server), $content
+        );
+
+        $request = Request::createFromBase($symfonyRequest);
+
+        $response = $kernel->handle($request);
+
+        $kernel->terminate($request, $response);
+
+        return $this->response = $response;
+    }
+
+    protected function resetPageContext()
+    {
+        $this->crawler = null;
+
+        $this->subCrawlers = [];
+    }
+    protected function filterFiles($files)
+    {
+        foreach ($files as $key => $file) {
+            if ($file instanceof UploadedFile) {
+                continue;
+            }
+
+            if (is_array($file)) {
+                if (! isset($file['name'])) {
+                    $files[$key] = $this->filterFiles($files[$key]);
+                } elseif (isset($files[$key]['error']) && $files[$key]['error'] !== 0) {
+                    unset($files[$key]);
+                }
+
+                continue;
+            }
+
+            unset($files[$key]);
+        }
+
+        return $files;
+    }
+    protected function decodeResponseJson()
+    {
+        $decodedResponse = json_decode($this->response->getContent(), true);
+
+        if (is_null($decodedResponse) || $decodedResponse === false) {
+            $this->fail('Invalid JSON was returned from the route. Perhaps an exception was thrown?');
+        }
+
+        return $decodedResponse;
+    }
 }