From 0555422c4bbedeeaf3cf718f4bb9b237df2fcee8 Mon Sep 17 00:00:00 2001
From: BryceLTaylor <brycet@media.mit.edu>
Date: Mon, 15 Nov 2021 11:28:29 -0500
Subject: [PATCH] Don't try to run non-existent tap integration tests

---
 .circleci/config.yml | 40 ----------------------------------------
 package.json         | 10 ++--------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f09b0cf2b..390cd6746 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -103,20 +103,6 @@ aliases:
             JEST_JUNIT_OUTPUT_NAME=integration-jest-results.xml npm run test:integration:jest:remote -- --reporters=jest-junit
       - store_test_results:
           path: test/results
-  - &integration_tap
-    <<: *defaults
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - run:
-          name: "integration tests with Tap"
-          command: |
-            mkdir ./test/results
-            npm run test:smoke:sauce -- --output-file ./test/results/integration-raw-tap.tap
-            npm run test:smoke:convertReportToXunit
-      - store_test_results:
-          path: test/results
   - &update-translations
     <<: *defaults
     steps:
@@ -139,12 +125,8 @@ jobs:
     <<: *deploy
   integration-staging-jest:
     <<: *integration_jest
-  integration-staging-tap:
-    <<: *integration_tap
   integration-production-jest:
     <<: *integration_jest
-  integration-production-tap:
-    <<: *integration_tap
   update-translations:
     <<: *update-translations
 
@@ -201,18 +183,6 @@ workflows:
                 - develop
                 - /^hotfix\/.*/
                 - /^release\/.*/
-      - integration-staging-tap:
-          context:
-            - scratch-www-all
-            - scratch-www-staging
-          requires:
-            - deploy-staging
-          filters:
-            branches:
-              only:
-                - develop
-                - /^hotfix\/.*/
-                - /^release\/.*/
       - integration-production-jest:
           context:
             - scratch-www-all
@@ -223,16 +193,6 @@ workflows:
             branches:
               only:
                 - master
-      - integration-production-tap:
-          context:
-            - scratch-www-all
-            - scratch-www-production
-          requires:
-            - deploy-production
-          filters:
-            branches:
-              only:
-                - master
   Update-translations:
     triggers:
       - schedule: # every evening at 7pm EST (8pm EDT, Midnight UTC)
diff --git a/package.json b/package.json
index 284b1a52f..3e0395d04 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,8 @@
     "test": "npm run test:lint && npm run build && npm run test:unit",
     "test:lint": "eslint . --ext .js,.jsx,.json",
     "test:lint:ci": "eslint . --ext .js,.jsx,.json --format junit -o ./test/results/lint-results.xml",
-    "test:integration": "npm run test:integration:jest && npm run test:smoke",
-    "test:integration:jest": "jest ./test/integration/*.test.js --reporters=default --runInBand",
-    "test:integration:remote": "npm run test:integration:jest:remote && npm run test:smoke:sauce",
-    "test:integration:jest:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand",
-    "test:smoke": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R classic",
-    "test:smoke:verbose": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R spec",
-    "test:smoke:sauce": "SMOKE_REMOTE=true tap ./test/integration-legacy/smoke-testing/*.js --timeout=60000 --no-coverage -R classic",
-    "test:smoke:convertReportToXunit": "tap ./test/results/integration-raw-tap.tap --no-coverage -R xunit > ./test/results/integration-tap-results.xml",
+    "test:integration": "jest ./test/integration/*.test.js --reporters=default --runInBand",
+    "test:integration:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand",
     "test:unit": "npm run test:unit:jest && npm run test:unit:tap",
     "test:unit:jest": "npm run test:unit:jest:unit && npm run test:unit:jest:localization",
     "test:unit:jest:unit": "jest ./test/unit/ --reporters=default",