Renamed reOrderBumpAndLocalizationCommit to reOrderBumpCommit

Author: RobertReaves

specs/command.spec.js

@@ -284,7 +284,7 @@ v17.11.2`)
 		});
 	});
 
-	describe("reOrderBumpAndLocalizationCommits", () => {
+	describe("reOrderBumpCommit", () => {
 		let joinSpy;
 		beforeEach(() => {
 			joinSpy = jest
@@ -293,7 +293,7 @@ v17.11.2`)
 		});
 
 		it("should call 'runCommand' with appropriate arguments", () => {
-			return command.reOrderBumpAndLocalizationCommits().then(() => {
+			return command.reOrderBumpCommit().then(() => {
 				expect(runCommand).toHaveBeenCalledTimes(1);
 				expect(runCommand).toHaveBeenCalledWith({
 					args:
@@ -307,20 +307,18 @@ v17.11.2`)
 		});
 
 		it("should pass onError to 'runCommand'", () => {
-			return command
-				.reOrderBumpAndLocalizationCommits({ onError })
-				.then(() => {
-					expect(runCommand).toHaveBeenCalledTimes(1);
-					expect(runCommand).toHaveBeenCalledWith({
-						args:
-							'GIT_SEQUENCE_EDITOR="cat my_path/ >" git rebase -i upstream/master',
-						failHelpKey: "gitRebaseInteractive",
-						fullCommand: true,
-						logMessage: "Reordering bump commit",
-						exitOnFail: true,
-						onError
-					});
+			return command.reOrderBumpCommit({ onError }).then(() => {
+				expect(runCommand).toHaveBeenCalledTimes(1);
+				expect(runCommand).toHaveBeenCalledWith({
+					args:
+						'GIT_SEQUENCE_EDITOR="cat my_path/ >" git rebase -i upstream/master',
+					failHelpKey: "gitRebaseInteractive",
+					fullCommand: true,
+					logMessage: "Reordering bump commit",
+					exitOnFail: true,
+					onError
 				});
+			});
 		});
 
 		afterEach(() => {

specs/workflows/pr.spec.js

@@ -22,7 +22,7 @@ describe("pr workflows", () => {
 				run.saveState,
 				run.checkIfReOrderNeeded,
 				run.reOrderLatestCommits,
-				run.reOrderBumpAndLocalizationCommits,
+				run.reOrderBumpCommit,
 				run.getReposFromBumpCommit,
 				run.verifyPackagesToPromote,
 				run.getCurrentDependencyVersions,

specs/workflows/steps/index.spec.js

@@ -2019,34 +2019,28 @@ describe("shared workflow steps", () => {
 		});
 	});
 
-	describe("reOrderBumpAndLocalizationCommits", () => {
+	describe("reOrderBumpCommit", () => {
 		it("should resolve if reOrder is false", () => {
 			state.reOrder = false;
-			return run.reOrderBumpAndLocalizationCommits(state).then(() => {
-				expect(
-					command.reOrderBumpAndLocalizationCommits
-				).not.toHaveBeenCalled();
+			return run.reOrderBumpCommit(state).then(() => {
+				expect(command.reOrderBumpCommit).not.toHaveBeenCalled();
 			});
 		});
 
-		it("should call 'command.reOrderBumpAndLocalizationCommits' if reOrder is true", () => {
+		it("should call 'command.reOrderBumpCommit' if reOrder is true", () => {
 			state.reOrder = true;
-			command.reOrderBumpAndLocalizationCommits = jest.fn(() =>
-				Promise.resolve()
-			);
-			return run.reOrderBumpAndLocalizationCommits(state).then(() => {
-				expect(
-					command.reOrderBumpAndLocalizationCommits
-				).toHaveBeenCalledTimes(1);
+			command.reOrderBumpCommit = jest.fn(() => Promise.resolve());
+			return run.reOrderBumpCommit(state).then(() => {
+				expect(command.reOrderBumpCommit).toHaveBeenCalledTimes(1);
 			});
 		});
 
-		it("should call onError when `command.reOrderBumpAndLocalizationCommits` fails", () => {
+		it("should call onError when `command.reOrderBumpCommit` fails", () => {
 			state.reOrder = true;
-			command.reOrderBumpAndLocalizationCommits = jest.fn(args => {
+			command.reOrderBumpCommit = jest.fn(args => {
 				return args.onError();
 			});
-			return run.reOrderBumpAndLocalizationCommits(state).catch(() => {
+			return run.reOrderBumpCommit(state).catch(() => {
 				expect(util.advise).toHaveBeenCalledTimes(1);
 				expect(util.advise).toHaveBeenCalledWith("reOrderFail");
 			});

src/command.js

@@ -338,7 +338,7 @@ const command = {
 		});
 	},
 
-	reOrderBumpAndLocalizationCommits({ onError } = {}) {
+	reOrderBumpCommit({ onError } = {}) {
 		const args = `GIT_SEQUENCE_EDITOR="cat ${path.join(
 			__dirname,
 			".reordered-commits.txt"

src/workflows/pr.js

@@ -14,7 +14,7 @@ module.exports = {
 		run.saveState,
 		run.checkIfReOrderNeeded,
 		run.reOrderLatestCommits,
-		run.reOrderBumpAndLocalizationCommits,
+		run.reOrderBumpCommit,
 		run.getReposFromBumpCommit,
 		run.verifyPackagesToPromote,
 		run.getCurrentDependencyVersions,

src/workflows/steps/index.js

@@ -745,8 +745,8 @@ ${chalk.green(log)}`);
 			state.reOrder = result;
 		});
 	},
-	reOrderBumpAndLocalizationCommits(state) {
-		state.step = "reOrderBumpAndLocalizationCommits";
+	reOrderBumpCommit(state) {
+		state.step = "reOrderBumpCommit";
 
 		if (!state.reOrder) {
 			return Promise.resolve();
@@ -757,7 +757,7 @@ ${chalk.green(log)}`);
 			return Promise.reject();
 		};
 
-		return command.reOrderBumpAndLocalizationCommits({ onError });
+		return command.reOrderBumpCommit({ onError });
 	},
 	gitRebaseUpstreamMaster(state) {
 		state.step = "gitRebaseUpstreamMaster";