fix(release): push to correct branch in toReleaseBranch strategy (#803)

algolia · May 8, 2020 · 1367315 · 1367315
1 parent 8055a9f
commit 1367315
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/shipjs/src/step/release/__tests__/gitPush.spec.js b/packages/shipjs/src/step/release/__tests__/gitPush.spec.js
@@ -28,8 +28,13 @@ describe('gitPush', () => {
   });
 
   it('works in toReleaseBranch strategy', () => {
-    getCurrentBranch.mockImplementationOnce(() => 'develop');
-    getBranchNameToMergeBack.mockImplementationOnce(() => 'master');
+    /*
+      toReleaseBranch: {
+        develop: 'master'
+      }
+    */
+    getCurrentBranch.mockImplementationOnce(() => 'master');
+    getBranchNameToMergeBack.mockImplementationOnce(() => 'develop');
     gitPush({
       tagName: 'v1.2.3',
       config: {
@@ -41,14 +46,14 @@ describe('gitPush', () => {
     expect(run).toHaveBeenCalledTimes(2);
     expect(run.mock.calls[0][0]).toMatchInlineSnapshot(`
       Object {
-        "command": "git checkout master",
+        "command": "git checkout develop",
         "dir": ".",
         "dryRun": false,
       }
     `);
     expect(run.mock.calls[1][0]).toMatchInlineSnapshot(`
       Object {
-        "command": "git merge develop",
+        "command": "git merge master",
         "dir": ".",
         "dryRun": false,
       }

diff --git a/packages/shipjs/src/step/release/gitPush.js b/packages/shipjs/src/step/release/gitPush.js
@@ -19,6 +19,6 @@ export default ({ tagName, config, dir, dryRun }) =>
       // flow: develop -> master -> (here) develop
       run({ command: `git checkout ${destinationBranch}`, dir, dryRun });
       run({ command: `git merge ${currentBranch}`, dir, dryRun });
-      gitPush({ remote, refs: [currentBranch, tagName], dir, dryRun });
+      gitPush({ remote, refs: [destinationBranch, tagName], dir, dryRun });
     }
   });