route test fixes

Author: austintoddj

config/canvas.php

@@ -8,8 +8,8 @@
     |--------------------------------------------------------------------------
     |
     | This is the subdomain where Canvas will be accessible from. If the
-    | setting is null, Canvas will reside under the same domain as the
-    | application. Otherwise, this will be used as the subdomain.
+    | domain is set to null, Canvas will reside under the defined base
+    | path below. Otherwise, this will be used as the subdomain.
     |
     */
 
@@ -20,9 +20,9 @@
     | Base Path
     |--------------------------------------------------------------------------
     |
-    | This is the URI path where Canvas will be accessible from. You are free
-    | to change this path to anything you like. Note that the URI will not
-    | affect the paths of its internal API that aren't exposed to users.
+    | This is the URI where Canvas will be accessible from. If the path
+    | is set to null, Canvas will reside under the same path name as
+    | the application. Otherwise, this is used as the base path.
     |
     */
 

readme.md

@@ -81,8 +81,8 @@ Canvas exposes its UI at `/canvas` by default. This can be changed by updating e
 |--------------------------------------------------------------------------
 |
 | This is the URI where Canvas will be accessible from. If the path
-| is set to null, Canvas will reside under the path name as the 
-| application. Otherwise, this will be used as the base path.
+| is set to null, Canvas will reside under the same path name as 
+| the application. Otherwise, this is used as the base path.
 |
 */
 

tests/Http/RouteTest.php

@@ -18,59 +18,36 @@ public function testNamedRoute(): void
 
     public function testRouteWithDefaultBasePath(): void
     {
-        $this->markTestSkipped();
-
         $this->actingAs($this->admin)
-             ->get(sprintf('%s', config('canvas.path')))
+             ->get(route('canvas'))
              ->assertRedirect(route('canvas.login'))
              ->assertLocation('http://laravel.test/canvas/login');
 
-        $this->assertSame(Canvas::basePath(), '/'.config('canvas.path'));
+        $this->assertSame(Canvas::basePath(), '/canvas');
     }
 
     public function testRouteWithSubdomainAndDefaultBasePath(): void
     {
-        $this->markTestSkipped();
-
         Config::set('canvas.domain', 'http://canvas.laravel.test');
 
         $this->actingAs($this->admin)
-             ->get(sprintf('%s/%s', config('canvas.domain'), config('canvas.path')))
+             ->get(config('canvas.domain') . '/canvas')
              ->assertRedirect(route('canvas.login'))
              ->assertLocation('http://canvas.laravel.test/canvas/login');
 
-        $this->assertSame(Canvas::basePath(), '/'.config('canvas.path'));
+        $this->assertSame(Canvas::basePath(), '/canvas');
     }
 
     public function testRouteWithSubdomainAndNullBasePath(): void
     {
-        $this->markTestSkipped();
-
         Config::set('canvas.path', null);
 
         Config::set('canvas.domain', 'http://canvas.laravel.test');
 
         $this->actingAs($this->admin)
-             ->get(config('canvas.domain'))
-             ->assertRedirect(route('canvas.login'))
-             ->assertLocation('http://canvas.laravel.test/login');
+             ->get(config('canvas.domain') . '/canvas')
+             ->assertRedirect(route('canvas.login'));
 
         $this->assertSame(Canvas::basePath(), '/');
     }
-
-    public function testBasePathWithSubdomain(): void
-    {
-        $this->markTestSkipped();
-
-        Config::set('canvas.path', 'admin');
-
-        Config::set('canvas.domain', 'http://canvas.laravel.test');
-
-        $this->actingAs($this->admin)
-             ->get(sprintf('%s/%s', config('canvas.domain'), config('canvas.path')))
-             ->assertRedirect(route('canvas.login'))
-             ->assertLocation('http://canvas.laravel.test/blog/login');
-
-        $this->assertSame(Canvas::basePath(), '/admin');
-    }
 }

tests/TestCase.php

@@ -44,7 +44,17 @@ protected function setUp(): void
 
         $this->setUpDatabase($this->app);
 
-        $this->createTestUsers();
+        $this->contributor = factory(User::class)->create([
+            'role' => User::CONTRIBUTOR,
+        ]);
+
+        $this->editor = factory(User::class)->create([
+            'role' => User::EDITOR,
+        ]);
+
+        $this->admin = factory(User::class)->create([
+            'role' => User::ADMIN,
+        ]);
     }
 
     /**
@@ -113,24 +123,4 @@ protected function setUpDatabase($app): void
 
         $this->artisan('migrate');
     }
-
-    /**
-     * Create role-based users for testing.
-     *
-     * @void
-     */
-    protected function createTestUsers(): void
-    {
-        $this->contributor = factory(User::class)->create([
-            'role' => User::CONTRIBUTOR,
-        ]);
-
-        $this->editor = factory(User::class)->create([
-            'role' => User::EDITOR,
-        ]);
-
-        $this->admin = factory(User::class)->create([
-            'role' => User::ADMIN,
-        ]);
-    }
 }