From 276682bf3650df04718986a357b3fbf0085124a1 Mon Sep 17 00:00:00 2001 From: Daniel Stockman Date: Mon, 14 Oct 2019 14:19:09 -0700 Subject: [PATCH] chore: Add options argument to run-lifecycle mock --- commands/__mocks__/@lerna/run-lifecycle.js | 4 ++-- .../__tests__/publish-lifecycle-scripts.test.js | 6 +++++- .../__tests__/version-lifecycle-scripts.test.js | 12 ++++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/commands/__mocks__/@lerna/run-lifecycle.js b/commands/__mocks__/@lerna/run-lifecycle.js index b99fe84283..4244513af7 100644 --- a/commands/__mocks__/@lerna/run-lifecycle.js +++ b/commands/__mocks__/@lerna/run-lifecycle.js @@ -1,10 +1,10 @@ "use strict"; const mockRunLifecycle = jest.fn(pkg => Promise.resolve(pkg)); -const mockCreateRunner = jest.fn(() => (pkg, stage) => { +const mockCreateRunner = jest.fn(opts => (pkg, stage) => { // no longer the actual API, but approximates inner logic of default export if (pkg.scripts[stage]) { - return mockRunLifecycle(pkg, stage); + return mockRunLifecycle(pkg, stage, opts); } return Promise.resolve(); diff --git a/commands/publish/__tests__/publish-lifecycle-scripts.test.js b/commands/publish/__tests__/publish-lifecycle-scripts.test.js index 0f01bd12a2..936e785c24 100644 --- a/commands/publish/__tests__/publish-lifecycle-scripts.test.js +++ b/commands/publish/__tests__/publish-lifecycle-scripts.test.js @@ -35,7 +35,11 @@ describe("lifecycle scripts", () => { ["prepare", "prepublishOnly", "prepack", "postpack", "postpublish"].forEach(script => { // "lifecycle" is the root manifest name - expect(runLifecycle).toHaveBeenCalledWith(expect.objectContaining({ name: "lifecycle" }), script); + expect(runLifecycle).toHaveBeenCalledWith( + expect.objectContaining({ name: "lifecycle" }), + script, + expect.any(Object) + ); }); // package-2 lacks version lifecycle scripts diff --git a/commands/version/__tests__/version-lifecycle-scripts.test.js b/commands/version/__tests__/version-lifecycle-scripts.test.js index 4f0b5a21d5..8b83bb1b16 100644 --- a/commands/version/__tests__/version-lifecycle-scripts.test.js +++ b/commands/version/__tests__/version-lifecycle-scripts.test.js @@ -32,8 +32,16 @@ describe("lifecycle scripts", () => { ["preversion", "version", "postversion"].forEach(script => { // "lifecycle" is the root manifest name - expect(runLifecycle).toHaveBeenCalledWith(expect.objectContaining({ name: "lifecycle" }), script); - expect(runLifecycle).toHaveBeenCalledWith(expect.objectContaining({ name: "package-1" }), script); + expect(runLifecycle).toHaveBeenCalledWith( + expect.objectContaining({ name: "lifecycle" }), + script, + expect.any(Object) + ); + expect(runLifecycle).toHaveBeenCalledWith( + expect.objectContaining({ name: "package-1" }), + script, + expect.any(Object) + ); }); // package-2 lacks version lifecycle scripts