Cleanup @changesets/git tests (#1029)

* Cleanup `@changesets/git` tests * Add `short` option to `getCommitsThatAddFiles` * Remove unused `deprecate` * Remove last occurence of `getCommitThatAddsFile` * add changesets
changesets · Dec 14, 2022 · 598136a · 598136a
1 parent e02a0c4
commit 598136a
Show file tree

Hide file tree

Showing 8 changed files with 351 additions and 228 deletions.
diff --git a/.changeset/beige-pans-camp.md b/.changeset/beige-pans-camp.md
@@ -0,0 +1,10 @@
+---
+"@changesets/git": major
+---
+
+`getCommitsThatAddFiles` accepts an options object argument now where you can use `cwd` option.
+
+```diff
+-getCommitsThatAddFiles(paths, cwd);
++getCommitsThatAddFiles(paths, { cwd });
+```
diff --git a/.changeset/serious-candles-remain.md b/.changeset/serious-candles-remain.md
@@ -0,0 +1,5 @@
+---
+"@changesets/git": major
+---
+
+`getCurrentCommitId` and `getCommitsThatAddFiles` return full commit hashes now instead of short ones. You can get short ones by using the `short: true` option.
diff --git a/.changeset/soft-apes-look.md b/.changeset/soft-apes-look.md
@@ -0,0 +1,5 @@
+---
+"@changesets/git": major
+---
+
+Previously deprecated `getCommitThatAddsFile` has been removed while `getCommitsThatAddFiles` is still available.
diff --git a/packages/apply-release-plan/src/index.ts b/packages/apply-release-plan/src/index.ts
@@ -38,7 +38,7 @@ async function getCommitsThatAddChangesets(
   cwd: string
 ) {
   const paths = changesetIds.map((id) => `.changeset/${id}.md`);
-  const commits = await git.getCommitsThatAddFiles(paths, cwd);
+  const commits = await git.getCommitsThatAddFiles(paths, { cwd, short: true });
 
   if (commits.every(stringDefined)) {
     // We have commits for all files
@@ -51,10 +51,10 @@ async function getCommitsThatAddChangesets(
     .filter(stringDefined);
 
   const legacyPaths = missingIds.map((id) => `.changeset/${id}/changes.json`);
-  const commitsForLegacyPaths = await git.getCommitsThatAddFiles(
-    legacyPaths,
-    cwd
-  );
+  const commitsForLegacyPaths = await git.getCommitsThatAddFiles(legacyPaths, {
+    cwd,
+    short: true,
+  });
 
   // Fill in the blanks in the array of commits
   changesetIds.forEach((id, i) => {

diff --git a/packages/apply-release-plan/src/test-utils/get-changelog-entry-with-git-hash.ts b/packages/apply-release-plan/src/test-utils/get-changelog-entry-with-git-hash.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import startCase from "lodash.startcase";
-import { getCommitThatAddsFile } from "@changesets/git";
+import { getCommitsThatAddFiles } from "@changesets/git";
 import { ComprehensiveRelease, NewChangeset } from "@changesets/types";
 
 import { RelevantChangesets } from "../types";
@@ -10,9 +10,9 @@ async function getReleaseLine(changeset: NewChangeset, cwd: string) {
     .split("\n")
     .map((l) => l.trimRight());
 
-  const commitThatAddsFile = await getCommitThatAddsFile(
-    `.changeset/${changeset.id}.md`,
-    cwd
+  const [commitThatAddsFile] = await getCommitsThatAddFiles(
+    [`.changeset/${changeset.id}.md`],
+    { cwd, short: true }
   );
 
   return `- [${commitThatAddsFile}] ${firstLine}\n${futureLines

diff --git a/packages/cli/src/commands/version/index.ts b/packages/cli/src/commands/version/index.ts
@@ -75,7 +75,7 @@ export default async function version(
       ? {
           tag: options.snapshot === true ? undefined : options.snapshot,
           commit: config.snapshot.prereleaseTemplate?.includes("{commit}")
-            ? await getCurrentCommitId({ cwd })
+            ? await getCurrentCommitId({ cwd, short: true })
             : undefined,
         }
       : undefined