fix double slash in requirements

lekoala · Jun 30, 2021 · 7762bd8 · 7762bd8
1 parent bc6539d
commit 7762bd8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/FilePondField.php b/src/FilePondField.php
@@ -27,6 +27,7 @@
  */
 class FilePondField extends AbstractUploadField
 {
+    const BASE_CDN = "https://cdn.jsdelivr.net/gh/pqina";
 
     /**
      * @config
@@ -467,11 +468,12 @@ public function getExistingUploadsData()
      */
     public static function Requirements()
     {
-        $baseDir = "https://cdn.jsdelivr.net/gh/pqina/";
+        $baseDir = self::BASE_CDN;
         if (!self::config()->use_cdn) {
             $asset = ModuleResourceLoader::resourceURL('lekoala/silverstripe-filepond:javascript/FilePondField.js');
             $baseDir = dirname($asset) . "/cdn";
         }
+        $baseDir = rtrim($baseDir, '/');
 
         // Polyfill to ensure max compatibility
         if (self::config()->enable_polyfill) {

diff --git a/tests/FilePondTest.php b/tests/FilePondTest.php
@@ -185,4 +185,12 @@ public function testCustomConfig()
         $pond->addFilePondConfig('allowDrop', false);
         $this->assertArrayHasKey('allowDrop', $pond->getFilePondConfig());
     }
+
+    public function testRequirements()
+    {
+        FilePondField::config()->use_cdn = true;
+        FilePondField::Requirements();
+        FilePondField::config()->use_cdn = false;
+        FilePondField::Requirements();
+    }
 }