From 86d62eeddeb5fff3c09ac070005dd8b8f4f73d34 Mon Sep 17 00:00:00 2001 From: Kelly Selden <602423+kellyselden@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:29:37 -0700 Subject: [PATCH] refactor: use git helpers --- test/helpers/git.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/helpers/git.js b/test/helpers/git.js index 4d595312..00da7f9d 100644 --- a/test/helpers/git.js +++ b/test/helpers/git.js @@ -1,18 +1,21 @@ 'use strict'; -const execa = require('execa'); +const { + git, + getLinesFromOutput, +} = require('../../src/git'); async function getLastCommitMessage(cwd) { - return (await execa('git', ['log', '-1', '--pretty=%B'], { cwd })).stdout.trim(); + return (await git(['log', '-1', '--pretty=%B'], { cwd })).trim(); } async function getTagsOnLastCommit(cwd) { - return (await execa('git', ['tag', '-l', '--points-at', 'HEAD'], { cwd })).stdout.split(/\r?\n/).filter(Boolean); + return getLinesFromOutput(await git(['tag', '-l', '--points-at', 'HEAD'], { cwd })); } async function doesTagExist(ref, cwd) { try { - await execa('git', ['rev-parse', ref], { cwd }); + await git(['rev-parse', ref], { cwd }); } catch (err) { if (err.stderr.includes('unknown revision or path not in the working tree')) { return false; @@ -25,7 +28,7 @@ async function doesTagExist(ref, cwd) { } async function isGitClean(cwd) { - let { stdout } = await execa('git', ['status', '--porcelain'], { cwd }); + let stdout = await git(['status', '--porcelain'], { cwd }); return !stdout; }