fixed tests, refactored

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java

@@ -141,6 +141,6 @@ public class ApplicationLifecycleTest {
     }
 
     private void assertPushedScreenShown() {
-        assertExists(By.text("Pushed screen"));
+        assertExists(By.text("Pushed Screen"));
     }
 }

playground/e2e/app.test.js

@@ -15,13 +15,13 @@ describe('app', () => {
 
   it('push screen', () => {
     elementByLabel('Push').tap();
-    expect(elementByLabel('Pushed screen')).toBeVisible();
+    expect(elementByLabel('Pushed Screen')).toBeVisible();
   });
 
   it('switch to tabs with side menus', () => {
     elementByLabel('Switch to app with side menus').tap();
-    elementByLabel('This is a side menu center screen').swipe('right');
-    expect(elementByLabel('This is a side menu screen')).toBeVisible();
+    elementByLabel('This is a side menu center screen tab 1').swipe('right');
+    expect(elementByLabel('This is a left side menu screen')).toBeVisible();
   });
 
   it('screen lifecycle', () => {
@@ -34,29 +34,29 @@ describe('app', () => {
 
   it('pop screen', () => {
     elementByLabel('Push').tap();
-    expect(elementByLabel('Pushed screen')).toBeVisible();
+    expect(elementByLabel('Pushed Screen')).toBeVisible();
     elementByLabel('Pop').tap();
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
   it('show modal', () => {
     elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal screen')).toBeVisible();
+    expect(elementByLabel('Modal Screen')).toBeVisible();
   });
 
   it('dismiss modal', () => {
     elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal screen')).toBeVisible();
+    expect(elementByLabel('Modal Screen')).toBeVisible();
     elementByLabel('Dismiss Modal').tap();
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
-  
-  it.only('show multiple modals', () => {
+
+  xit('show multiple modals', () => {
     elementByLabel('Show Modal').tap();
-    expect(elementByLabel('ModalStackPosition: 1')).toBeVisible();
+    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
     elementByLabel('Show Modal').tap();
-    expect(elementByLabel('ModalStackPosition: 2s')).toBeVisible();
-  })
+    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+  });
 });
 
 describe('reload app', () => {

playground/src/containers/LifecycleScreen.js

@@ -23,10 +23,10 @@ class LifecycleScreen extends Component {
   render() {
     return (
       <View style={styles.root}>
-        <Text style={styles.h1}>Lifecycle Screen</Text>
+        <Text style={styles.h1}>{`Lifecycle Screen`}</Text>
         <Text style={styles.h1}>{this.state.text}</Text>
         <Button title="Push to test onStop" onPress={this.onClickPush} />
-        <Text style={styles.footer}>ContainerId: {this.props.id}</Text>
+        <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
   }

playground/src/containers/ModalScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import {
   StyleSheet,
   View,
@@ -17,27 +17,31 @@ class ModalScreen extends Component {
   render() {
     return (
       <View style={styles.root}>
-        <Text style={styles.h1}>Modal Screen</Text>
-        <Text style={styles.footer}>ModalStackPosition: {this.props.modalPosition || 1}</Text>
+        <Text style={styles.h1}>{`Modal Screen`}</Text>
+        <Text style={styles.footer}>{`Modal Stack Position: ${this.getModalPosition()}`}</Text>
         <Button title="Show Modal" onPress={this.onClickShowModal} />
         <Button title="Dismiss Modal" onPress={this.onClickDismissModal} />
-        <Text style={styles.footer}>ContainerId: {this.props.id}</Text>
+        <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
   }
-  
+
   onClickShowModal() {
     Navigation.showModal({
       name: 'navigation.playground.ModalScreen',
       passProps: {
-        modalPosition: (this.props.modalPosition || 1) + 1
+        modalPosition: this.getModalPosition() + 1
       }
     });
   }
-  
+
   onClickDismissModal() {
     Navigation.dismissModal(this.props.id);
   }
+
+  getModalPosition() {
+    return (this.props.modalPosition || 1);
+  }
 }
 
 const styles = {

playground/src/containers/PushedScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import {
   StyleSheet,
   View,
@@ -17,27 +17,31 @@ class PushedScreen extends Component {
   render() {
     return (
       <View style={styles.root}>
-        <Text style={styles.h1}>Pushed Screen</Text>
-        <Text style={styles.h2}>Stack Position: {this.props.stackPosition || 1}</Text>
+        <Text style={styles.h1}>{`Pushed Screen`}</Text>
+        <Text style={styles.h2}>{`Stack Position: ${this.getStackPosition()}`}</Text>
         <Button title="Push" onPress={this.onClickPush} />
         <Button title="Pop" onPress={this.onClickPop} />
-        <Text style={styles.footer}>ContainerId: {this.props.id}</Text>
+        <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
   }
-  
+
   onClickPush() {
     Navigation.on(this.props.id).push({
       name: 'navigation.playground.PushedScreen',
       passProps: {
-        stackPosition: (this.props.stackPosition || 1) + 1
+        stackPosition: this.getStackPosition() + 1
       }
     });
   }
-  
+
   onClickPop() {
     Navigation.on(this.props.id).pop();
   }
+
+  getStackPosition() {
+    return this.props.stackPosition || 1;
+  }
 }
 
 const styles = {

playground/src/containers/SimpleScreen.js

@@ -1,84 +0,0 @@
-//import React, { Component } from 'react';
-//import { View, Text, Button } from 'react-native';
-//
-//import Navigation from 'react-native-navigation';
-//
-//class SimpleScreen extends Component {
-//  constructor(props) {
-//    super(props);
-//    this.onClickPop = this.onClickPop.bind(this);
-//    this.onClickPush = this.onClickPush.bind(this);
-//    this.onClickShowModal = this.onClickShowModal.bind(this);
-//    this.onClickDismissModal = this.onClickDismissModal.bind(this);
-//  }
-//
-//  render() {
-//    return (
-//      <View style={styles.root}>
-//        <Text style={styles.h1}>{'Simple Screen'}</Text>
-//        <Text style={styles.h1}>Origin: {this.props.origin}</Text>
-//        <Text style={styles.h2}>Stack Position: {this.props.stackPosition}</Text>
-//        {this.renderTextFromFunctionInProps()}
-//        <Button title="Push" onPress={this.onClickPush} />
-//        <Button title="Pop" onPress={this.onClickPop} />
-//        <Button title="Show Modal" onPress={this.onClickPop} />
-//        <Button title="Dismiss Modal" onPress={this.onClickDismissModal} />
-//      </View>
-//    );
-//  }
-//
-//  renderTextFromFunctionInProps() {
-//    if (!this.props.myFunction) {
-//      return undefined;
-//    }
-//    return (
-//      <Text style={styles.h1}>{this.props.myFunction()}</Text>
-//    );
-//  }
-//
-//  onClickPop() {
-//    Navigation.on(this.props.id).pop();
-//  }
-//
-//  onClickPush() {
-//    Navigation.on(this.props.id).push({
-//      name: 'navigation.playground.SimpleScreen',
-//      passProps: {
-//        stackPosition: this.props.stackPosition + 1
-//      }
-//    });
-//  }
-//
-//  onClickShowModal() {
-//    Navigation.showModal({
-//      name: 'navigation.playground.SimpleScreen',
-//      passProps: {
-//        text: 'Modal screen'
-//      }
-//    });
-//  }
-//
-//  onClickDismissModal() {
-//    Navigation.dismissModal(this.props.id);
-//  }
-//}
-//export default SimpleScreen;
-//
-//const styles = {
-//  root: {
-//    flexGrow: 1,
-//    justifyContent: 'center',
-//    alignItems: 'center',
-//    backgroundColor: '#f5fcff'
-//  },
-//  h1: {
-//    fontSize: 24,
-//    textAlign: 'center',
-//    margin: 10
-//  },
-//  h2: {
-//    fontSize: 12,
-//    textAlign: 'center',
-//    margin: 10
-//  }
-//};

playground/src/containers/TextScreen.js

@@ -1,21 +1,29 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import {
   StyleSheet,
   View,
   Text
 } from 'react-native';
 
-
 class TextScreen extends Component {
-  
   render() {
     return (
       <View style={styles.root}>
         <Text style={styles.h1}>{this.props.text || 'Text Screen'}</Text>
-        <Text style={styles.footer}>ContainerId: {this.props.id}</Text>
+        {this.renderTextFromFunctionInProps()}
+        <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
   }
+
+  renderTextFromFunctionInProps() {
+    if (!this.props.myFunction) {
+      return undefined;
+    }
+    return (
+      <Text style={styles.h1}>{this.props.myFunction()}</Text>
+    );
+  }
 }
 
 const styles = {
@@ -42,5 +50,4 @@ const styles = {
   }
 };
 
-
 export default TextScreen;

playground/src/containers/WelcomeScreen.js

@@ -56,18 +56,24 @@ class WelcomeScreen extends Component {
           container: {
             name: 'navigation.playground.TextScreen',
             passProps: {
-              text: 'This is a side menu center screen'
+              text: 'This is a side menu center screen tab 1'
             }
           }
         },
         {
           container: {
-            name: 'navigation.playground.TextScreen'
+            name: 'navigation.playground.TextScreen',
+            passProps: {
+              text: 'This is a side menu center screen tab 2'
+            }
           }
         },
         {
           container: {
-            name: 'navigation.playground.TextScreen'
+            name: 'navigation.playground.TextScreen',
+            passProps: {
+              text: 'This is a side menu center screen tab 3'
+            }
           }
         }
       ],
@@ -76,13 +82,16 @@ class WelcomeScreen extends Component {
           container: {
             name: 'navigation.playground.TextScreen',
             passProps: {
-              text: 'This is a side menu screen'
+              text: 'This is a left side menu screen'
             }
           }
         },
         right: {
           container: {
-            name: 'navigation.playground.TextScreen'
+            name: 'navigation.playground.TextScreen',
+            passProps: {
+              text: 'This is a right side menu screen'
+            }
           }
         }
       }
@@ -105,7 +114,7 @@ class WelcomeScreen extends Component {
 
   onClickShowModal() {
     Navigation.showModal({
-      name: 'navigation.playground.ModalScreen',
+      name: 'navigation.playground.ModalScreen'
     });
   }
 

playground/src/containers/index.js

@@ -6,7 +6,6 @@ import PushedScreen from './PushedScreen';
 import LifecycleScreen from './LifecycleScreen';
 import ModalScreen from './ModalScreen';
 
-
 export function registerContainers() {
   Navigation.registerContainer(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
   Navigation.registerContainer(`navigation.playground.ModalScreen`, () => ModalScreen);