Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -400,16 +400,17 @@ if ($Json) {
$obj = [PSCustomObject]@{
BRANCH_NAME = $branchName
FEATURE_NUM = $featureNum
HAS_GIT = $hasGit
}
# $hasGit is computed for branch-creation logic only; it is intentionally not
# emitted so this output contract matches the bash twin: BRANCH_NAME and
# FEATURE_NUM, plus DRY_RUN (added just below) on dry runs.
if ($DryRun) {
$obj | Add-Member -NotePropertyName 'DRY_RUN' -NotePropertyValue $true
}
$obj | ConvertTo-Json -Compress
} else {
Write-Output "BRANCH_NAME: $branchName"
Write-Output "FEATURE_NUM: $featureNum"
Write-Output "HAS_GIT: $hasGit"
if (-not $DryRun) {
Write-Output "SPECIFY_FEATURE environment variable set to: $branchName"
}
Expand Down
36 changes: 36 additions & 0 deletions tests/extensions/git/test_git_extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,24 @@ def test_creates_branch_sequential(self, tmp_path: Path):
assert data["BRANCH_NAME"] == "001-user-auth"
assert data["FEATURE_NUM"] == "001"

def test_output_omits_has_git_for_parity(self, tmp_path: Path):
"""The bash output contract is {BRANCH_NAME, FEATURE_NUM} (+ DRY_RUN) in JSON
and a BRANCH_NAME:/FEATURE_NUM: text block -- no HAS_GIT key/line. This pins
the canonical contract the PowerShell twin must mirror."""
project = _setup_project(tmp_path)
rj = _run_bash(
"create-new-feature-branch.sh", project,
"--json", "--dry-run", "--short-name", "parity", "Parity feature",
)
assert rj.returncode == 0, rj.stderr
assert "HAS_GIT" not in json.loads(rj.stdout)
rt = _run_bash(
"create-new-feature-branch.sh", project,
"--dry-run", "--short-name", "parity", "Parity feature",
)
assert rt.returncode == 0, rt.stderr
assert "HAS_GIT" not in rt.stdout

def test_branch_name_short_word_case_sensitivity(self, tmp_path: Path):
"""A short word is dropped from the derived branch name unless it appears
as an acronym in UPPERCASE in the description (case-sensitive, must match the
Expand Down Expand Up @@ -444,6 +462,24 @@ def test_creates_branch_sequential(self, tmp_path: Path):
data = json.loads(result.stdout)
assert data["BRANCH_NAME"] == "001-user-auth"

def test_output_omits_has_git_to_match_bash(self, tmp_path: Path):
"""PowerShell must mirror the bash twin's output contract: neither JSON nor
text output may include HAS_GIT (it is computed internally for branch-creation
logic only). Fails before the fix (PS emitted HAS_GIT), passes after."""
project = _setup_project(tmp_path)
rj = _run_pwsh(
"create-new-feature-branch.ps1", project,
"-Json", "-DryRun", "-ShortName", "parity", "Parity feature",
)
assert rj.returncode == 0, rj.stderr
assert "HAS_GIT" not in json.loads(rj.stdout)
rt = _run_pwsh(
"create-new-feature-branch.ps1", project,
"-DryRun", "-ShortName", "parity", "Parity feature",
)
assert rt.returncode == 0, rt.stderr
assert "HAS_GIT" not in rt.stdout

def test_branch_name_short_word_case_sensitivity(self, tmp_path: Path):
"""PowerShell must match the bash twin: a short word is dropped unless it
appears as an acronym in UPPERCASE (case-sensitive -cmatch, not -match)."""
Expand Down