lifecycle screen fix

playground/e2e/app.test.js

@@ -20,11 +20,19 @@ describe('app', () => {
   });
 
   it('screen lifecycle', () => {
-    elementByLabel('Switch to lifecycle screen').tap();
+    elementByLabel('Push lifecycle screen').tap();
     expect(elementByLabel('onStart!')).toBeVisible();
     elementByLabel('Push to test onStop').tap();
     expect(elementByLabel('Alert')).toBeVisible();
-    expect(elementByLabel('onStop!')).toBeVisible();
+    expect(elementByLabel('onStop')).toBeVisible();
+  });
+
+  it('unmount is called on pop', () => {
+    elementByLabel('Push lifecycle screen').tap();
+    expect(elementByLabel('onStart!')).toBeVisible();
+    element(by.traits(['button']).and(by.label('Back'))).tap();
+    expect(elementByLabel('onStop')).toBeVisible();
+    expect(elementByLabel('componentWillUnmount')).toBeVisible();
   });
 });
 
@@ -148,12 +156,17 @@ describe('modal', () => {
   });
 });
 
-describe('reload app', () => {
-  before((done) => {
+describe.only('reload app', () => {
+  beforeEach((done) => {
     simulator.reloadReactNativeApp(done);
   });
 
-  it('shows welcome screen', () => {
+  it('push a screen to ensure its not there after reload', () => {
+    elementByLabel('Push').tap();
+    expect(elementByLabel('Pushed Screen')).toBeVisible();
+  });
+
+  it('show welcome screen after reload', () => {
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 });

playground/scripts/e2e.ios.js

@@ -44,6 +44,7 @@ function e2e() { //eslint-disable-line
                               ./node_modules/mocha/bin/mocha e2e
                                 --timeout ${10 * 60 * 1000}
                                 --recursive
+                                --bail
                                 --compilers js:babel-register`);
   } finally {
     shellUtils.exec.kill(`detox-server`);

playground/src/containers/LifecycleScreen.js

@@ -17,7 +17,11 @@ class LifecycleScreen extends Component {
   }
 
   onStop() {
-    alert('onStop!'); //eslint-disable-line
+    alert('onStop'); //eslint-disable-line
+  }
+
+  componentWillUnmount() {
+    alert('componentWillUnmount'); //eslint-disable-line
   }
 
   render() {

playground/src/containers/WelcomeScreen.js

@@ -8,6 +8,7 @@ class WelcomeScreen extends Component {
     super(props);
     this.onClickPush = this.onClickPush.bind(this);
     this.onClickShowModal = this.onClickShowModal.bind(this);
+    this.onClickLifecycleScreen = this.onClickLifecycleScreen.bind(this);
   }
 
   render() {
@@ -16,7 +17,7 @@ class WelcomeScreen extends Component {
         <Text style={styles.h1}>{`React Native Navigation!`}</Text>
         <Button title="Switch to tab based app" onPress={this.onClickSwitchToTabs} />
         <Button title="Switch to app with side menus" onPress={this.onClickSwitchToSideMenus} />
-        <Button title="Switch to lifecycle screen" onPress={this.onClickLifecycleScreen} />
+        <Button title="Push lifecycle screen" onPress={this.onClickLifecycleScreen} />
         <Button title="Push" onPress={this.onClickPush} />
         <Button title="Show Modal" onPress={this.onClickShowModal} />
         <Button title="Show Redbox" onPress={this.onClickShowRedbox} />
@@ -105,10 +106,8 @@ class WelcomeScreen extends Component {
   }
 
   onClickLifecycleScreen() {
-    Navigation.setRoot({
-      container: {
-        name: 'navigation.playground.LifecycleScreen'
-      }
+    Navigation.on(this.props.id).push({
+      name: 'navigation.playground.LifecycleScreen'
     });
   }