refactor: rename baseElement and container

Author: bcarroll22

examples/__tests__/react-intl.js

@@ -39,7 +39,7 @@ const renderWithReactIntl = component => {
 setupTests();
 
 test('it should render FormattedDate and have a formatted pt date', () => {
-  const { container, rootInstance } = renderWithReactIntl(<FormatDateView />);
+  const { container } = renderWithReactIntl(<FormatDateView />);
 
-  getByText({ container, rootInstance }, '11/03/2019');
+  getByText(container, '11/03/2019');
 });

src/get-queries-for-element.js

@@ -12,7 +12,7 @@ import * as defaultQueries from './queries';
 function getQueriesForElement(container, queries = defaultQueries) {
   return Object.keys(queries).reduce((helpers, key) => {
     const fn = queries[key];
-    helpers[key] = fn.bind(null, { container: container, rootInstance: container.root });
+    helpers[key] = fn.bind(null, container);
     return helpers;
   }, {});
 }

src/queries.js

@@ -18,10 +18,11 @@ const queryByA11yRole = queryByProp.bind(null, 'accessibilityRole');
 const queryAllByA11yRole = queryAllByProp.bind(null, 'accessibilityRole');
 
 function queryAllByText(
-  { rootInstance },
+  container,
   text,
   { types = [Text, TextInput], exact = true, collapseWhitespace, trim, normalizer } = {},
 ) {
+  const rootInstance = container.root;
   const matcher = exact ? matches : fuzzyMatches;
   const matchNormalizer = makeNormalizer({ collapseWhitespace, trim, normalizer });
 
@@ -42,8 +43,8 @@ function queryByText(...args) {
 // 1. The error messages are specific to each one and depend on arguments
 // 2. The stack trace will look better because it'll have a helpful method name.
 
-function getAllByTestId({ rootInstance, container }, id, ...rest) {
-  const els = queryAllByTestId({ rootInstance, container }, id, ...rest);
+function getAllByTestId(container, id, ...rest) {
+  const els = queryAllByTestId(container, id, ...rest);
   if (!els.length) {
     throw getElementError(`Unable to find an element with the testID: ${id}`, container);
   }
@@ -54,8 +55,8 @@ function getByTestId(...args) {
   return firstResultOrNull(getAllByTestId, ...args);
 }
 
-function getAllByA11yRole({ rootInstance, container }, value, ...rest) {
-  const els = queryAllByA11yRole({ rootInstance, container }, value, ...rest);
+function getAllByA11yRole(container, value, ...rest) {
+  const els = queryAllByA11yRole(container, value, ...rest);
   if (!els.length) {
     throw getElementError(`Unable to find an element by accessibilityRole="${value}".`, container);
   }
@@ -66,8 +67,8 @@ function getByA11yRole(...args) {
   return firstResultOrNull(getAllByA11yRole, ...args);
 }
 
-function getAllByValue({ rootInstance, container }, value, ...rest) {
-  const els = queryAllByValue({ rootInstance, container }, value, ...rest);
+function getAllByValue(container, value, ...rest) {
+  const els = queryAllByValue(container, value, ...rest);
   if (!els.length) {
     throw getElementError(`Unable to find an element with the value: ${value}.`, container);
   }
@@ -78,8 +79,8 @@ function getByValue(...args) {
   return firstResultOrNull(getAllByValue, ...args);
 }
 
-function getAllByA11yLabel({ rootInstance, container }, text, ...rest) {
-  const els = queryAllByA11yLabel({ rootInstance, container }, text, ...rest);
+function getAllByA11yLabel(container, text, ...rest) {
+  const els = queryAllByA11yLabel(container, text, ...rest);
   if (!els.length) {
     throw getElementError(`Unable to find an element by accessibilityLabel="${text}"`, container);
   }
@@ -90,8 +91,8 @@ function getByA11yLabel(...args) {
   return firstResultOrNull(getAllByA11yLabel, ...args);
 }
 
-function getAllByPlaceholder({ rootInstance, container }, text, ...rest) {
-  const els = queryAllByPlaceholder({ rootInstance, container }, text, ...rest);
+function getAllByPlaceholder(container, text, ...rest) {
+  const els = queryAllByPlaceholder(container, text, ...rest);
   if (!els.length) {
     throw getElementError(
       `Unable to find an element with the placeholder text of: ${text}`,
@@ -105,8 +106,8 @@ function getByPlaceholder(...args) {
   return firstResultOrNull(getAllByPlaceholder, ...args);
 }
 
-function getAllByText({ rootInstance, container }, text, ...rest) {
-  const els = queryAllByText({ rootInstance, container }, text, ...rest);
+function getAllByText(container, text, ...rest) {
+  const els = queryAllByText(container, text, ...rest);
   if (!els.length) {
     throw getElementError(
       `Unable to find an element with the text: ${text}. This could be because the text is broken up by multiple elements. In this case, you can provide a function for your text matcher to make your matcher more flexible.`,
@@ -121,9 +122,9 @@ function getByText(...args) {
 }
 
 function makeFinder(getter) {
-  return (testInstance, text, options, waitForElementOptions) =>
+  return (testContainer, text, options, waitForElementOptions) =>
     waitForElement(
-      (instance = testInstance) => getter(instance, text, options),
+      (container = testContainer) => getter(container, text, options),
       waitForElementOptions,
     );
 }

src/query-helpers.js

@@ -66,10 +66,11 @@ function defaultFilter(node) {
 
 function queryAllByProp(
   attribute,
-  { container, rootInstance },
+  container,
   text,
   { filter, exact = true, collapseWhitespace, trim, normalizer } = {},
 ) {
+  const rootInstance = container.root;
   const matcher = exact ? matches : fuzzyMatches;
   const matchNormalizer = makeNormalizer({ collapseWhitespace, trim, normalizer });
   const allNodes = Array.from(rootInstance.findAll(c => c.props[attribute]));

src/wait-for-element.js

@@ -22,9 +22,7 @@ function waitForElement(callback, { container, interval = 50, timeout = 4500 } =
 
     function onMutation() {
       try {
-        const result = container
-          ? callback({ container, rootInstance: container.root })
-          : callback();
+        const result = container ? callback(container) : callback();
         if (result) {
           onDone(null, result);
         }