containers

src2/containers/ContainerRegistry.js

@@ -3,14 +3,17 @@ import {AppRegistry} from 'react-native';
 
 export function registerContainer(containerKey, getContainerFunc) {
   const OriginalContainer = getContainerFunc();
-  const NavigationContainer = wrapContainer(OriginalContainer);
+  const NavigationContainer = wrapContainer(containerKey, OriginalContainer);
   AppRegistry.registerComponent(containerKey, () => NavigationContainer);
 }
 
-function wrapContainer(OriginalContainer) {
+function wrapContainer(containerKey, OriginalContainer) {
   return class extends Component {
     constructor(props) {
       super(props);
+      if (!props.screenId) {
+        throw new Error(`Screen ${containerKey} does not have a screenId!`);
+      }
       this.state = {
         allProps: {...props}
       };

src2/containers/ContainerRegistry.test.js

@@ -20,63 +20,72 @@ describe('ComponentRegistry', () => {
     uut = require('./ContainerRegistry');
   });
 
-  function getRegisteredComponentClassFromAppRegistry() {
-    return AppRegistry.registerComponent.mock.calls[0][1]();
-  }
-
-  it('registers container component by containerKey into AppRegistry', () => {
-    expect(AppRegistry.registerComponent).not.toHaveBeenCalled();
-
-    uut.registerContainer('example.MyContainer.key', () => MyContainer);
-
-    expect(AppRegistry.registerComponent).toHaveBeenCalledTimes(1);
-    expect(AppRegistry.registerComponent.mock.calls[0][0]).toEqual('example.MyContainer.key');
-  });
-
-  it('wraps the container', () => {
-    uut.registerContainer('example.MyContainer', () => MyContainer);
-
-    const NavigationContainer = getRegisteredComponentClassFromAppRegistry();
-    const tree = renderer.create(
-      <NavigationContainer/>
-    );
-    expect(tree.toJSON().children).toEqual(['Hello, World!']);
-  });
-
-  it('passes props from wrapper into original container', () => {
-    uut.registerContainer('example.MyContainer', () => MyContainer);
-
-    const NavigationContainer = getRegisteredComponentClassFromAppRegistry();
-    const tree = renderer.create(
-      <NavigationContainer name="Daniel"/>
-    );
-    expect(tree.toJSON().children).toEqual(['Hello, Daniel!']);
-  });
-
-  it('updates props into original container', () => {
-    uut.registerContainer('example.MyContainer', () => MyContainer);
-
-    const NavigationContainer = getRegisteredComponentClassFromAppRegistry();
-    let testParentRef = null;
-    class TestParent extends Component { //eslint-disable-line
-      constructor(props) {
-        super(props);
-        this.state = {};
-      }
+  describe('registerContainer', () => {
+    function getRegisteredComponentClassFromAppRegistry() {
+      return AppRegistry.registerComponent.mock.calls[0][1]();
+    }
 
-      render() {
-        return (
-          <NavigationContainer name={this.state.name}/>
-        );
-      }
+    function renderRegisteredContainer(props) {
+      const Container = getRegisteredComponentClassFromAppRegistry();
+      return renderer.create(
+        <Container screenId="screen1" {...props}/>
+      );
     }
 
-    const tree = renderer.create(
-      <TestParent ref={(r) => testParentRef = r}/>
-    );
+    it('registers container component by containerKey into AppRegistry', () => {
+      expect(AppRegistry.registerComponent).not.toHaveBeenCalled();
+
+      uut.registerContainer('example.MyContainer.key', () => MyContainer);
+
+      expect(AppRegistry.registerComponent).toHaveBeenCalledTimes(1);
+      expect(AppRegistry.registerComponent.mock.calls[0][0]).toEqual('example.MyContainer.key');
+    });
+
+    it('wraps the container', () => {
+      uut.registerContainer('example.MyContainer', () => MyContainer);
+      const tree = renderRegisteredContainer();
+      expect(tree.toJSON().children).toEqual(['Hello, World!']);
+    });
+
+    it('passes props from wrapper into original container', () => {
+      uut.registerContainer('example.MyContainer', () => MyContainer);
+      const tree = renderRegisteredContainer({name: 'Daniel'});
+      expect(tree.toJSON().children).toEqual(['Hello, Daniel!']);
+    });
+
+    it('injects and updates props into original container', () => {
+      uut.registerContainer('example.MyContainer', () => MyContainer);
+
+      const NavigationContainer = getRegisteredComponentClassFromAppRegistry();
+      class TestParent extends Component { //eslint-disable-line
+        constructor(props) {
+          super(props);
+          this.state = {};
+        }
+
+        render() {
+          return (
+            <NavigationContainer screenId="screen1" name={this.state.name}/>
+          );
+        }
+      }
 
-    expect(tree.toJSON().children).toEqual(['Hello, World!']);
-    testParentRef.setState({name: 'Gandalf'});
-    expect(tree.toJSON().children).toEqual(['Hello, Gandalf!']);
+      let testParentRef = null;
+      const tree = renderer.create(
+        <TestParent ref={(r) => testParentRef = r}/>
+      );
+
+      expect(tree.toJSON().children).toEqual(['Hello, World!']);
+      testParentRef.setState({name: 'Gandalf'});
+      expect(tree.toJSON().children).toEqual(['Hello, Gandalf!']);
+    });
+
+    it('asserts has screenId as prop', () => {
+      uut.registerContainer('example.MyContainer.key', () => MyContainer);
+      const NavigationContainer = getRegisteredComponentClassFromAppRegistry();
+      expect(() => {
+        renderer.create(<NavigationContainer/>);
+      }).toThrow(new Error('Screen example.MyContainer.key does not have a screenId!'));
+    });
   });
 });

src2/containers/ContainerStore.js

@@ -0,0 +1 @@
+

src2/containers/ContainerStore.test.js

@@ -0,0 +1,5 @@
+describe('ContainerStore', () => {
+  it('holds containers', () => {
+    //
+  });
+});

wallaby.js

@@ -12,8 +12,6 @@ module.exports = function(wallaby) {
 
     files: [
       'package.json',
-      'node_modules/react/**/*.js',
-      'node_modules/*jest*/**/*.js',
       'src2/**/*.js',
       '!src2/**/*.test.js'
     ],