@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6525006318 → 13.0.0-alpha.6944415045

package/Components/River/__tests__/__snapshots__/river.test.js.snap

@@ -6,42 +6,42 @@ exports[`When River has a general_content type <River /> renders correctly 1`] =
 >
   <RiverWithData
     appData={
-      Object {
+      {
         "layoutVersion": "v1",
       }
     }
     dispatch={[Function]}
     rivers={
-      Object {
-        "A1234": Object {
+      {
+        "A1234": {
           "home": true,
           "id": "A1234",
           "name": "foo",
           "type": "general_content",
-          "ui_components": Array [
-            Object {
+          "ui_components": [
+            {
               "component_type": "hero",
             },
-            Object {
+            {
               "component_type": "grid",
             },
           ],
         },
-        "B4567": Object {
+        "B4567": {
           "id": "B4567",
         },
-        "C0987": Object {
+        "C0987": {
           "home": false,
           "id": "C0987",
           "name": "Some-Screen-Plugin",
           "type": "some-screen-plugin",
-          "ui_components": Array [],
+          "ui_components": [],
         },
       }
     }
     screenId="A1234"
     store={
-      Object {
+      {
         "clearActions": [Function],
         "dispatch": [Function],
         "getActions": [Function],
@@ -64,13 +64,13 @@ exports[`When River has a general_content type <RiverComponent /> renders correc
 exports[`When River has any other type other than general_content <RiverComponent /> renders correctly 1`] = `
 <WithProvider
   screenData={
-    Object {
+    {
       "groupId": undefined,
       "home": false,
       "id": "C0987",
       "name": "Some-Screen-Plugin",
       "type": "some-screen-plugin",
-      "ui_components": Array [],
+      "ui_components": [],
     }
   }
   screenId="C0987"

package/Components/River/__tests__/componentsMap.test.js

@@ -75,7 +75,7 @@ const riverComponents = [
   },
 ];
 
-const screenData = {
+const mockScreenData = {
   ui_components: riverComponents,
   rules: { pull_to_refresh_enabled: false },
   id: "A1234",
@@ -85,18 +85,53 @@ jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
   useIsRTL: jest.fn(() => mock_rtl_flag),
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
-  useNavigation: jest.fn(() => ({ currentRoute: "/river/A1234" })),
-  useRoute: jest.fn(() => ({ pathname: "/river/A1234", screenData })),
-  useProfilerLogging: jest.fn(),
-  useIsScreenActive: jest.fn().mockReturnValue(true),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
+  () => ({
+    useNavigation: jest.fn(() => ({ currentRoute: "/river/A1234" })),
+  })
+);
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
-  useCurrentScreenData: jest.fn(() => screenData),
-  useScreenData: jest.fn(() => screenData),
-  useScreenContext: jest.fn(() => screenData),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute",
+  () => ({
+    useRoute: jest.fn(() => ({
+      pathname: "/river/A1234",
+      screenData: mockScreenData,
+    })),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useIsScreenActive",
+  () => ({
+    useIsScreenActive: jest.fn().mockReturnValue(true),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useCurrentScreenData",
+  () => ({
+    useCurrentScreenData: jest.fn(() => mockScreenData),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenData",
+  () => ({
+    useScreenData: jest.fn(() => mockScreenData),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext",
+  () => ({
+    ...jest.requireActual(
+      "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext"
+    ),
+    useScreenContext: jest.fn(() => mockScreenData),
+  })
+);
 
 const { View } = require("react-native");
 const { ComponentsMap } = require("../ComponentsMap/ComponentsMap");

package/Components/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap

@@ -7,7 +7,7 @@ exports[`<RouteManager /> renders correctly 1`] = `
   <WithProvider
     pathname="/river/A1234"
     screenData={
-      Object {
+      {
         "id": "A1234",
       }
     }

package/Components/RouteManager/__tests__/__snapshots__/testId.test.js.snap

@@ -4,7 +4,7 @@ exports[`TestId renders correctly and assigns the testID to a wrapping view 1`]
 <View
   accessibilityLabel="A1234"
   style={
-    Object {
+    {
       "flex": 1,
     }
   }

package/Components/Screen/__tests__/Screen.test.tsx

@@ -46,27 +46,37 @@ jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
   })),
 }));
 
-const NavBar = jest.fn((props) => <View testID="navBar" {...props} />);
+const mockNavBar = jest.fn((props) => {
+  const View = jest.requireActual("react-native").View;
+
+  return <View testID="navBar" {...props} />;
+});
 
 jest.mock(
   "@applicaster/zapp-react-native-app/App/Layout/layoutHelpers",
   () => ({
-    getNavigationPluginModule: () => NavBar,
+    getNavigationPluginModule: () => mockNavBar,
   })
 );
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
-  ...(jest.requireActual(
-    "@applicaster/zapp-react-native-utils/reactHooks/screen"
-  ) as any),
-  useScreenData: jest.fn(() => ({
-    id: "testId",
-    navigations: [{ id: "testId", category: "nav_bar" }],
-  })),
-  useCurrentScreenData: jest.fn(() => ({
-    id: "testId",
-  })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useCurrentScreenData",
+  () => ({
+    useCurrentScreenData: jest.fn(() => ({
+      id: "testId",
+    })),
+  })
+);
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenData",
+  () => ({
+    useScreenData: jest.fn(() => ({
+      id: "testId",
+      navigations: [{ id: "testId", category: "nav_bar" }],
+    })),
+  })
+);
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   isNavBarVisible: mockIsNavBarVisible,
@@ -84,20 +94,24 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   useIsScreenActive: jest.fn().mockReturnValue(true),
 }));
 
-jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: () => ({
-    plugins: [
-      {
-        name: "Offline Plugin",
-        identifier: "offline-experience",
-        type: "general",
-        module: {
-          OfflineFallbackScreen: ({ children }) => <View>{children}</View>, // eslint-disable-line
+jest.mock("@applicaster/zapp-react-native-redux/hooks/usePickFromState", () => {
+  const View = jest.requireActual("react-native").View;
+
+  return {
+    usePickFromState: () => ({
+      plugins: [
+        {
+          name: "Offline Plugin",
+          identifier: "offline-experience",
+          type: "general",
+          module: {
+            OfflineFallbackScreen: ({ children }) => <View>{children}</View>, // eslint-disable-line
+          },
         },
-      },
-    ],
-  }),
-}));
+      ],
+    }),
+  };
+});
 
 const {
   allowedOrientationsForScreen,

package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`<Screen Component /> when the navbar should be hidden renders correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "backgroundColor": "blue",
       "flex": 1,
       "paddingTop": 0,
@@ -22,7 +22,7 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
     <View
       pathname="/river/testId"
       screenData={
-        Object {
+        {
           "id": "testId",
         }
       }
@@ -35,7 +35,7 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
 exports[`<Screen Component /> when the navbar should show renders correctly 1`] = `
 <View
   style={
-    Object {
+    {
       "backgroundColor": "blue",
       "flex": 1,
       "paddingTop": 0,
@@ -54,7 +54,7 @@ exports[`<Screen Component /> when the navbar should show renders correctly 1`]
     <View
       pathname="/river/testId"
       screenData={
-        Object {
+        {
           "id": "testId",
         }
       }

package/Components/ScreenResolver/__tests__/__snapshots__/screenResolver.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`<ScreenResolver /> renders correctly 1`] = `
 <mockConstructor
-  screenData={Object {}}
+  screenData={{}}
   screenId="1234"
   screenType="screen_type_1"
 />
@@ -11,7 +11,7 @@ exports[`<ScreenResolver /> renders correctly 1`] = `
 exports[`<ScreenResolver /> wraps the player with the playerController component when the screenType is playable 1`] = `
 <HandlePlayable
   isModal={false}
-  item={Object {}}
+  item={{}}
   mode="FULLSCREEN"
 />
 `;

package/Components/ScreenResolver/__tests__/screenResolver.test.js

@@ -2,42 +2,39 @@ import React from "react";
 import { View } from "react-native";
 import { shallow } from "enzyme";
 import { shallowToJson } from "enzyme-to-json";
-import { connect as realConnect } from "react-redux";
-
 const pluginConfiguration = { foo: "bar" };
 
 const ScreenType1 = jest.fn(() => <View />);
 const ScreenType2 = jest.fn(() => <View />);
+const PlayerController = jest.fn(() => <View />);
 
-const ScreenType3 = {
+const mockScreenType3 = {
   module: jest.fn(() => <View />),
   name: "ScreenType3",
   type: "screen_type_3",
   configuration: pluginConfiguration,
 };
 
-const ScreenType4 = {
+const mockScreenType4 = {
   module: jest.fn(() => <View />),
   name: "ScreenType4",
   type: "screen_type_4",
 };
 
-const PlayerController = jest.fn(() => <View />);
-
-const playerPlugin = {
+const mockPlayerPlugin = {
   module: jest.fn(() => <View />),
   name: "playerPlugin",
   type: "player",
 };
 
-const ScreenPlugin = {
+const mockScreenPlugin = {
   module: jest.fn(() => <View />),
   type: "general",
   name: "Screen plugin",
   identifier: "screen-plugin",
 };
 
-const PluginWithConfig = {
+const mockPluginWithConfig = {
   module: jest.fn(() => <View />),
   type: "general",
   name: "Plugin with config",
@@ -47,15 +44,7 @@ const PluginWithConfig = {
 
 const components = { ScreenType1, ScreenType2, PlayerController };
 
-const plugins = {
-  ScreenType3,
-  ScreenType4,
-  playerPlugin,
-  ScreenPlugin,
-  PluginWithConfig,
-};
-
-const withAnalytics = {
+const mockWithAnalytics = {
   sendOnClickEvent: jest.fn(),
   sendMenuClickEvent: jest.fn(),
   sendMenuToggleEvent: jest.fn(),
@@ -66,24 +55,39 @@ const withAnalytics = {
   sendScreenEvent: jest.fn(),
 };
 
+const mockUsePickFromState = jest.fn(() => {
+  return {
+    components,
+    plugins: {
+      ScreenType3: mockScreenType3,
+      ScreenType4: mockScreenType4,
+      playerPlugin: mockPlayerPlugin,
+      ScreenPlugin: mockScreenPlugin,
+      PluginWithConfig: mockPluginWithConfig,
+    },
+  };
+});
+
 jest.mock("@applicaster/zapp-react-native-utils/analyticsUtils", () => ({
-  useAnalytics: jest.fn().mockReturnValue(withAnalytics),
+  useAnalytics: jest.fn().mockReturnValue(mockWithAnalytics),
 }));
 
 jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: jest.fn(() => ({ components, plugins })),
+  usePickFromState: mockUsePickFromState,
 }));
 
+const mockUseScreenAnalytics = jest.fn();
+
 jest.mock(
   "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks",
   () => ({
-    useScreenAnalytics: jest.fn(() => {}),
+    useScreenAnalytics: mockUseScreenAnalytics,
   })
 );
 
 jest.mock("react-redux", () => ({
+  ...jest.requireActual("react-redux"),
   useDispatch: jest.fn(() => () => {}),
-  connect: realConnect,
 }));
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
@@ -118,13 +122,13 @@ describe("<ScreenResolver />", () => {
   it("picks screen from plugins if it exists", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", {});
 
-    expect(wrapper.find(ScreenType3.module)).toHaveProperty("length", 1);
+    expect(wrapper.find(mockScreenType3.module)).toHaveProperty("length", 1);
   });
 
   it("picks the screen from its identifier if it exists", () => {
     const wrapper = getWrapper("A1234", "screen-plugin", {});
 
-    expect(wrapper.find(ScreenPlugin.module)).toHaveProperty("length", 1);
+    expect(wrapper.find(mockScreenPlugin.module)).toHaveProperty("length", 1);
   });
 
   it("picks screen from components if it doesn't exist in plugins", () => {
@@ -136,7 +140,7 @@ describe("<ScreenResolver />", () => {
   it("renders the screen and passes screenId & locationState as props", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", "foo");
 
-    const screenWrapper = wrapper.find(ScreenType3.module);
+    const screenWrapper = wrapper.find(mockScreenType3.module);
 
     expect(screenWrapper.prop("screenId")).toEqual("A1234");
     expect(screenWrapper.prop("screenData")).toEqual("foo");
@@ -151,7 +155,7 @@ describe("<ScreenResolver />", () => {
   it("injects the plugin configuration if it exists", () => {
     const wrapper = getWrapper("A1234", "plugin-with-config", {});
 
-    expect(wrapper.find(PluginWithConfig.module).props()).toHaveProperty(
+    expect(wrapper.find(mockPluginWithConfig.module).props()).toHaveProperty(
       "configuration",
       expect.objectContaining(pluginConfiguration)
     );
@@ -160,7 +164,7 @@ describe("<ScreenResolver />", () => {
   it("injects the plugin configuration if it exists, even when plugin is resolved by type", () => {
     const wrapper = getWrapper("A1234", "screen_type_3", {});
 
-    expect(wrapper.find(ScreenType3.module).props()).toHaveProperty(
+    expect(wrapper.find(mockScreenType3.module).props()).toHaveProperty(
       "configuration",
       expect.objectContaining(pluginConfiguration)
     );

package/Components/Tabs/Tab.tsx

@@ -138,6 +138,7 @@ const Tab = ({ title, selected, handleOnPress }: Props, ref: any) => {
 
   return (
     <TouchableWithoutFeedback
+      testID="tab-touchable"
       onPressIn={handleOnPressIn}
       onPressOut={handleOnPressOut}
       onPress={handleOnPress}

package/Components/TextInputTv/__tests__/TextInputTv.test.js

@@ -1,18 +1,13 @@
 import React from "react";
-import TestRenderer from "react-test-renderer";
-
-jest.mock("react-native", () => {
-  const RNMock = jest.genMockFromModule("react-native");
-  const { TextInput } = jest.requireActual("react-native");
-
-  return {
-    ...RNMock,
-    TextInput,
-    Platform: {
-      OS: "samsung_tv",
-      isTV: true,
-    },
-  };
+import { Platform } from "react-native";
+import { render } from "@testing-library/react-native";
+
+Platform.OS = "samsung_tv";
+
+Object.defineProperty(Platform, "isTV", {
+  get() {
+    return true;
+  },
 });
 
 jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
@@ -20,12 +15,12 @@ jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
 }));
 
 const { TextInputTv } = require("../");
-const { Platform, TextInput } = require("react-native");
+const testIDToTest = "TextInput-tv";
 
 describe("<TextInputTv />", () => {
   it("renders", () => {
-    const testInstance = TestRenderer.create(<TextInputTv />);
-    expect(testInstance.toJSON).toBeTruthy();
+    const { toJSON } = render(<TextInputTv />);
+    expect(toJSON()).toMatchSnapshot();
   });
 
   describe("on native", () => {
@@ -34,8 +29,8 @@ describe("<TextInputTv />", () => {
     });
 
     it("returns React-Native TextInput component if not on samsung", () => {
-      const testInstance = TestRenderer.create(<TextInputTv />);
-      expect(testInstance.root.findByType(TextInput)).toBeTruthy();
+      const { getByTestId } = render(<TextInputTv />);
+      expect(getByTestId(testIDToTest)).toBeTruthy();
     });
   });
 
@@ -45,29 +40,30 @@ describe("<TextInputTv />", () => {
     });
 
     it("returns React input component if on samsung", () => {
-      const testInstance = TestRenderer.create(<TextInputTv type="samsung" />);
-      expect(testInstance.root.findByType("input")).toBeTruthy();
+      const { getByTestId } = render(<TextInputTv type="samsung" />);
+      expect(getByTestId(testIDToTest)).toBeTruthy();
     });
 
     it("flattens styles", () => {
       Platform.OS = "samsung_tv";
       const style = [{ width: 200 }, { height: 200 }];
-      const testInstance = TestRenderer.create(<TextInputTv style={style} />);
 
-      expect(typeof testInstance.root.findByType("input").props.style).toBe(
-        "object"
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" style={style} />
       );
+
+      expect(getByTestId(testIDToTest).props.style).toBeObject();
     });
 
     it("maps onChangeText to onChange", () => {
       Platform.OS = "samsung_tv";
       const onChangeText = jest.fn();
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText={onChangeText} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText={onChangeText} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
       expect(inputInstance.props.onChange).toBeDefined();
       expect(inputInstance.props.onChangeText).toBeUndefined();
     });
@@ -76,11 +72,11 @@ describe("<TextInputTv />", () => {
       Platform.OS = "samsung_tv";
       const onChangeText = jest.fn();
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText={onChangeText} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText={onChangeText} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
       const value = "foobar";
       inputInstance.props.onChange({ target: { value: value } });
       expect(onChangeText).toBeCalledWith(value);
@@ -89,11 +85,12 @@ describe("<TextInputTv />", () => {
     it("maps onEndEditing to onBlur", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onEndEditing={() => null} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onEndEditing={() => null} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onBlur).toBeDefined();
       expect(inputInstance.props.onEndEditing).toBeUndefined();
     });
@@ -101,11 +98,12 @@ describe("<TextInputTv />", () => {
     it("maps onPress to onClick", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onPress={() => null} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onPress={() => null} />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onClick).toBeDefined();
       expect(inputInstance.props.onPress).toBeUndefined();
     });
@@ -113,22 +111,24 @@ describe("<TextInputTv />", () => {
     it("replaces secureTextEntry with type:'password'", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv secureTextEntry={true} />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" secureTextEntry />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.type).toBe("password");
     });
 
     it("removes 'onChangeText', 'secureTextEntry', 'onEndEditing', 'onPress' props", () => {
       Platform.OS = "samsung_tv";
 
-      const testInstance = TestRenderer.create(
-        <TextInputTv onChangeText secureTextEntry onEndEditing />
+      const { getByTestId } = render(
+        <TextInputTv type="samsung" onChangeText secureTextEntry onEndEditing />
       );
 
-      const inputInstance = testInstance.root.findByType("input");
+      const inputInstance = getByTestId(testIDToTest);
+
       expect(inputInstance.props.onChangeText).toBeUndefined();
       expect(inputInstance.props.secureTextEntry).toBeUndefined();
       expect(inputInstance.props.onEndEditing).toBeUndefined();

package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<TextInputTv /> renders 1`] = `
+<input
+  testID="TextInput-tv"
+/>
+`;

package/Components/TextInputTv/index.tsx

@@ -175,10 +175,10 @@ function TextInputTV(props: Props, ref) {
   return isWebPlatform ? (
     <>
       {additional && additional()}
-      <input ref={ref} {...inputProps} />
+      <input testID="TextInput-tv" ref={ref} {...inputProps} />
     </>
   ) : (
-    <TextInput ref={ref} {...inputProps} />
+    <TextInput testID="TextInput-tv" ref={ref} {...inputProps} />
   );
 }