Improve E2E Tests & Stability

.eslintrc

@@ -503,6 +503,15 @@
         "node": true
       }
     },
+    {
+      "files": [
+        "packages/jest-puppeteer-amp/src/**/*.js"
+      ],
+      "globals": {
+        "browser": "readonly",
+        "page": "readonly"
+      }
+    },
     {
       "files": [
         "packages/e2e-test-utils/**/*.js",

.github/workflows/tests-e2e.yml

@@ -132,6 +132,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental == true }}
     needs: [build, nonce]
     strategy:
+      fail-fast: false
       matrix:
         # TODO: add back Firefox once support is more mature.
         browser: ['chrome']
@@ -148,10 +149,6 @@ jobs:
             wp: 'latest'
             snapshots: true
             shard: '2/2'
-          - browser: 'chrome'
-            wp: 'latest'
-            snapshots: true
-            shard: '1/2'
           - browser: 'chrome'
             wp: '6.1-RC1'
             experimental: true
@@ -202,6 +199,13 @@ jobs:
           echo "chromium_path=${CHROMIUM}" >> $GITHUB_ENV
         if: ( matrix.snapshots ) && ( github.event.pull_request.draft == false )
 
+      - name: Download AMP validator JS
+        id: amp_validator
+        run: |
+          cd $RUNNER_TEMP && curl -O -f -s -S https://cdn.ampproject.org/v0/validator_wasm.js
+          AMP_VALIDATOR_FILE="${RUNNER_TEMP}/validator_wasm.js"
+          echo "validator_file=$AMP_VALIDATOR_FILE" >> $GITHUB_ENV
+
       - name: Run E2E tests with percy
         run: npm run test:e2e:percy -- -- --shard=$SHARD
         env:
@@ -210,13 +214,15 @@ jobs:
           PERCY_BROWSER_EXECUTABLE: ${{ env.chromium_path }}
           PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }}
           SHARD: ${{ matrix.shard }}
+          AMP_VALIDATOR_FILE: ${{ env.validator_file }}
         if: ( matrix.snapshots ) && ( github.event.pull_request.draft == false )
 
       - name: Run E2E tests
         run: npm run test:e2e -- --shard=$SHARD
         env:
           WP_VERSION: ${{ matrix.wp }}
           SHARD: ${{ matrix.shard }}
+          AMP_VALIDATOR_FILE: ${{ env.validator_file }}
         if: ( ! matrix.snapshots ) || ( github.event.pull_request.draft == true )
 
       - name: Stop Docker environment

bin/local-env/install-wordpress.sh

@@ -142,13 +142,13 @@ fi
 echo -e $(status_message "Installing and activating RTL Tester plugin...")
 wp plugin install rtl-tester --activate --force --quiet
 
-echo -e $(status_message "Installing WordPress importer...")
-wp plugin install wordpress-importer --activate --force --quiet
-
-# Only install woocommerce on latest version of WordPress.
+# Only install WooCommerce on latest version of WordPress.
 if [ "$WP_VERSION" == "latest" ] || [ "$WP_VERSION" == "6.1-RC1" ]; then
-	echo -e $(status_message "Installing WooCommerce plugin...")
-	wp plugin install woocommerce --activate --force --quiet
+  echo -e $(status_message "Installing WordPress importer...")
+  wp plugin install wordpress-importer --activate --force --quiet
+
+  echo -e $(status_message "Installing WooCommerce plugin...")
+  wp plugin install woocommerce --activate --force --quiet
 fi
 
 echo -e $(status_message "Installing AMP plugin...")
@@ -234,8 +234,12 @@ wp plugin list --format=yaml
 
 # Only install woocommerce on latest version of WordPress.
 if [ "$WP_VERSION" == "latest" ] || [ "$WP_VERSION" == "6.1-RC1" ]; then
-	echo -e $(status_message "Import sample woocommerce products...")
+	echo -e $(status_message "Import sample WooCommerce products...")
 	wp import /var/www/html/wp-content/plugins/woocommerce/sample-data/sample_products.xml --authors=skip --quiet
-	# deactivate test etc... can activate as needed
+
+  echo -e $(status_message "Deactivating WooCommerce again...")
 	wp plugin deactivate woocommerce
+
+  echo -e $(status_message "Deactivating WordPress importer again...")
+  wp plugin deactivate wordpress-importer --quiet
 fi

includes/Admin/Dashboard.php

@@ -352,6 +352,7 @@ public function load_stories_dashboard(): void {
 								'link',
 								'preview_link',
 								'edit_link',
+								'_links', // Needed for WP 6.1+
 								// _web_stories_envelope will add these fields, we need them too.
 								'body',
 								'status',