update deps, e2e works

src/commands/Commands.js

@@ -7,6 +7,6 @@ export default class Commands {
   }
 
   startApp(simpleApi) {
-    this.nativeCommandsSender.startApp(this.layoutTreeParser.parseSimpleJSON(simpleApi));
+    this.nativeCommandsSender.startApp(this.layoutTreeParser.parseFromSimpleJSON(simpleApi));
   }
 }

src/commands/LayoutTreeParser.js

@@ -5,9 +5,15 @@ export default class LayoutTreeParser {
     this.uniqueIdProvider = uniqueIdProvider;
   }
 
-  parseSimpleJSON(params) {
-    const layout = this.createContainerStackWithContainer(params.container);
-    return layout;
+  parseFromSimpleJSON(simpleJsonApi) {
+    if (simpleJsonApi.tabs) {
+      return {
+        type: 'Tabs',
+        id: this.uniqueIdProvider.generate(`Tabs`),
+        children: _.map(simpleJsonApi.tabs, (t) => this.createContainerStackWithContainer(t.container))
+      };
+    }
+    return this.createContainerStackWithContainer(simpleJsonApi.container);
   }
 
   createContainerStackWithContainer(container) {

src/commands/LayoutTreeParser.test.js

@@ -10,7 +10,7 @@ describe('LayoutTreeParser', () => {
   });
 
   it('parses single screen', () => {
-    expect(uut.parseSimpleJSON(SimpleLayouts.singleScreenApp))
+    expect(uut.parseFromSimpleJSON(SimpleLayouts.singleScreenApp))
       .toEqual({
         type: 'ContainerStack',
         id: 'ContainerStack+UNIQUE_ID',
@@ -28,7 +28,7 @@ describe('LayoutTreeParser', () => {
   });
 
   it('parses single screen with props', () => {
-    expect(uut.parseSimpleJSON(SimpleLayouts.singleScreenWithAditionalParams))
+    expect(uut.parseFromSimpleJSON(SimpleLayouts.singleScreenWithAditionalParams))
       .toEqual({
         type: 'ContainerStack',
         id: 'ContainerStack+UNIQUE_ID',
@@ -52,28 +52,56 @@ describe('LayoutTreeParser', () => {
           }
         ]
       });
+    expect(uut.parseFromSimpleJSON(SimpleLayouts.singleScreenWithAditionalParams).children[0].data.passProps.bar()).toEqual('Hello from a function');
   });
 
-  xit('parses tab based', () => {
-    expect(uut.parseSimpleJSON(SimpleLayouts.tabBasedApp))
+  it('parses tab based', () => {
+    expect(uut.parseFromSimpleJSON(SimpleLayouts.tabBasedApp))
       .toEqual({
         type: 'Tabs',
         id: 'Tabs+UNIQUE_ID',
         children: [
           {
-            container: {
-              name: 'com.example.FirstTab'
-            }
+            type: 'ContainerStack',
+            id: 'ContainerStack+UNIQUE_ID',
+            children: [
+              {
+                type: 'Container',
+                id: 'Container+UNIQUE_ID',
+                children: [],
+                data: {
+                  name: 'com.example.ATab'
+                }
+              }
+            ]
           },
           {
-            container: {
-              name: 'com.example.SecondTab'
-            }
+            type: 'ContainerStack',
+            id: 'ContainerStack+UNIQUE_ID',
+            children: [
+              {
+                type: 'Container',
+                id: 'Container+UNIQUE_ID',
+                children: [],
+                data: {
+                  name: 'com.example.SecondTab'
+                }
+              }
+            ]
           },
           {
-            container: {
-              name: 'com.example.FirstTab'
-            }
+            type: 'ContainerStack',
+            id: 'ContainerStack+UNIQUE_ID',
+            children: [
+              {
+                type: 'Container',
+                id: 'Container+UNIQUE_ID',
+                children: [],
+                data: {
+                  name: 'com.example.ATab'
+                }
+              }
+            ]
           }
         ]
       });

src/commands/SimpleLayouts.js

@@ -25,7 +25,7 @@ export const tabBasedApp = {
   tabs: [
     {
       container: {
-        name: 'com.example.FirstTab'
+        name: 'com.example.ATab'
       }
     },
     {
@@ -35,7 +35,7 @@ export const tabBasedApp = {
     },
     {
       container: {
-        name: 'com.example.FirstTab'
+        name: 'com.example.ATab'
       }
     }
   ]

yarn.lock

@@ -227,9 +227,9 @@ ast-query@^2.0.0:
     lodash "^4.6.1"
     traverse "^0.6.6"
 
-ast-types@0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b"
+ast-types@0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b"
 
 async-each@^1.0.0:
   version "1.0.1"
@@ -1684,11 +1684,7 @@ dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
 
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
+domelementtype@1, domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
 
@@ -1925,8 +1921,8 @@ escope@^3.6.0:
     estraverse "^4.1.1"
 
 eslint-plugin-babel@4.x.x:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.0.0.tgz#a92114e2c493ac3034b030d7ecf96e174a76ef3f"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.0.1.tgz#77de74dabd67a6bef3b16bf258f5804e971e7349"
 
 eslint-plugin-react-native@2.x.x:
   version "2.2.1"
@@ -2728,7 +2724,7 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@0.4.11, iconv-lite@^0.4.5:
+iconv-lite@0.4.11:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.11.tgz#2ecb42fd294744922209a2e7c404dac8793d8ade"
 
@@ -2736,7 +2732,7 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.13, iconv-lite@~0.4.13:
+iconv-lite@^0.4.13, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -3084,8 +3080,8 @@ istanbul-api@^1.1.0-alpha.1:
     once "^1.4.0"
 
 istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz#c3f9b6d226da12424064cce87fce0fb57fdfa7a2"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212"
 
 istanbul-lib-hook@^1.0.0:
   version "1.0.0"
@@ -4577,10 +4573,10 @@ rebound@^0.0.13:
   resolved "https://registry.yarnpkg.com/rebound/-/rebound-0.0.13.tgz#4a225254caf7da756797b19c5817bf7a7941fac1"
 
 recast@^0.11.17:
-  version "0.11.18"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.18.tgz#07af6257ca769868815209401d4d60eef1b5b947"
+  version "0.11.20"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.20.tgz#2cb9bec269c03b36d0598118a936cd0a293ca3f3"
   dependencies:
-    ast-types "0.9.2"
+    ast-types "0.9.4"
     esprima "~3.1.0"
     private "~0.1.5"
     source-map "~0.5.0"