Browse Source

More Detox related work

Guy Carmeli 6 years ago
parent
commit
8045c23da2
4 changed files with 23 additions and 3 deletions
  1. 2
    1
      e2e/Modals.test.js
  2. 2
    1
      e2e/Orientations.test.js
  3. 1
    1
      e2e/ScreenStack.test.js
  4. 18
    0
      e2e/StaticLifecycleEvents.test.js

+ 2
- 1
e2e/Modals.test.js View File

1
 const Utils = require('./Utils');
1
 const Utils = require('./Utils');
2
 const testIDs = require('../playground/src/testIDs');
2
 const testIDs = require('../playground/src/testIDs');
3
+const Android = require('./AndroidUtils');
3
 
4
 
4
 const { elementByLabel, elementById, tapDeviceBackAndroid } = Utils;
5
 const { elementByLabel, elementById, tapDeviceBackAndroid } = Utils;
5
 
6
 
103
     await elementById(testIDs.SHOW_MODAL_BUTTON).tap();
104
     await elementById(testIDs.SHOW_MODAL_BUTTON).tap();
104
     await elementById(testIDs.PUSH_BUTTON).tap();
105
     await elementById(testIDs.PUSH_BUTTON).tap();
105
     await elementById(testIDs.PUSH_BUTTON).tap();
106
     await elementById(testIDs.PUSH_BUTTON).tap();
106
-    tapDeviceBackAndroid();
107
+    Android.pressBack();
107
     await expect(elementByLabel('Pushed Screen')).toBeVisible();
108
     await expect(elementByLabel('Pushed Screen')).toBeVisible();
108
   });
109
   });
109
 });
110
 });

+ 2
- 1
e2e/Orientations.test.js View File

8
 
8
 
9
   beforeEach(async () => {
9
   beforeEach(async () => {
10
     await device.relaunchApp();
10
     await device.relaunchApp();
11
-    waitForDeviceToSettleAfterOrientationChangeAndroid = ms => new Promise(res => setTimeout(res, device.getPlatform() === 'ios' ? 0 : 10));
11
+    waitForDeviceToSettleAfterOrientationChangeAndroid = ms => new Promise(res => setTimeout(res, device.getPlatform() === 'ios' ? 0 : 150));
12
   });
12
   });
13
 
13
 
14
   it('default allows all', async () => {
14
   it('default allows all', async () => {
30
     await device.setOrientation('landscape');
30
     await device.setOrientation('landscape');
31
     await expect(element(by.id(testIDs.LANDSCAPE_ELEMENT))).toBeVisible();
31
     await expect(element(by.id(testIDs.LANDSCAPE_ELEMENT))).toBeVisible();
32
     await device.setOrientation('portrait');
32
     await device.setOrientation('portrait');
33
+    waitForDeviceToSettleAfterOrientationChangeAndroid();
33
     await expect(element(by.id(testIDs.PORTRAIT_ELEMENT))).toBeVisible();
34
     await expect(element(by.id(testIDs.PORTRAIT_ELEMENT))).toBeVisible();
34
     await elementById(testIDs.DISMISS_BUTTON).tap();
35
     await elementById(testIDs.DISMISS_BUTTON).tap();
35
   });
36
   });

+ 1
- 1
e2e/ScreenStack.test.js View File

75
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
75
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
76
   });
76
   });
77
 
77
 
78
-  it.only(':android: override hardware back button', async () => {
78
+  it(':android: override hardware back button', async () => {
79
     await elementByLabel('BACK HANDLER').tap();
79
     await elementByLabel('BACK HANDLER').tap();
80
     await expect(elementByLabel('Back Handler Screen')).toBeVisible();
80
     await expect(elementByLabel('Back Handler Screen')).toBeVisible();
81
 
81
 

+ 18
- 0
e2e/StaticLifecycleEvents.test.js View File

1
+const Utils = require('./Utils');
2
+const testIDs = require('../playground/src/testIDs');
3
+const { elementByLabel, elementById } = Utils;
4
+
5
+describe('Overlay', () => {
6
+  beforeEach(async () => {
7
+    await device.relaunchApp();
8
+  });
9
+
10
+  it('didAppear didDisappear', async () => {
11
+    await elementById(testIDs.PUSH_STATIC_LIFECYCLE_BUTTON).tap();
12
+    await expect(elementByLabel('Static Lifecycle Events')).toBeVisible();
13
+    await expect(elementByLabel('didAppear | navigation.playground.StaticLifecycleOverlay')).toBeVisible();
14
+    await elementByLabel('PUSH').tap();
15
+    await expect(elementByLabel('didAppear | navigation.playground.PushedScreen')).toBeVisible();
16
+    await expect(elementByLabel('didDisappear | navigation.playground.WelcomeScreen')).toBeVisible();
17
+  });
18
+});