merge conflicts

Author: Brandon Carroll

docs/api-act.md

@@ -7,6 +7,5 @@ sidebar_label: Act
 ## `act`
 
 This is a light wrapper around the
-[`react-test-renderer` `act` function](https://reactjs.org/docs/test-renderer.html).
-All it does is forward all arguments to the act function if your version of
-react supports `act`.
+[`react-test-renderer` `act` function](https://reactjs.org/docs/test-renderer.html). All it does is
+forward all arguments to the act function if your version of react supports `act`.

docs/api-events.md

@@ -7,7 +7,7 @@ sidebar_label: Firing Events
 ## Basic example
 
 ```javascript
-import { fireEvent, NativeTestEvent, render } from 'native-testing-library';
+import { fireEvent, NativeTestEvent, render } from '@testing-library/react-native';
 
 const { getByText } = render(<Button title="Submit" />);
 fireEvent(getByText(container, 'Submit'), new NativeTestEvent('press'));
@@ -24,7 +24,7 @@ Convenience methods for firing events. Check out
 for a full list as well as `validTargets` for every event type.
 
 ```javascript
-import { fireEvent, render } from 'native-testing-library';
+import { fireEvent, render } from '@testing-library/react-native';
 
 const { getByText } = render(<Button title="Submit" />);
 fireEvent.press(getByText('Submit'));

docs/api-helpers.md

@@ -6,15 +6,15 @@ sidebar_label: Helpers
 
 ## Custom Queries
 
-`native-testing-library` exposes some of the helper functions that are used to implement the default
-queries. You can use the helpers to build custom queries. For example, the code below shows a way to
-query your TestInstance by a `style` prop. Note: test files would need to now import `test-utils.js`
-instead of using `native-testing-library` directly. Also note, please never actually implement this
-helper, it's just an example of what's possible.
+RNTL exposes some of the helper functions that are used to implement the default queries. You can
+use the helpers to build custom queries. For example, the code below shows a way to query your
+TestInstance by a `style` prop. Note: test files would need to now import `test-utils.js` instead of
+importing directly from RNTL. Also note, please never actually implement this helper, it's just an
+example of what's possible.
 
 ```javascript
 // test-utils.js
-import * as nativeTestingLib from 'native-testing-library';
+import * as nativeTestingLib from '@testing-library/react-native';
 
 const { queryHelpers } = nativeTestingLib;
 
@@ -78,7 +78,7 @@ query functions, allowing them to be used without manually specifying a containe
 Example: To get the username input of a login form within a `<LoginModal />`, you could do:
 
 ```js
-import { render, within } from 'native-testing-library';
+import { render, within } from '@testing-library/react-native';
 
 const { getByLabelText } = render(<LoginModal />);
 const loginForm = getByLabelText('login-form');

docs/api-queries.md

@@ -77,7 +77,7 @@ This will search for all elements with an `accessibilityHint` prop and find one
 given [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'react-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByHintText } = render(<View accessibilityHint="summary" />);
 
@@ -117,7 +117,7 @@ function Login({ onPress }) {
   );
 }
 
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByLabelText } = render(<Login onPress={jest.fn()} />);
 
@@ -141,7 +141,7 @@ This will search for all elements with an `accessibilityRole` prop and find one
 given [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'react-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByRole } = render(<View accessibilityRole="summary" />);
 
@@ -173,7 +173,7 @@ This will search for all elements with a `placeholder` prop and find one that ma
 [`TextMatch`](#textmatch).
 
 ```javascript
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByPlaceholderText } = render(<TextInput placeholder="Username" />);
 
@@ -201,7 +201,7 @@ This will search for all elements of type `Text` with `props.children` matching
 also search for `Button` elements by their `title` [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByText } = render(<Text>About ℹ</Text>);
 
@@ -229,7 +229,7 @@ This will search for all `Button` or `RefreshControl` elements with `props.title
 by their value [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByTitle } = render(<Button title="About" />);
 
@@ -258,7 +258,7 @@ This will search for all `TextInput` elements with a `value` prop and `Picker` o
 with a `selectedValue` prop and find ones that matches the given [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByDisplayValue } = render(<Input value="About ℹ" onChangeText={() => ({})} />);
 
@@ -286,7 +286,7 @@ This will search for all elements with a `testID` and find one that matches the
 [`TextMatch`](#textmatch).
 
 ```js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 
 const { getByTestId } = render(<Text testID="test">hi there</Text>);
 
@@ -319,9 +319,9 @@ of string matching:
 
 ### Normalization
 
-Before running any matching logic against text, `native-testing-library` automatically normalizes
-that text. By default, normalization consists of trimming whitespace from the start and end of text,
-and collapsing multiple adjacent whitespace characters into a single space.
+Before running any matching logic against text, RNTL automatically normalizes that text. By default,
+normalization consists of trimming whitespace from the start and end of text, and collapsing
+multiple adjacent whitespace characters into a single space.
 
 If you want to prevent that normalization, or provide alternative normalization (e.g. to remove
 Unicode control characters), you can provide a `normalizer` function in the options object. This

docs/cheat-sheet.md

@@ -5,8 +5,8 @@ sidebar_label: Cheat Sheet
 ---
 
 There is a printable one-page cheat sheet available for you to download. It is intended to be a
-quick reference for `native-testing-library`, but is not a complete API glossary or guide. Keep a
-copy of it on your desk to quickly take a peek at the most commonly used functionality!
+quick reference for RNTL, but is not a complete API glossary or guide. Keep a copy of it on your
+desk to quickly take a peek at the most commonly used functionality!
 
 [Download the cheat sheet][cheatsheet]
 

docs/ecosystem-jest-native.md

@@ -4,8 +4,8 @@ title: Jest Matchers
 sidebar_label: Jest Matchers
 ---
 
-[`jest-native`](https://github.com/testing-library/jest-native) is a companion library for
-`native-testing-library` that provides custom element matchers for Jest.
+[`jest-native`](https://github.com/testing-library/jest-native) is a companion library for RNTL that
+provides custom element matchers for Jest.
 
 ```
 npm install --save-dev jest-native

docs/example-context.md

@@ -8,7 +8,7 @@ sidebar_label: Context
 import React from 'react';
 import { Text } from 'react-native';
 
-import { render } from ' native-testing-library';
+import { render } from '@testing-library/react-native';
 import { NameContext, NameProvider, NameConsumer } from '../react-context';
 
 test('NameConsumer shows default value', () => {

docs/example-input-event.md

@@ -7,7 +7,7 @@ sidebar_label: Input Event
 ```javascript
 import React from 'react';
 import { Text, TextInput } from 'react-native';
-import { render, fireEvent } from ' native-testing-library';
+import { render, fireEvent } from '@testing-library/react-native';
 
 class CostInput extends React.Component {
   state = {

docs/example-intl.md

@@ -12,7 +12,7 @@ import { FormattedDate } from 'react-intl-native';
 import IntlPolyfill from 'intl';
 import 'intl/locale-data/jsonp/pt';
 
-import { getByText, render } from ' native-testing-library';
+import { getByText, render } from '@testing-library/react-native';
 
 const setupTests = () => {
   if (global.Intl) {

docs/example-navigation.md

@@ -9,7 +9,7 @@ import React from 'react';
 import { Button, Text, View } from 'react-native';
 import { createStackNavigator, createAppContainer, withNavigation } from 'react-navigation';
 
-import { render, fireEvent } from ' native-testing-library';
+import { render, fireEvent } from '@testing-library/react-native';
 
 jest.mock('NativeAnimatedHelper').mock('react-native-gesture-handler', () => {
   const View = require('react-native/Libraries/Components/View/View');

docs/example-redux.md

@@ -9,7 +9,7 @@ import React from 'react';
 import { Button, Text, View } from 'react-native';
 import { createStore } from 'redux';
 import { Provider, connect } from 'react-redux';
-import { render, fireEvent } from ' native-testing-library';
+import { render, fireEvent } from '@testing-library/react-native';
 
 class Counter extends React.Component {
   increment = () => {

docs/example-update-props.md

@@ -7,7 +7,7 @@ sidebar_label: Update Props
 ```javascript
 import React from 'react';
 import { Text, View } from 'react-native';
-import { render } from ' native-testing-library';
+import { render } from '@testing-library/react-native';
 
 let idCounter = 1;
 
@@ -32,5 +32,4 @@ test('calling render with the same component on the same container does not remo
 
   expect(getByTestId('instance-id').props.children).toEqual(1);
 });
-
 ```

docs/example.md

@@ -7,7 +7,7 @@ sidebar_label: Example
 ```javascript
 import React from 'react';
 import { Button, Text, TextInput, View } from 'react-native';
-import { fireEvent, render, wait } from 'native-testing-library';
+import { fireEvent, render, wait } from '@testing-library/react-native';
 
 function Example() {
   const [name, setUser] = React.useState('');

docs/guide-disappearance.md

@@ -3,10 +3,11 @@ id: guide-disappearance
 title: Appearance and Disappearance
 ---
 
-`dom-testing-library` can utilize a fake DOM `MutationObserver` to look for changes, but we don't
-have that luxury in the native/test renderer environment. Since we don't have that, you should know
-that all `wait-*` utilities in this library offer roughly the same functionality, just with some
-added convenience.
+Testing Library implementations that leverage
+[DTL](https://github.com/testing-library/dom-testing-library) can utilize a fake DOM
+`MutationObserver` to look for changes, but we don't have that luxury. Since we don't have that, you
+should know that all `wait-*` utilities in this library offer roughly the same functionality, just
+with some added convenience.
 
 Since we can't "observe" a DOM, we just have to poll it at a given interval
 

docs/guiding-principles.md

@@ -19,6 +19,6 @@ Utilities are included in this project based on the following guiding principles
     they're intended to be used.
 3.  Utility implementations and APIs should be simple and flexible.
 
-In summary, we believe in the principles of `testing-library`, and adhere to them as closely as
+In summary, we believe in the principles of Testing Library, and adhere to them as closely as
 possible. At the end of the day, what we want is for this library to be pretty light-weight, simple,
 and understandable.

docs/install.md

@@ -9,7 +9,7 @@ sidebar_label: Install
 This module should be installed in your project's `devDependencies`:
 
 ```
-npm install --save-dev native-testing-library
+npm install --save-dev @testing-library/react-native
 ```
 
 You will need `react` and `react-native` installed as _dependencies_ in order to run this project.
@@ -87,7 +87,7 @@ these components that isn't mocked, just `debug()` to see what your users are se
 You will likely be able to import everything you'll need from the project entry point like this:
 
 ```js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 ```
 
 The library's tests run in Node 8-11 before all new versions are published, and all files are

docs/intro.md

@@ -7,24 +7,23 @@ sidebar_label: Introduction
 ## The problem
 
 You want to write maintainable tests for your React Native application. You love Kent Dodds'
-[testing library](https://testing-library.com), and you want to be able to write maintainable tests
+[Testing Library](https://testing-library.com), and you want to be able to write maintainable tests
 for your React Native application. You don't want to use a library that renders components to a fake
 DOM, and you've had a hard time finding what you need to write tests using that philosophy in React
 Native.
 
 ## This solution
 
-`native-testing-library` is an implementation of the well-known `testing-library` API that works for
-React Native. The primary goal is to mimic the testing library API as closely as possible while
+Native Testing Library (RNTL) is an implementation of the well-known Testing Library API that works
+for React Native. The primary goal is to mimic the testing library API as closely as possible while
 still accounting for the differences in the platforms. Accomplishing this is no small feat because
-of the differences between the two platforms. Although most framework implementations like
-`react-testing-library` are thin layers over [dom-testing-library](https://testing-library.com),
+of the differences between the two platforms. Although most framework implementations like React
+Testing Library (RTL) are thin layers over [DOM Testing Library (DTL)](https://testing-library.com),
 this library needed to have its own base implementation as well as a user-facing API. This library
-uses the [react-test-renderer](https://reactjs.org/docs/test-renderer.html), whereas
-`dom-testing-library` uses ReactDOM to render to JSDOM. The main philosophy is that you should find
-elements the way your users would. This approach is meant to give you confidence that your app is
-working as a cohesive unit. Just like the `dom-testing-library`, `native-testing-library`'s primary
-guiding principle is:
+uses the [react-test-renderer](https://reactjs.org/docs/test-renderer.html), whereas DOM Testing
+Library (DTL) uses JSDOM. The main philosophy here is that you should find elements on the "screen"
+the way users would. This approach is meant to give you confidence that your app is working as a
+cohesive unit. Just like DTL, RNTL's primary guiding principle is:
 
 > [The more your tests resemble the way your software is used, the more confidence they can give you.](guiding-principles.md)
 

docs/setup.md

@@ -6,14 +6,14 @@ sidebar_label: Setup
 
 ## Setting up your project
 
-The `native-testing-library` API should work out of the box for most tests. All of the snippets
-you'll find throughout the website work without any additional configuration assuming you use Jest
-and a moderately recent version of React Native.
+The RNTL API should work out of the box for most tests. All of the snippets you'll find throughout
+the website work without any additional configuration assuming you use Jest and a moderately recent
+version of React Native.
 
-We strongly encourage you to use Jest with the `native-testing-library` preset. The `react-native`
-preset should also work, but you'll be getting the best experience when using our preset. There may
-be some additional mocks you need to provide to such as mocks for `react-native-gesture-handler`
-when using `react-navigation`.
+We strongly encourage you to use Jest with the `@testing-library/react-native` preset. The
+`react-native` preset may also work, but you'll be getting the best experience when using our
+preset. There may be some additional mocks you need to provide to such as mocks for
+`react-native-gesture-handler` when using `react-navigation`.
 
 ## Cleanup
 
@@ -39,23 +39,22 @@ module.exports = {
 
 It's often useful to define a custom render method that includes things like global context
 providers, data stores, etc. To make this available globally, one approach is to define a utility
-file that re-exports everything from `native-testing-library`. You can replace
-`native-testing-library` with this file in all your imports. See
-[below](#configuring-jest-with-test-utils) for a way to make your test util file accessible without
-using relative paths.
+file that re-exports everything from RNTL. You can replace `@testing-library/react-native` with this
+file in all your imports. See [below](#configuring-jest-with-test-utils) for a way to make your test
+util file accessible without using relative paths.
 
 The example below sets up data providers using the [`wrapper`](api-main.md#render-options) option to
 `render`.
 
 ```diff
 // my-component.test.js
-- import { render, fireEvent } from 'native-testing-library';
+- import { render, fireEvent }from '@testing-library/react-native';
 + import { render, fireEvent } from '../test-utils';
 ```
 
 ```js
 // test-utils.js
-import { render } from 'native-testing-library';
+import { render } from '@testing-library/react-native';
 import { ThemeProvider } from 'my-ui-lib';
 import { TranslationProvider } from 'my-i18n-lib';
 import defaultStrings from 'i18n/en-x-default';
@@ -71,7 +70,7 @@ const AllTheProviders = ({ children }) => {
 const customRender = (ui, options) => render(ui, { wrapper: AllTheProviders, ...options });
 
 // re-export everything
-export * from 'native-testing-library';
+export * from '@testing-library/react-native';
 
 // override render method
 export { customRender as render };