Organized tests and tested the console command

gnikyt · gnikyt · commit 3f875edb490c · 2017-07-20T11:02:57.000-04:00
diff --git a/src/ShopifyApp/Console/WebhookJobMakeCommand.php b/src/ShopifyApp/Console/WebhookJobMakeCommand.php
@@ -59,7 +59,7 @@ public function fire()
     'webhooks' => [
         [
             'topic' => '{$this->argument('topic')}',
-            'address' => 'https://your-domain.com/webhook/{$this->getUrlFromName()}'
+            'address' => 'https://your-domain.com/webhook/{$this->getUrlFromName($this->getNameInput())}'
         ]
     ]
         ");
@@ -68,11 +68,12 @@ public function fire()
     /**
      * Converts the job class name into a URL endpoint
      *
+     * @param string $name The name of the job
+     *
      * @return string
      */
-    protected function getUrlFromName()
+    protected function getUrlFromName(string $name)
     {
-        $name = $this->getNameInput();
         if (Str::endsWith($name, 'Job')) {
             $name = substr($name, 0, -3);
         }
diff --git a/tests/Console/WebhookJobMakeCommandTest.php b/tests/Console/WebhookJobMakeCommandTest.php
@@ -0,0 +1,72 @@
+<?php namespace OhMyBrew\ShopifyApp\Test\Console;
+
+use \ReflectionMethod;
+use OhMyBrew\ShopifyApp\Test\TestCase;
+use Symfony\Component\Console\Application as ConsoleApplication;
+use Symfony\Component\Console\Tester\CommandTester;
+use OhMyBrew\ShopifyApp\Console\WebhookJobMakeCommand;
+
+class WebhookJobMakeCommandTest extends TestCase
+{
+    public function testItShouldRun()
+    {
+        $application = new ConsoleApplication;
+
+        $testedCommand = $this->app->make(WebhookJobMakeCommand::class);
+        $testedCommand->setLaravel($this->app);
+        $application->add($testedCommand);
+
+        $command = $application->find('shopify-app:make:webhook');
+        $commandTester = new CommandTester($command);
+
+        $commandTester->execute([
+            'command' => $command->getName(),
+            'name' => 'OrdersCreateJob',
+            'topic' => 'orders/create'
+        ]);
+
+        $output = $commandTester->getDisplay();
+ 
+        $this->assertContains("Don't forget to register the webhook in config/shopify-app.php", $output);
+        $this->assertContains("'address' => 'https://your-domain.com/webhook/orders-create'", $output);
+        $this->assertContains("'topic' => 'orders/create',", $output);
+    }
+
+    public function testShouldMakeUrlFromName()
+    {
+        $application = new ConsoleApplication;
+        $testedCommand = $this->app->make(WebhookJobMakeCommand::class);
+        $testedCommand->setLaravel($this->app);
+        $application->add($testedCommand);
+
+        $command = $application->find('shopify-app:make:webhook');
+
+        $method = new ReflectionMethod($command, 'getUrlFromName');
+        $method->setAccessible(true);
+
+        $result = $method->invoke($command, 'OrdersCreateJob');
+        $result2 = $method->invoke($command, 'OrdersCreate');
+        $result3 = $method->invoke($command, 'OrdersCreateCustomJob');
+        
+        $this->assertEquals($result, 'orders-create');
+        $this->assertEquals($result2, 'orders-create');
+        $this->assertEquals($result3, 'orders-create-custom');
+    }
+
+    public function testShouldReturnStub()
+    {
+        $application = new ConsoleApplication;
+        $testedCommand = $this->app->make(WebhookJobMakeCommand::class);
+        $testedCommand->setLaravel($this->app);
+        $application->add($testedCommand);
+
+        $command = $application->find('shopify-app:make:webhook');
+
+        $method = new ReflectionMethod($command, 'getStub');
+        $method->setAccessible(true);
+
+        $result = $method->invoke($command);
+        
+        $this->assertContains('/stubs/webhook-job.stub', $result);
+    }
+}
diff --git a/tests/Controllers/AuthControllerTest.php b/tests/Controllers/AuthControllerTest.php
@@ -1,10 +1,12 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Controllers;
 
 use Illuminate\Support\Facades\Queue;
 use OhMyBrew\ShopifyApp\Jobs\WebhookInstaller;
 use OhMyBrew\ShopifyApp\Jobs\ScripttagInstaller;
 use OhMyBrew\ShopifyApp\Facades\ShopifyApp;
 use OhMyBrew\ShopifyApp\Models\Shop;
+use OhMyBrew\ShopifyApp\Test\TestCase;
+use OhMyBrew\ShopifyApp\Test\Stubs\ApiStub;
 
 class AuthControllerTest extends TestCase
 {
diff --git a/tests/Controllers/HomeControllerTest.php b/tests/Controllers/HomeControllerTest.php
@@ -1,4 +1,7 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Controllers;
+
+use OhMyBrew\ShopifyApp\Test\TestCase;
+use OhMyBrew\ShopifyApp\Test\Stubs\ApiStub;
 
 class HomeControllerTest extends TestCase
 {
diff --git a/tests/Controllers/WebhookControllerTest.php b/tests/Controllers/WebhookControllerTest.php
@@ -1,10 +1,11 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Controllers;
 
 use \ReflectionMethod;
 use Illuminate\Support\Facades\Queue;
+use OhMyBrew\ShopifyApp\Test\TestCase;
 
 if (!class_exists('App\Jobs\OrdersCreateJob')) {
-    require 'OrdersCreateJobStub.php';
+    require __DIR__.'/../Stubs/OrdersCreateJobStub.php';
 }
 
 class WebhookControllerTest extends TestCase
@@ -29,7 +30,7 @@ public function testShouldReturn201ResponseOnSuccess()
             '/webhook/orders-create',
             [], [], [],
             $this->headers,
-            file_get_contents(__DIR__.'/fixtures/webhook.json')
+            file_get_contents(__DIR__.'/../fixtures/webhook.json')
         );
         $response->assertStatus(201);
 
@@ -44,7 +45,7 @@ public function testShouldReturnErrorResponseOnFailure()
             '/webhook/products-create',
             [], [], [],
             $this->headers,
-            file_get_contents(__DIR__.'/fixtures/webhook.json')
+            file_get_contents(__DIR__.'/../fixtures/webhook.json')
         );
         $response->assertStatus(500);
         $this->assertEquals('Missing webhook job: \App\Jobs\ProductsCreateJob', $response->exception->getMessage());
@@ -76,7 +77,7 @@ public function testWebhookShouldRecieveData()
             '/webhook/orders-create',
             [], [], [],
             $this->headers,
-            file_get_contents(__DIR__.'/fixtures/webhook.json')
+            file_get_contents(__DIR__.'/../fixtures/webhook.json')
         );
         $response->assertStatus(201);
 
diff --git a/tests/Facades/ShopAppFacadeTest.php b/tests/Facades/ShopAppFacadeTest.php
@@ -1,7 +1,8 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Facades;
 
 use \ReflectionMethod;
 use OhMyBrew\ShopifyApp\Facades\ShopifyApp;
+use OhMyBrew\ShopifyApp\Test\TestCase;
 
 class ShopifyAppFacadeTest extends TestCase
 {
diff --git a/tests/Jobs/ScripttagInstallerJobTest.php b/tests/Jobs/ScripttagInstallerJobTest.php
@@ -1,10 +1,12 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Jobs;
 
 use \ReflectionObject;
 use \ReflectionMethod;
 use Illuminate\Support\Facades\Queue;
 use OhMyBrew\ShopifyApp\Jobs\ScripttagInstaller;
 use OhMyBrew\ShopifyApp\Models\Shop;
+use OhMyBrew\ShopifyApp\Test\TestCase;
+use OhMyBrew\ShopifyApp\Test\Stubs\ApiStub;
 
 class ScripttagInstallerJobTest extends TestCase
 {
diff --git a/tests/Jobs/WebhookInstallerJobTest.php b/tests/Jobs/WebhookInstallerJobTest.php
@@ -1,10 +1,12 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Jobs;
 
 use \ReflectionObject;
 use \ReflectionMethod;
 use Illuminate\Support\Facades\Queue;
 use OhMyBrew\ShopifyApp\Jobs\WebhookInstaller;
 use OhMyBrew\ShopifyApp\Models\Shop;
+use OhMyBrew\ShopifyApp\Test\TestCase;
+use OhMyBrew\ShopifyApp\Test\Stubs\ApiStub;
 
 class WebhookInstallerJobTest extends TestCase
 {
diff --git a/tests/Middleware/AuthShopMiddlewareTest.php b/tests/Middleware/AuthShopMiddlewareTest.php
@@ -1,7 +1,8 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Middleware;
 
 use OhMyBrew\ShopifyApp\Middleware\AuthShop;
 use Illuminate\Support\Facades\Input;
+use OhMyBrew\ShopifyApp\Test\TestCase;
 
 class AuthShopMiddlewareTest extends TestCase
 {
diff --git a/tests/Middleware/AuthWebhookMiddlewareTest.php b/tests/Middleware/AuthWebhookMiddlewareTest.php
@@ -1,10 +1,11 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Middleware;
 
 use OhMyBrew\ShopifyApp\Middleware\AuthWebhook;
 use Illuminate\Support\Facades\Queue;
+use OhMyBrew\ShopifyApp\Test\TestCase;
 
 if (!class_exists('App\Jobs\OrdersCreateJob')) {
-    require 'OrdersCreateJobStub.php';
+    require __DIR__.'/../Stubs/OrdersCreateJobStub.php';
 }
 
 class AuthWebhookMiddlewareTest extends TestCase
@@ -42,7 +43,7 @@ public function testRuns()
                 'HTTP_X_SHOPIFY_SHOP_DOMAIN' => 'example.myshopify.com',
                 'HTTP_X_SHOPIFY_HMAC_SHA256' => '8432614ea1ce63b77959195b0e5e1e8469bfb7890e40ab51fb9c3ac26f8b050c', // Matches fixture data and API secret
             ],
-            file_get_contents(__DIR__.'/fixtures/webhook.json')
+            file_get_contents(__DIR__.'/../fixtures/webhook.json')
         );
         $response->assertStatus(201);
     }
@@ -60,7 +61,7 @@ public function testInvalidHmacWontRun()
                 'HTTP_X_SHOPIFY_SHOP_DOMAIN' => 'example.myshopify.com',
                 'HTTP_X_SHOPIFY_HMAC_SHA256' => '8432614ea1ce63b77959195b0e5e1e8469bfb7890e40ab51fb9c3ac26f8b050c', // Matches fixture data and API secret
             ],
-            file_get_contents(__DIR__.'/fixtures/webhook.json') . 'invalid'
+            file_get_contents(__DIR__.'/../fixtures/webhook.json') . 'invalid'
         );
         $response->assertStatus(401);
     }
diff --git a/tests/Models/ShopModelTest.php b/tests/Models/ShopModelTest.php
@@ -1,6 +1,7 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Models;
 
 use OhMyBrew\ShopifyApp\Models\Shop;
+use OhMyBrew\ShopifyApp\Test\TestCase;
 
 class ShopModelTest extends TestCase
 {
diff --git a/tests/ShopifyAppTest.php b/tests/ShopifyAppTest.php
@@ -2,6 +2,7 @@
 
 use OhMyBrew\ShopifyApp\ShopifyApp;
 use OhMyBrew\ShopifyApp\Models\Shop;
+use OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub;
 
 class ShopifyAppControllerTest extends TestCase
 {
@@ -80,10 +81,10 @@ public function testShouldUseDefaultModel()
     public function testShouldAllowForModelOverride()
     {
         session(['shopify_domain' => 'example.myshopify.com']);
-        config(['shopify-app.shop_model' => 'OhMyBrew\ShopifyApp\Test\ShopModelStub']);
+        config(['shopify-app.shop_model' => 'OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub']);
 
         $shop = $this->shopifyApp->shop();
-        $this->assertEquals('OhMyBrew\ShopifyApp\Test\ShopModelStub', get_class($shop));
+        $this->assertEquals('OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub', get_class($shop));
         $this->assertEquals('hello', $shop->hello());
     }
 }
diff --git a/tests/Stubs/ApiStub.php b/tests/Stubs/ApiStub.php
@@ -1,4 +1,4 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Stubs;
 
 use OhMyBrew\BasicShopifyAPI;
 
@@ -7,7 +7,7 @@ class ApiStub extends BasicShopifyAPI
     public function request(string $method, string $path, array $params = null)
     {
         $path = str_replace('/', '_', parse_url($path, PHP_URL_PATH));
-        $filePath = __DIR__.'/fixtures/'.strtolower($method).$path;
+        $filePath = __DIR__.'/../fixtures/'.strtolower($method).$path;
 
         $responseJSON = null;
         if (file_exists($filePath)) {
@@ -22,7 +22,7 @@ public function request(string $method, string $path, array $params = null)
 
     public function requestAccessToken(string $code)
     {
-        $filePath = __DIR__.'/fixtures/post_admin_access_token.json';
+        $filePath = __DIR__.'/../fixtures/post_admin_access_token.json';
         return json_decode(file_get_contents($filePath))->access_token;
     }
 }
diff --git a/tests/Stubs/Kernel.php b/tests/Stubs/Kernel.php
@@ -1,4 +1,4 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Stubs;
 
 class Kernel extends \Orchestra\Testbench\Http\Kernel
 {
diff --git a/tests/Stubs/OrdersCreateJobStub.php b/tests/Stubs/OrdersCreateJobStub.php
diff --git a/tests/Stubs/ShopModelStub.php b/tests/Stubs/ShopModelStub.php
@@ -1,4 +1,4 @@
-<?php namespace OhMyBrew\ShopifyApp\Test;
+<?php namespace OhMyBrew\ShopifyApp\Test\Stubs;
 
 use OhMyBrew\ShopifyApp\Models\Shop as BaseShop;
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -36,7 +36,7 @@ protected function getPackageAliases($app)
     protected function resolveApplicationHttpKernel($app)
     {
         // For adding custom the shop middleware
-        $app->singleton('Illuminate\Contracts\Http\Kernel', 'OhMyBrew\ShopifyApp\Test\Kernel');
+        $app->singleton('Illuminate\Contracts\Http\Kernel', 'OhMyBrew\ShopifyApp\Test\Stubs\Kernel');
     }
 
     protected function getEnvironmentSetUp($app)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function fire()`
`59`	`59`	`'webhooks' => [`
`60`	`60`	`[`
`61`	`61`	`'topic' => '{$this->argument('topic')}',`
`62`		`- 'address' => 'https://your-domain.com/webhook/{$this->getUrlFromName()}'`
	`62`	`+ 'address' => 'https://your-domain.com/webhook/{$this->getUrlFromName($this->getNameInput())}'`
`63`	`63`	`]`
`64`	`64`	`]`
`65`	`65`	`");`
`@@ -68,11 +68,12 @@ public function fire()`
`68`	`68`	`/**`
`69`	`69`	`* Converts the job class name into a URL endpoint`
`70`	`70`	`*`
	`71`	`+ * @param string $name The name of the job`
	`72`	`+ *`
`71`	`73`	`* @return string`
`72`	`74`	`*/`
`73`		`- protected function getUrlFromName()`
	`75`	`+ protected function getUrlFromName(string $name)`
`74`	`76`	`{`
`75`		`- $name = $this->getNameInput();`
`76`	`77`	`if (Str::endsWith($name, 'Job')) {`
`77`	`78`	`$name = substr($name, 0, -3);`
`78`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-<?php namespace OhMyBrew\ShopifyApp\Test;`
	`1`	`+<?php namespace OhMyBrew\ShopifyApp\Test\Controllers;`
	`2`	`+`
	`3`	`+use OhMyBrew\ShopifyApp\Test\TestCase;`
	`4`	`+use OhMyBrew\ShopifyApp\Test\Stubs\ApiStub;`
`2`	`5`
`3`	`6`	`class HomeControllerTest extends TestCase`
`4`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`		`-<?php namespace OhMyBrew\ShopifyApp\Test;`
	`1`	`+<?php namespace OhMyBrew\ShopifyApp\Test\Facades;`
`2`	`2`
`3`	`3`	`use \ReflectionMethod;`
`4`	`4`	`use OhMyBrew\ShopifyApp\Facades\ShopifyApp;`
	`5`	`+use OhMyBrew\ShopifyApp\Test\TestCase;`
`5`	`6`
`6`	`7`	`class ShopifyAppFacadeTest extends TestCase`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-<?php namespace OhMyBrew\ShopifyApp\Test;`
	`1`	`+<?php namespace OhMyBrew\ShopifyApp\Test\Models;`
`2`	`2`
`3`	`3`	`use OhMyBrew\ShopifyApp\Models\Shop;`
	`4`	`+use OhMyBrew\ShopifyApp\Test\TestCase;`
`4`	`5`
`5`	`6`	`class ShopModelTest extends TestCase`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use OhMyBrew\ShopifyApp\ShopifyApp;`
`4`	`4`	`use OhMyBrew\ShopifyApp\Models\Shop;`
	`5`	`+use OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub;`
`5`	`6`
`6`	`7`	`class ShopifyAppControllerTest extends TestCase`
`7`	`8`	`{`
`@@ -80,10 +81,10 @@ public function testShouldUseDefaultModel()`
`80`	`81`	`public function testShouldAllowForModelOverride()`
`81`	`82`	`{`
`82`	`83`	`session(['shopify_domain' => 'example.myshopify.com']);`
`83`		`- config(['shopify-app.shop_model' => 'OhMyBrew\ShopifyApp\Test\ShopModelStub']);`
	`84`	`+ config(['shopify-app.shop_model' => 'OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub']);`
`84`	`85`
`85`	`86`	`$shop = $this->shopifyApp->shop();`
`86`		`- $this->assertEquals('OhMyBrew\ShopifyApp\Test\ShopModelStub', get_class($shop));`
	`87`	`+ $this->assertEquals('OhMyBrew\ShopifyApp\Test\Stubs\ShopModelStub', get_class($shop));`
`87`	`88`	`$this->assertEquals('hello', $shop->hello());`
`88`	`89`	`}`
`89`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace OhMyBrew\ShopifyApp\Test;`
	`1`	`+<?php namespace OhMyBrew\ShopifyApp\Test\Stubs;`
`2`	`2`
`3`	`3`	`use OhMyBrew\BasicShopifyAPI;`
`4`	`4`
`@@ -7,7 +7,7 @@ class ApiStub extends BasicShopifyAPI`
`7`	`7`	`public function request(string $method, string $path, array $params = null)`
`8`	`8`	`{`
`9`	`9`	`$path = str_replace('/', '_', parse_url($path, PHP_URL_PATH));`
`10`		`- $filePath = __DIR__.'/fixtures/'.strtolower($method).$path;`
	`10`	`+ $filePath = __DIR__.'/../fixtures/'.strtolower($method).$path;`
`11`	`11`
`12`	`12`	`$responseJSON = null;`
`13`	`13`	`if (file_exists($filePath)) {`
`@@ -22,7 +22,7 @@ public function request(string $method, string $path, array $params = null)`
`22`	`22`
`23`	`23`	`public function requestAccessToken(string $code)`
`24`	`24`	`{`
`25`		`- $filePath = __DIR__.'/fixtures/post_admin_access_token.json';`
	`25`	`+ $filePath = __DIR__.'/../fixtures/post_admin_access_token.json';`
`26`	`26`	`return json_decode(file_get_contents($filePath))->access_token;`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected function getPackageAliases($app)`
`36`	`36`	`protected function resolveApplicationHttpKernel($app)`
`37`	`37`	`{`
`38`	`38`	`// For adding custom the shop middleware`
`39`		`- $app->singleton('Illuminate\Contracts\Http\Kernel', 'OhMyBrew\ShopifyApp\Test\Kernel');`
	`39`	`+ $app->singleton('Illuminate\Contracts\Http\Kernel', 'OhMyBrew\ShopifyApp\Test\Stubs\Kernel');`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`protected function getEnvironmentSetUp($app)`