Fix tests

wix · Feb 16, 2019 · 358d2f0 · 358d2f0
1 parent 283ccfe
commit 358d2f0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/detox/src/android/expect.test.js b/detox/src/android/expect.test.js
@@ -2,8 +2,8 @@ describe('expect', async () => {
   let e;
 
   beforeEach(() => {
-    e = require('./expect');
-    e.setInvocationManager(new MockExecutor());
+    const AndroidExpect = require('./expect');
+    e = new AndroidExpect(new MockExecutor());
   });
 
   it(`element by accessibilityLabel`, async () => {

diff --git a/detox/src/exportWrapper.js b/detox/src/exportWrapper.js
@@ -1,6 +1,9 @@
 const platform = require('./platform');
-const iosExports = require('./ios/expect');
-const androidExports = require('./android/expect');
+const IosExpect = require('./ios/expect');
+const AndroidExpect = require('./android/expect');
+
+const iosExports = new IosExpect();
+const androidExports = new AndroidExpect();
 
 const exportMap = {
   expect: {

diff --git a/detox/src/exportWrapper.test.js b/detox/src/exportWrapper.test.js
@@ -1,18 +1,31 @@
 let exportWrapper;
 let platform;
-let iosExports;
-let androidExports;
+const iosExports = {
+  by: {
+    method: jest.fn()
+  },
+  expect: jest.fn(),
+  element: jest.fn(),
+  waitFor: jest.fn(),
+};
+const androidExports = {
+  by: {
+    method: jest.fn()
+  },
+  expect: jest.fn(),
+  element: jest.fn(),
+  waitFor: jest.fn(),
+};
 
 describe('exportWrapper', () => {
   const mockDevice = {method: jest.fn()};
 
   beforeAll(async() => {
-    jest.mock('./ios/expect');
-    jest.mock('./android/expect');
+    jest.doMock('./ios/expect', () => jest.fn().mockImplementation(() => iosExports));
+    jest.doMock('./android/expect', () => jest.fn().mockImplementation(() => androidExports));
+
     exportWrapper = require('./exportWrapper');
     platform = require('./platform');
-    iosExports = require('./ios/expect');
-    androidExports = require('./android/expect');
   });
 
   afterAll(async() => {
@@ -25,7 +38,6 @@ describe('exportWrapper', () => {
     const arg2 = 'test';
 
     platform.set('ios.none', mockDevice);
-    iosExports.by.method = jest.fn();
 
     exportWrapper.device.method(arg1, arg2);
     expect(mockDevice.method).toHaveBeenCalledWith(arg1, arg2);
@@ -48,7 +60,6 @@ describe('exportWrapper', () => {
     const arg2 = 'test';
 
     platform.set('android.attached', mockDevice);
-    androidExports.by.method = jest.fn();
 
     exportWrapper.device.method(arg1, arg2);
     expect(mockDevice.method).toHaveBeenCalledWith(arg1, arg2);

diff --git a/detox/src/ios/expect.test.js b/detox/src/ios/expect.test.js
@@ -2,8 +2,8 @@ describe('expect', async () => {
   let e;
 
   beforeEach(() => {
-    e = require('./expect');
-    e.setInvocationManager(new MockExecutor());
+    const IosExpect = require('./expect');
+    e = new IosExpect(new MockExecutor());
   });
 
   it(`element by accessibilityLabel`, async () => {