Add acceptance and rest integration test

.github/workflows/ci-lint.yaml

@@ -63,7 +63,10 @@ jobs:
 
           # Copy catalog integration tests to host tests directory
           rm -rf packages/host/tests/integration
+          rm -rf packages/host/tests/acceptance
           mkdir -p packages/host/tests/integration
+          mkdir -p packages/host/tests/acceptance
+          cp -r boxel-catalog-src/tests/acceptance/* packages/host/tests/acceptance
           cp -r boxel-catalog-src/tests/integration/* packages/host/tests/integration
           cp -r boxel-catalog-src/tests/helpers/* packages/host/tests/helpers
 

.github/workflows/ci-test.yaml

@@ -60,12 +60,19 @@ jobs:
           # Copy catalog source files (exclude config files that should stay from monorepo)
           rsync -av --exclude='tsconfig.json' --exclude='package.json' --exclude='.realm.json' --exclude='.gitignore' --exclude='tests/' boxel-catalog-src/ packages/catalog-realm/
 
-          # Copy catalog integration tests to host tests directory
+          # Copy catalog acceptance and integration tests to host tests directory
           rm -rf packages/host/tests/integration
+          rm -rf packages/host/tests/acceptance
           mkdir -p packages/host/tests/integration
+          mkdir -p packages/host/tests/acceptance
+          cp -r boxel-catalog-src/tests/acceptance/* packages/host/tests/acceptance
           cp -r boxel-catalog-src/tests/integration/* packages/host/tests/integration
           cp -r boxel-catalog-src/tests/helpers/* packages/host/tests/helpers
-
+
+
+          # Overwrite the test-wait-for-server script to include catalog server start
+          cp boxel-catalog-src/scripts/test-wait-for-servers.sh packages/host/scripts/test-wait-for-servers.sh
+
       - uses: ./.github/actions/init
 
       - name: Build common dependencies
@@ -105,6 +112,14 @@ jobs:
           sudo service dbus restart
           sudo service upower restart
 
+      - name: Run Catalog Acceptance Tests
+        run: dbus-run-session -- pnpm exec ember exam --path ./dist --filter="Acceptance | "
+        env:
+          PERCY_GZIP: true
+          PERCY_TOKEN: ${{ secrets.PERCY_TOKEN_HOST }}
+          DBUS_SYSTEM_BUS_ADDRESS: unix:path=/run/dbus/system_bus_socket
+        working-directory: packages/host
+
       - name: Run Catalog Integration Tests
         run: dbus-run-session -- pnpm exec ember exam --path ./dist --filter="Integration | "
         env:

catalog-app/listing/listing.gts

@@ -596,7 +596,7 @@ export class Listing extends CardDef {
       return undefined;
     }
     return {
-      label: 'Generate example with AI',
+      label: 'Generate Example with AI',
       action: async () => {
         const command = new ListingGenerateExampleCommand(
           params.commandContext,
@@ -677,7 +677,7 @@ export class Listing extends CardDef {
       label: 'Make a PR',
       action: async () => {
         await new CreateListingPRCommand(commandContext).execute({
-          listing: this,
+          listingId: this.id,
           realm: this[realmURL]!.href,
         });
       },

scripts/test-wait-for-servers.sh

@@ -0,0 +1,43 @@
+#! /bin/sh
+
+ensure_trailing_slash() {
+  case "$1" in
+    */) printf '%s' "$1" ;;
+    *) printf '%s/' "$1" ;;
+  esac
+}
+
+to_wait_url() {
+  case "$1" in
+    http://*) printf 'http-get://%s' "${1#http://}" ;;
+    https://*) printf 'https-get://%s' "${1#https://}" ;;
+    *) printf '%s' "$1" ;;
+  esac
+}
+
+DEFAULT_BASE_REALM_URL='http://localhost:4201/base/'
+DEFAULT_CATALOG_REALM_URL='http://localhost:4201/catalog/'
+DEFAULT_SKILLS_REALM_URL='http://localhost:4201/skills/'
+
+BASE_REALM_URL=$(ensure_trailing_slash "${RESOLVED_BASE_REALM_URL:-$DEFAULT_BASE_REALM_URL}")
+CATALOG_REALM_URL=$(ensure_trailing_slash "${RESOLVED_CATALOG_REALM_URL:-$DEFAULT_CATALOG_REALM_URL}")
+SKILLS_REALM_URL=$(ensure_trailing_slash "${RESOLVED_SKILLS_REALM_URL:-$DEFAULT_SKILLS_REALM_URL}")
+
+NODE_TEST_REALM="http-get://localhost:4202/node-test/"
+TEST_REALM="http-get://localhost:4202/test/"
+
+READY_PATH="_readiness-check?acceptHeader=application%2Fvnd.api%2Bjson"
+
+BASE_REALM_READY="$(to_wait_url "${BASE_REALM_URL}")${READY_PATH}"
+CATALOG_REALM_READY="$(to_wait_url "${CATALOG_REALM_URL}")${READY_PATH}"
+NODE_TEST_REALM_READY="$NODE_TEST_REALM$READY_PATH"
+SKILLS_REALM_READY="$(to_wait_url "${SKILLS_REALM_URL}")${READY_PATH}"
+TEST_REALM_READY="$TEST_REALM$READY_PATH"
+
+SYNAPSE_URL="http://localhost:8008"
+SMTP_4_DEV_URL="http://localhost:5001"
+
+WAIT_ON_TIMEOUT=600000 NODE_NO_WARNINGS=1 start-server-and-test \
+  'pnpm run wait' \
+  "$BASE_REALM_READY|$CATALOG_REALM_READY|$NODE_TEST_REALM_READY|$SKILLS_REALM_READY|$TEST_REALM_READY|$SYNAPSE_URL|$SMTP_4_DEV_URL" \
+  'ember-test-pre-built'