Refactoring getAdapter from Utils into its own file

enzymejs · Aug 4, 2018 · 27b056a · 27b056a
1 parent 290253d
commit 27b056a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 17 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -13,8 +13,8 @@ import {
   ITERATOR_SYMBOL,
   withSetStateAllowed,
   sym,
-  getAdapter,
 } from 'enzyme/build/Utils';
+import getAdapter from 'enzyme/build/getAdapter';
 
 import './_helpers/setupAdapters';
 import {

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -13,8 +13,8 @@ import {
   ITERATOR_SYMBOL,
   withSetStateAllowed,
   sym,
-  getAdapter,
 } from 'enzyme/build/Utils';
+import getAdapter from 'enzyme/build/getAdapter';
 
 import './_helpers/setupAdapters';
 import { createClass, createContext } from './_helpers/react-compat';

diff --git a/packages/enzyme-test-suite/test/Utils-spec.jsx b/packages/enzyme-test-suite/test/Utils-spec.jsx
@@ -9,8 +9,8 @@ import {
   displayNameOfNode,
   spyMethod,
   nodeHasType,
-  getAdapter,
 } from 'enzyme/build/Utils';
+import getAdapter from 'enzyme/build/getAdapter';
 import {
   flatten,
   mapNativeEventNames,

diff --git a/packages/enzyme/src/Debug.js b/packages/enzyme/src/Debug.js
@@ -12,7 +12,7 @@ import {
   propsOfNode,
   childrenOfNode,
 } from './RSTTraversal';
-import { getAdapter } from './Utils';
+import getAdapter from './getAdapter';
 
 const booleanValue = Function.bind.call(Function.call, Boolean.prototype.valueOf);
 

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -9,12 +9,12 @@ import {
   ITERATOR_SYMBOL,
   nodeEqual,
   nodeMatches,
-  getAdapter,
   makeOptions,
   sym,
   privateSet,
   cloneElement,
 } from './Utils';
+import getAdapter from './getAdapter';
 import { debugNodes } from './Debug';
 import {
   propsOfNode,

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -12,13 +12,13 @@ import {
   displayNameOfNode,
   isCustomComponentElement,
   ITERATOR_SYMBOL,
-  getAdapter,
   makeOptions,
   sym,
   privateSet,
   cloneElement,
   spyMethod,
 } from './Utils';
+import getAdapter from './getAdapter';
 import { debugNodes } from './Debug';
 import {
   propsOfNode,

diff --git a/packages/enzyme/src/Utils.js b/packages/enzyme/src/Utils.js
@@ -7,19 +7,14 @@ import has from 'has';
 import flat from 'array.prototype.flat';
 
 import { get } from './configuration';
-import validateAdapter from './validateAdapter';
 import { childrenOfNode } from './RSTTraversal';
+import realGetAdapter from './getAdapter';
 
 export const ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator;
 
 export function getAdapter(options = {}) {
-  if (options.adapter) {
-    validateAdapter(options.adapter);
-    return options.adapter;
-  }
-  const { adapter } = get();
-  validateAdapter(adapter);
-  return adapter;
+  console.warn('getAdapter from Utils is deprecated; please use ./getAdapter instead');
+  return realGetAdapter(options);
 }
 
 export function makeOptions(options) {
@@ -62,7 +57,7 @@ export function typeOfNode(node) {
 export function nodeHasType(node, type) {
   if (!type || !node) return false;
 
-  const adapter = getAdapter();
+  const adapter = realGetAdapter();
   if (adapter.displayNameOfNode) {
     const displayName = adapter.displayNameOfNode(node);
     return displayName === type;

diff --git a/packages/enzyme/src/getAdapter.js b/packages/enzyme/src/getAdapter.js
@@ -0,0 +1,12 @@
+import validateAdapter from './validateAdapter';
+import { get } from './configuration';
+
+export default function getAdapter(options = {}) {
+  if (options.adapter) {
+    validateAdapter(options.adapter);
+    return options.adapter;
+  }
+  const { adapter } = get();
+  validateAdapter(adapter);
+  return adapter;
+}
diff --git a/packages/enzyme/src/render.js b/packages/enzyme/src/render.js
@@ -1,5 +1,5 @@
 import cheerio from 'cheerio';
-import { getAdapter } from './Utils';
+import getAdapter from './getAdapter';
 
 /**
  * Renders a react component into static HTML and provides a cheerio wrapper around it. This is

diff --git a/packages/enzyme/src/selectors.js b/packages/enzyme/src/selectors.js
@@ -13,7 +13,8 @@ import {
   childrenOfNode,
   hasClassName,
 } from './RSTTraversal';
-import { getAdapter, nodeHasType, propsOfNode } from './Utils';
+import { nodeHasType, propsOfNode } from './Utils';
+import getAdapter from './getAdapter';
 // our CSS selector parser instance
 const parser = createParser();