From 4de46a542ce918c1f47a56769ff13ed11b67d95c Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Mon, 17 Dec 2018 18:01:01 -0600
Subject: [PATCH 1/2] Fix typo for location of detox test runner adapters

---
 types/detox/runners/jest/{adapters => adapter}/index.d.ts  | 0
 types/detox/runners/mocha/{adapters => adapter}/index.d.ts | 0
 types/detox/test/detox-jest-setup-tests.ts                 | 2 +-
 types/detox/test/detox-mocha-setup-tests.ts                | 2 +-
 types/detox/tsconfig.json                                  | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename types/detox/runners/jest/{adapters => adapter}/index.d.ts (100%)
 rename types/detox/runners/mocha/{adapters => adapter}/index.d.ts (100%)

diff --git a/types/detox/runners/jest/adapters/index.d.ts b/types/detox/runners/jest/adapter/index.d.ts
similarity index 100%
rename from types/detox/runners/jest/adapters/index.d.ts
rename to types/detox/runners/jest/adapter/index.d.ts
diff --git a/types/detox/runners/mocha/adapters/index.d.ts b/types/detox/runners/mocha/adapter/index.d.ts
similarity index 100%
rename from types/detox/runners/mocha/adapters/index.d.ts
rename to types/detox/runners/mocha/adapter/index.d.ts
diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index 002b5605bb..1132fb895b 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -2,7 +2,7 @@ declare var beforeAll: (callback: () => void) => void;
 declare var beforeEach: (callback: () => void) => void;
 declare var afterAll: (callback: () => void) => void;
 
-import adapter from "detox/runners/jest/adapters";
+import adapter from "detox/runners/jest/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
 // const config = require("./package.json").detox;
diff --git a/types/detox/test/detox-mocha-setup-tests.ts b/types/detox/test/detox-mocha-setup-tests.ts
index 3f502d1391..c415eed696 100644
--- a/types/detox/test/detox-mocha-setup-tests.ts
+++ b/types/detox/test/detox-mocha-setup-tests.ts
@@ -5,7 +5,7 @@ declare var beforeEach: (callback: () => void) => void;
 declare var after: (callback: () => void) => void;
 declare var afterEach: (callback: () => void) => void;
 
-import adapter from "detox/runners/mocha/adapters";
+import adapter from "detox/runners/mocha/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
 // const config = require("./package.json").detox;
diff --git a/types/detox/tsconfig.json b/types/detox/tsconfig.json
index 7be4d3bb9e..cd85bd9849 100644
--- a/types/detox/tsconfig.json
+++ b/types/detox/tsconfig.json
@@ -15,8 +15,8 @@
     },
     "files": [
         "index.d.ts",
-        "runners/jest/adapters/index.d.ts",
-        "runners/mocha/adapters/index.d.ts",
+        "runners/jest/adapter/index.d.ts",
+        "runners/mocha/adapter/index.d.ts",
         "test/detox-global-tests.ts",
         "test/detox-module-tests.ts",
         "test/detox-jest-setup-tests.ts",

From c71bd7b97476844fe2d741cd7c02abb81576ee98 Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 20 Dec 2018 15:43:36 -0600
Subject: [PATCH 2/2] [Detox] DetoxJestAdapter overlaps CustomReporter

DetoxJestAdapter needs to overlap jasmine.CustomReporter since the
latter is a weak interface; otherwise the code that is needed
to run Detox with Jest will throw errors when compiled.
---
 types/detox/runners/jest/adapter/index.d.ts | 3 +++
 types/detox/test/detox-jest-setup-tests.ts  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/types/detox/runners/jest/adapter/index.d.ts b/types/detox/runners/jest/adapter/index.d.ts
index ca195ae744..f479eda256 100644
--- a/types/detox/runners/jest/adapter/index.d.ts
+++ b/types/detox/runners/jest/adapter/index.d.ts
@@ -2,6 +2,9 @@ interface DetoxJestAdapter {
     detox: Detox.Detox;
     beforeEach: () => Promise<void>;
     afterAll: () => Promise<void>;
+    // These are not publicly used, but are defined in order to overlap with the jasmine.CustomReporter interface (which is a weak interface)
+    specDone: () => void;
+    specStarted: () => void;
 }
 
 declare const adapter: DetoxJestAdapter;
diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index 1132fb895b..7a2a9a3901 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -8,6 +8,9 @@ import adapter from "detox/runners/jest/adapter";
 // const config = require("./package.json").detox;
 declare const config: any;
 
+declare const jasmine: any;
+jasmine.getEnv().addReporter(adapter);
+
 beforeAll(async () => {
     await detox.init(config);