From 496f0ce905510dc863e0182c04b82326abd75176 Mon Sep 17 00:00:00 2001
From: Gleb Bahmutov <gleb.bahmutov@gmail.com>
Date: Mon, 1 Jun 2020 10:47:32 -0400
Subject: [PATCH 1/2] add new test job

---
 circle.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e6924300f..934dd05f2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,7 @@
 version: 2.1
 orbs:
   # use Cypress orb from CircleCI registry
-  cypress: cypress-io/cypress@1.16.1
+  cypress: cypress-io/cypress@1.23.0
   # for testing on Windows
   # https://circleci.com/docs/2.0/hello-world-windows/
   win: circleci/windows@1
@@ -58,6 +58,24 @@ jobs:
       - store_artifacts:
           path: cypress\videos
 
+  # let's see if the current HTML pages still work
+  # against the tests in the latest Cypress version
+  # if they work, then this project can be deployed safely
+  test-html-against-test-runner:
+    executor: cypress/base-12
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Test HTML pages
+          command: |
+            mkdir /tmp/test-folder
+            cd /tmp/test-folder
+            npm init -y
+            npm i -D cypress
+            echo "testing existing pages"
+            npx cypress run
+
   release:
     executor: cypress/base-10
     steps:
@@ -158,6 +176,11 @@ workflows:
           group: '2x-firefox on CircleCI'
           start: 'npm run start:ci'
 
+      - test-html-against-test-runner:
+          name: Test HTML against Test Runner
+          requires:
+            - Linux install
+
       - release:
           filters:
             branches:

From 33025076a67750ed3922ba06080902ca4c7adb37 Mon Sep 17 00:00:00 2001
From: Gleb Bahmutov <gleb.bahmutov@gmail.com>
Date: Tue, 23 Jun 2020 15:07:59 -0400
Subject: [PATCH 2/2] scaffold Cypress project

---
 circle.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 934dd05f2..62d31e288 100644
--- a/circle.yml
+++ b/circle.yml
@@ -68,13 +68,16 @@ jobs:
           at: ~/
       - run:
           name: Test HTML pages
+          # note: need to scaffold Cypress files
+          # https://github.com/cypress-io/cypress/issues/7554
           command: |
             mkdir /tmp/test-folder
             cd /tmp/test-folder
             npm init -y
             npm i -D cypress
-            echo "testing existing pages"
-            npx cypress run
+            echo '{}' >> cypress.json
+            echo "Testing existing pages"
+            CYPRESS_INTERNAL_FORCE_SCAFFOLD=1 npx cypress run
 
   release:
     executor: cypress/base-10