fixing tests

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

@@ -76,7 +76,7 @@ public abstract class BaseTest {
 	}
 
 	public void assertExists(BySelector selector) {
-		assertThat(device().wait(Until.hasObject(selector), TIMEOUT)).isTrue();
+		assertThat(device().wait(Until.hasObject(selector), TIMEOUT)).withFailMessage("expected %1$s to be visible", selector).isTrue();
 		assertThat(device().findObject(selector).getVisibleCenter().x).isPositive().isLessThan(device().getDisplayWidth());
 		assertThat(device().findObject(selector).getVisibleCenter().y).isPositive().isLessThan(device().getDisplayHeight());
 	}

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

@@ -24,6 +24,7 @@ public class ReactEventsTest extends BaseTest {
 
 		device().pressKeyCode(KeyEvent.KEYCODE_R);
 		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		device().waitForIdle();
 		assertMainShown();
 	}
 
@@ -35,7 +36,7 @@ public class ReactEventsTest extends BaseTest {
 		assertExists(By.text("Pushed Screen"));
 
 		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		Thread.sleep(1000);
+		Thread.sleep(1500);
 		device().pressKeyCode(KeyEvent.KEYCODE_R);
 		assertExists(By.text("Pushed Screen"));
 	}

e2e/ScreenStyleStatic.test.js

@@ -3,8 +3,8 @@ describe('screen style - static', () => {
     await device.relaunchApp();
   });
 
-  it('declare a navigationStyle on container component', async () => {
-    await element(by.label('Push')).tap();
+  it('declare a navigationOptions on container component', async () => {
+    await element(by.label('Push Options Screen')).tap();
     await expect(element(by.label('Static Title').and(by.type('UILabel')))).toBeVisible();
   });
 });

e2e/TopLevelApi.test.js

@@ -20,7 +20,7 @@ describe('top level api', () => {
   });
 
   it('screen lifecycle', async () => {
-    await elementByLabel('Push lifecycle screen').tap();
+    await elementByLabel('Push Lifecycle Screen').tap();
     await expect(elementByLabel('onStart')).toBeVisible();
     await elementByLabel('Push to test onStop').tap();
     await expect(elementByLabel('Alert')).toBeVisible();
@@ -28,7 +28,7 @@ describe('top level api', () => {
   });
 
   it('unmount is called on pop', async () => {
-    await elementByLabel('Push lifecycle screen').tap();
+    await elementByLabel('Push Lifecycle Screen').tap();
     await expect(elementByLabel('onStart')).toBeVisible();
     await element(by.traits(['button']).and(by.label('Back'))).tap();
     await expect(elementByLabel('onStop')).toBeVisible();

lib/android/app/src/main/java/com/reactnativenavigation/react/JsDevReloadHandler.java

@@ -33,6 +33,6 @@ public class JsDevReloadHandler {
 	}
 
 	private boolean lessThan500MillisSinceLastR() {
-		return firstRTimestamp != 0 && System.currentTimeMillis() - firstRTimestamp < 500;
+		return firstRTimestamp != 0 && System.currentTimeMillis() - firstRTimestamp < 1000;
 	}
 }

lib/src/commands/Commands.test.js

@@ -38,7 +38,7 @@ describe('Commands', () => {
             children: [],
             data: {
               name: 'com.example.MyScreen',
-              navigationStyle: {}
+              navigationOptions: {}
             }
           }
         ]
@@ -81,7 +81,7 @@ describe('Commands', () => {
           id: "Container+UNIQUE_ID",
           data: {
             name: "com.example.MyScreen",
-            navigationStyle: {}
+            navigationOptions: {}
           },
           children: []
         }]
@@ -161,7 +161,7 @@ describe('Commands', () => {
         id: 'Container+UNIQUE_ID',
         data: {
           name: 'com.example.MyScreen',
-          navigationStyle: {}
+          navigationOptions: {}
         },
         children: []
       });

lib/src/commands/LayoutTreeCrawler.js

@@ -23,7 +23,7 @@ export default class LayoutTreeCrawler {
     this._assertContainerDataName(node);
     this.store.setPropsForContainerId(node.id, node.data.passProps);
     const clazz = this.store.getOriginalContainerClassForName(node.data.name);
-    node.data.navigationStyle = _.cloneDeep(_.get(clazz, 'navigationStyle', {}));
+    node.data.navigationOptions = _.cloneDeep(_.get(clazz, 'navigationOptions', {}));
   }
 
   _assertKnownLayoutType(type) {

lib/src/commands/LayoutTreeCrawler.test.js

@@ -47,28 +47,28 @@ describe('LayoutTreeCrawler', () => {
     expect(store.getPropsForContainerId('Container+UNIQUE_ID')).toEqual({ myProp: 123 });
   });
 
-  it('Containers: injects navigationStyle from original container class static property', () => {
+  it('Containers: injects navigationOptions from original container class static property', () => {
     const theStyle = {};
     const MyContainer = class {
-      static navigationStyle = theStyle;
+      static navigationOptions = theStyle;
     };
 
     const node = { type: LayoutTypes.Container, data: { name: 'theContainerName' } };
     store.setOriginalContainerClassForName('theContainerName', MyContainer);
     uut.crawl(node);
-    expect(node.data.navigationStyle).toEqual(theStyle);
+    expect(node.data.navigationOptions).toEqual(theStyle);
   });
 
-  it('Containers: deepClones navigationStyle', () => {
+  it('Containers: deepClones navigationOptions', () => {
     const theStyle = {};
     const MyContainer = class {
-      static navigationStyle = theStyle;
+      static navigationOptions = theStyle;
     };
 
     const node = { type: LayoutTypes.Container, data: { name: 'theContainerName' } };
     store.setOriginalContainerClassForName('theContainerName', MyContainer);
     uut.crawl(node);
-    expect(node.data.navigationStyle).not.toBe(theStyle);
+    expect(node.data.navigationOptions).not.toBe(theStyle);
   });
 
   it('Containers: must contain data name', () => {
@@ -76,12 +76,12 @@ describe('LayoutTreeCrawler', () => {
     expect(() => uut.crawl(node)).toThrow(new Error('Missing container data.name'));
   });
 
-  it('Containers: navigationStyle default obj', () => {
+  it('Containers: navigationOptions default obj', () => {
     const MyContainer = class { };
 
     const node = { type: LayoutTypes.Container, data: { name: 'theContainerName' } };
     store.setOriginalContainerClassForName('theContainerName', MyContainer);
     uut.crawl(node);
-    expect(node.data.navigationStyle).toEqual({});
+    expect(node.data.navigationOptions).toEqual({});
   });
 });

playground/src/containers/OptionsScreen.js

@@ -60,4 +60,4 @@ const styles = {
   }
 };
 
-export default PushedScreen;
+export default OptionsScreen;

playground/src/containers/WelcomeScreen.js

@@ -9,6 +9,7 @@ class WelcomeScreen extends Component {
     this.onClickPush = this.onClickPush.bind(this);
     this.onClickShowModal = this.onClickShowModal.bind(this);
     this.onClickLifecycleScreen = this.onClickLifecycleScreen.bind(this);
+    this.onClickPushOptionsScreen = this.onClickPushOptionsScreen.bind(this);
   }
 
   render() {
@@ -17,8 +18,9 @@ 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="Push lifecycle screen" onPress={this.onClickLifecycleScreen} />
+        <Button title="Push Lifecycle Screen" onPress={this.onClickLifecycleScreen} />
         <Button title="Push" onPress={this.onClickPush} />
+        <Button title="Push Options Screen" onPress={this.onClickPushOptionsScreen} />
         <Button title="Show Modal" onPress={this.onClickShowModal} />
         <Button title="Show Redbox" onPress={this.onClickShowRedbox} />
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
@@ -122,6 +124,12 @@ class WelcomeScreen extends Component {
   onClickShowRedbox() {
     undefined();
   }
+
+  onClickPushOptionsScreen() {
+    Navigation.push(this.props.id, {
+      name: 'navigation.playground.OptionsScreen'
+    });
+  }
 }
 
 export default WelcomeScreen;