fix: replace downloadurl_placeholder with download_link (#162)

* fix: replace downloadurl_placeholder with download_link

* fix: update bruno tests to work across environments

* test: fill out assertions in ThemeUpdateControllerTest

app/Data/WpOrg/Themes/ThemeUpdateData.php

@@ -18,32 +18,25 @@ public function __construct(
         public ?string $requires_php,
     ) {}
 
-    /**
-     * Static method to create an instance from a Theme model.
-     */
     public static function fromModel(Theme $theme): self
     {
         return new self(
             name: $theme->name,
             theme: $theme->slug,
             new_version: $theme->version,
             url: $theme->download_link,
-            package: "downloadurl_placeholder{$theme->version}",
-            // requires: $theme->requires['wordpress'] ?? null, // XXX HUH?  requires is always a string...
+            package: $theme->download_link,
             requires: $theme->requires,
             requires_php: $theme->requires_php,
         );
     }
 
     /**
-     * Static method to create an instance from a Theme model.
      * @param Collection<int,Theme> $themes
      * @return Collection<string,ThemeUpdateData>
      */
     public static function fromModelCollection(Collection $themes): Collection
     {
-        return $themes->mapWithKeys(fn($theme) => [
-            $theme->slug => self::fromModel($theme),
-        ]);
+        return $themes->mapWithKeys(fn($theme) => [$theme->slug => self::fromModel($theme)]);
     }
 }

bruno/Plugins/Plugins Update Check.bru

@@ -4,7 +4,7 @@ meta {
   seq: 2
 }
 
-get {
+post {
   url: {{API_URL}}/plugins/update-check/:api_version
   body: formUrlEncoded
   auth: none
@@ -15,7 +15,6 @@ params:path {
 }
 
 headers {
-  Host: api.wordpress.org
   User-Agent: WordPress/6.2.2; http://172.18.0.5/
   Accept: */*
   Accept-Encoding: deflate, gzip

bruno/Themes/Themes Update Check.bru

@@ -15,7 +15,6 @@ params:path {
 }
 
 headers {
-  Host: api.wordpress.org
   User-Agent: WordPress/6.2.2; http://172.18.0.5/
   Accept: */*
   Accept-Encoding: deflate, gzip

bruno/collection.bru

@@ -1,9 +1,5 @@
-headers {
-  Authorization: Bearer {{API_KEY}}
-}
-
 docs {
   [Public docs are on the Codex](https://codex.wordpress.org/WordPress.org_API)
-
+  
   We can use [OpenAPI Mocker](https://www.npmjs.com/package/open-api-mocker) for using a mock server
 }

bruno/environments/AspireCloud Production API.bru

@@ -1,4 +1,4 @@
 vars {
-  API_URL: https://api.aspirecloud.org
-  DOWNLOADS_URL: https://downloads.aspirecloud.org
+  API_URL: https://api.aspirecloud.net
+  DOWNLOADS_URL: https://downloads.aspirecloud.net
 }

bruno/environments/AspireCloud Staging API.bru

@@ -0,0 +1,3 @@
+vars {
+  API_URL: https://api.aspirecloud.io
+}

tests/Feature/API/WpOrg/ApiAuthenticationTest.php

@@ -11,4 +11,3 @@
 });
 
 // TODO: write test for real auth token
-

tests/Feature/API/WpOrg/ThemeUpdateControllerTest.php

@@ -102,46 +102,42 @@
                     "Stylesheet" => "my-theme",
                 ],
             ],
-        ]), 'translations' => "[]",
+        ]),
+        'translations' => "[]",
         'locale' => "[\"en_US\"]",
     ], [
         'Accept' => 'application/json',
     ]);
 
     $response->assertStatus(200);
-    $response->assertJsonCount(1, 'themes')
+    $response
+        ->assertJsonCount(1, 'themes')
         ->assertJsonCount(1, 'no_update')
-        ->assertJsonStructure([
+        ->assertJson([
             'themes' => [
                 'my-theme' => [
-                    'name',
-                    'new_version',
-                    'package',
-                    'requires',
-                    'requires_php',
-                    'theme',
-                    'url',
+                    'name' => 'My Theme',
+                    'theme' => 'my-theme',
+                    'new_version' => '1.2.1',
+                    'url' => 'https://api.aspiredev.org/download/my-theme',
+                    'package' => 'https://api.aspiredev.org/download/my-theme',
+                    'requires' => null,
+                    'requires_php' => '5.6',
                 ],
             ],
             'no_update' => [
                 'my-theme2' => [
-                    'name',
-                    'new_version',
-                    'package',
-                    'requires',
-                    'requires_php',
-                    'theme',
-                    'url',
+                    'name' => 'My Theme2',
+                    'theme' => 'my-theme2',
+                    'new_version' => '2.9',
+                    'url' => 'https://api.aspiredev.org/download/my-theme2',
+                    'package' => 'https://api.aspiredev.org/download/my-theme2',
+                    'requires' => null,
+                    'requires_php' => '5.6',
                 ],
             ],
-            'translations',
-        ])
-        ->assertJsonPath('themes.my-theme.name', 'My Theme')
-        ->assertJsonPath('themes.my-theme.new_version', '1.2.1')
-        ->assertJsonPath('themes.my-theme.theme', 'my-theme')
-        ->assertJsonPath('no_update.my-theme2.name', 'My Theme2')
-        ->assertJsonPath('no_update.my-theme2.new_version', '2.9')
-        ->assertJsonPath('no_update.my-theme2.theme', 'my-theme2');
+            'translations' => [],
+        ]);
 });
 
 it('returns theme updates - no_updates', function () {
@@ -170,43 +166,39 @@
                     "Stylesheet" => "my-theme",
                 ],
             ],
-        ]), 'translations' => "[]",
+        ]),
+        'translations' => "[]",
         'locale' => "[\"en_US\"]",
     ], [
         'Accept' => 'application/json',
     ]);
 
     $response->assertStatus(200);
-    $response->assertJsonCount(0, 'themes')
+    $response
+        ->assertJsonCount(0, 'themes')
         ->assertJsonCount(2, 'no_update')
-        ->assertJsonStructure([
-            'themes',
+        ->assertJson([
+            'themes' => [],
             'no_update' => [
                 'my-theme' => [
-                    'name',
-                    'new_version',
-                    'package',
-                    'requires',
-                    'requires_php',
-                    'theme',
-                    'url',
+                    'name' => 'My Theme',
+                    'theme' => 'my-theme',
+                    'new_version' => '1.2.1',
+                    'url' => 'https://api.aspiredev.org/download/my-theme',
+                    'package' => 'https://api.aspiredev.org/download/my-theme',
+                    'requires' => null,
+                    'requires_php' => '5.6',
                 ],
                 'my-theme2' => [
-                    'name',
-                    'new_version',
-                    'package',
-                    'requires',
-                    'requires_php',
-                    'theme',
-                    'url',
+                    'name' => 'My Theme2',
+                    'theme' => 'my-theme2',
+                    'new_version' => '2.9',
+                    'url' => 'https://api.aspiredev.org/download/my-theme2',
+                    'package' => 'https://api.aspiredev.org/download/my-theme2',
+                    'requires' => null,
+                    'requires_php' => '5.6',
                 ],
             ],
-            'translations',
-        ])
-        ->assertJsonPath('no_update.my-theme.name', 'My Theme')
-        ->assertJsonPath('no_update.my-theme.new_version', '1.2.1')
-        ->assertJsonPath('no_update.my-theme.theme', 'my-theme')
-        ->assertJsonPath('no_update.my-theme2.name', 'My Theme2')
-        ->assertJsonPath('no_update.my-theme2.new_version', '2.9')
-        ->assertJsonPath('no_update.my-theme2.theme', 'my-theme2');
+            'translations' => [],
+        ]);
 });