chore: upgrade tests to 5.4

summerblue · Mar 6, 2017 · 2faceb4 · 2faceb4
1 parent 5e29a06
commit 2faceb4
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 93 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
     "php": ">=5.4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.4",
-    "laravel/laravel": "5.3.*"
+    "phpunit/phpunit": "~5.7",
+    "laravel/laravel": "5.4.*"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -2,109 +2,106 @@
 
 namespace Summerblue\Generator\Tests;
 
-use PHPUnit_Framework_TestCase as PHPUnit;
+use PHPUnit\Framework\TestCase as PHPUnit;
 
 use \Illuminate\Support\Facades\Artisan;
 use \Illuminate\Filesystem\Filesystem;
-use \Illuminate\Support\Composer;
 use Mockery;
 
 
 class CommandTest extends PHPUnit
 {
-	protected $app;
-	protected $filesystem;
-	protected $folders;
-	protected $files;
+    protected $app;
+    protected $filesystem;
+    protected $folders;
+    protected $files;
 
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->prepareFilesystem();
+    public function setUp()
+    {
+        parent::setUp();
 
-		$this->createApplication();
+        $this->prepareFilesystem();
 
-		$this->mountFolderStructure();
-	}
+        $this->createApplication();
 
-	public function tearDown()
-	{
-		$this->cleanFilesystem();
-	}
+        $this->mountFolderStructure();
+    }
 
-	public function createApplication()
-	{
-		$this->app = require __DIR__.'/../vendor/laravel/laravel/bootstrap/app.php';
-
-		$this->app->register('Summerblue\Generator\GeneratorsServiceProvider');
+    public function tearDown()
+    {
+        $this->cleanFilesystem();
+    }
+
+    public function createApplication()
+    {
+        $this->app = require __DIR__ . '/../vendor/laravel/laravel/bootstrap/app.php';
+
+        $this->app->register('Summerblue\Generator\GeneratorsServiceProvider');
 
         $this->app->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-	}
-
-	public function prepareFilesystem()
-	{
-		$this->filesystem = new Filesystem();
-
-		$this->folders = 
-		[
-			'routes', 
-			'app/Http/Controllers', 
-			'app/Models', 
-			'app/Providers',
-			'database/seeds', 
-			'database/migrations',
-			'database/factories',
-			'resources/views',
-		];
-
-		$this->files = 
-		[
-			'./database/factories/ModelFactory.php',
-			'./database/seeds/DatabaseSeeder.php',
-			'./app/Models/Model.php',
-			'./app/Providers/AuthServiceProvider.php',
-			'./routes/web.php',
-		];
-
-	}
-
-	public function mountFolderStructure()
-	{
-		foreach($this->folders as $folder)
-		{
-			$this->filesystem->makeDirectory($folder, 0777, true, true);
-		}
-
-
-		foreach($this->files as $file)
-		{
-			$this->filesystem->put($file, '<?php');
-		}
-	}
-
-	public function cleanFilesystem()
-	{
-		foreach ($this->folders as $folder) 
-		{
-			$this->filesystem->deleteDirectory(explode("/", $folder)[0]);
-		}
-	}
-
-	public function testExecuteCommand()
-	{
-        Artisan::call('make:scaffold', 
-		[
-        	'name' => 'Tweet', 
-        	'--schema' => 'title:string',
-        	'--no-interaction'
-    	]);
-
-		Artisan::call('make:scaffold',
-		[
-			'name' => 'Tweet2',
-			'--schema' => 'title:string',
-			'--no-interaction'
-		]);
-	}
+    }
+
+    public function prepareFilesystem()
+    {
+        $this->filesystem = new Filesystem();
+
+        $this->folders =
+            [
+                'routes',
+                'app/Http/Controllers',
+                'app/Models',
+                'app/Providers',
+                'database/seeds',
+                'database/migrations',
+                'database/factories',
+                'resources/views',
+            ];
+
+        $this->files =
+            [
+                './database/factories/ModelFactory.php',
+                './database/seeds/DatabaseSeeder.php',
+                './app/Models/Model.php',
+                './app/Providers/AuthServiceProvider.php',
+                './app/Providers/AppServiceProvider.php',
+                './routes/web.php',
+            ];
+
+    }
+
+    public function mountFolderStructure()
+    {
+        foreach ($this->folders as $folder) {
+            $this->filesystem->makeDirectory($folder, 0777, true, true);
+        }
+
+
+        foreach ($this->files as $file) {
+            $this->filesystem->put($file, '<?php');
+        }
+    }
+
+    public function cleanFilesystem()
+    {
+        foreach ($this->folders as $folder) {
+            $this->filesystem->deleteDirectory(explode("/", $folder)[0]);
+        }
+    }
+
+    public function testExecuteCommand()
+    {
+        Artisan::call('make:scaffold',
+            [
+                'name' => 'Tweet',
+                '--schema' => 'title:string',
+                '--no-interaction'
+            ]);
+
+        Artisan::call('make:scaffold',
+            [
+                'name' => 'Tweet2',
+                '--schema' => 'title:string',
+                '--no-interaction'
+            ]);
+    }
 }
diff --git a/tests/StartTest.php b/tests/StartTest.php
@@ -2,7 +2,7 @@
 
 namespace Summerblue\Generator\Tests;
 
-use PHPUnit_Framework_TestCase as PHPUnit;
+use PHPUnit\Framework\TestCase as PHPUnit;
 
 class StartTest extends PHPUnit
 {