diff --git a/types/detox/runners/jest/adapter/index.d.ts b/types/detox/runners/jest/adapter/index.d.ts new file mode 100644 index 0000000000..f479eda256 --- /dev/null +++ b/types/detox/runners/jest/adapter/index.d.ts @@ -0,0 +1,12 @@ +interface DetoxJestAdapter { + detox: Detox.Detox; + beforeEach: () => Promise; + afterAll: () => Promise; + // 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; + +export default adapter; diff --git a/types/detox/runners/jest/adapters/index.d.ts b/types/detox/runners/jest/adapters/index.d.ts deleted file mode 100644 index ca195ae744..0000000000 --- a/types/detox/runners/jest/adapters/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -interface DetoxJestAdapter { - detox: Detox.Detox; - beforeEach: () => Promise; - afterAll: () => Promise; -} - -declare const adapter: DetoxJestAdapter; - -export default adapter; 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..7a2a9a3901 100644 --- a/types/detox/test/detox-jest-setup-tests.ts +++ b/types/detox/test/detox-jest-setup-tests.ts @@ -2,12 +2,15 @@ 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; declare const config: any; +declare const jasmine: any; +jasmine.getEnv().addReporter(adapter); + beforeAll(async () => { await detox.init(config); 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",