fix(run): cleanup globals if set from context (#2387)

* fix(run): cleanup globals if set from context * test node * build first * Update test/node/jsdom.js Co-authored-by: Stephen Mathieson <me@stephenmathieson.com> * Update test/node/jsdom.js Co-authored-by: Stephen Mathieson <me@stephenmathieson.com> Co-authored-by: Stephen Mathieson <me@stephenmathieson.com>
dequelabs · Jul 20, 2020 · d5b6931 · d5b6931
1 parent e48c1eb
commit d5b6931
Show file tree

Hide file tree

Showing 6 changed files with 738 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -139,6 +139,16 @@ jobs:
       - <<: *restore_dependency_cache_unix
       - run: npm run test:rule-help-version
 
+  # Test node API
+  test_node:
+    <<: *defaults
+    <<: *unix_box
+    steps:
+      - checkout
+      - <<: *restore_dependency_cache_unix
+      - run: npm run build
+      - run: npm run test:node
+
   # Release a "next" version
   next_release:
     <<: *defaults
@@ -208,6 +218,9 @@ workflows:
       - test_rule_help_version:
           requires:
             - test_unix
+      - test_node:
+          requires:
+            - test_unix
       # Hold for approval
       - hold:
           type: approval
@@ -218,6 +231,7 @@ workflows:
             - test_locales
             - build_api_docs
             - test_rule_help_version
+            - test_node
           filters:
             branches:
               only:
@@ -242,6 +256,7 @@ workflows:
             - test_locales
             - build_api_docs
             - test_rule_help_version
+            - test_node
             - hold
           filters:
             branches:

diff --git a/lib/core/public/run-rules.js b/lib/core/public/run-rules.js
@@ -1,9 +1,17 @@
 import Context from '../base/context';
+import cache from '../base/cache';
 
 // Clean up after resolve / reject
 function cleanup() {
+	if (cache.get('globalDocumentSet')) {
+		document = null;
+	}
+	if (cache.get('globalWindowSet')) {
+		window = null;
+	}
+
 	axe._memoizedFns.forEach(fn => fn.clear());
-	axe._cache.clear();
+	cache.clear();
 	axe._tree = undefined;
 	axe._selectorData = undefined;
 }

diff --git a/lib/core/public/run.js b/lib/core/public/run.js
@@ -1,4 +1,5 @@
 import { getReporter } from './reporter';
+import cache from '../base/cache';
 
 function isContext(potential) {
 	'use strict';
@@ -102,10 +103,12 @@ function run(context, options, callback) {
 		}
 
 		if (!hasDoc) {
+			cache.set('globalDocumentSet', true);
 			document = context.ownerDocument;
 		}
 
 		if (!hasWindow) {
+			cache.set('globalWindowSet', true);
 			window = document.defaultView;
 		}
 	}