Fix getBaseNamespace (area17#2420)

* Fix getBaseNamespace

* Add tests

* Given getBasePath is broken and not used anywhere, remove it

* Fix tests

* Update CapsulesTest.php

Author: Tofandel

src/Helpers/Capsule.php

@@ -111,13 +111,6 @@ public function loadTranslations(): void
         }
     }
 
-    public function getBasePath(string $path): string
-    {
-        $exploded = explode(DIRECTORY_SEPARATOR, $path);
-
-        return implode(DIRECTORY_SEPARATOR, array_pop($exploded));
-    }
-
     public function getModule(): string
     {
         return Str::camel($this->name);
@@ -142,7 +135,7 @@ public function getBaseNamespace(): string
     {
         $explodedNamespace = explode('\\', $this->namespace);
 
-        return implode('\\', array_pop($explodedNamespace));
+        return implode('\\', array_slice($explodedNamespace, 0, -1));
     }
 
     public function getDatabaseNamespace(): string

tests/integration/Capsules/CapsulesTest.php

@@ -87,13 +87,11 @@ public function getPackageProviders($app)
      */
     public function testCapsuleProviderWasRegistered()
     {
-        class_exists(
-            "App\Twill\Capsules\{$this->capsuleClassName}\Models\{$this->capsuleModelName}"
-        );
-
-        class_exists('A17\Twill\Services\Modules\HasModules');
-
-        // @todo: Validate this test.
+        $capsule = TwillCapsules::getCapsuleForModule($this->capsuleName);
+        
+        $this->assertTrue(class_exists("{$capsule->getModelNamespace()}\\{$this->capsuleModelName}"));
+        $this->assertEquals("App\\Twill\\Capsules", $capsule->getBaseNamespace());
+        $this->assertEquals("App\\Twill\\Capsules\\".$this->capsuleClassName, $capsule->namespace);
     }
 
     /**