Adding regressions tests for #153

Author: daveshanley

cmd/html_report_test.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"
 
+	whatChangedModel "github.com/pb33f/libopenapi/what-changed/model"
 	htmlReport "github.com/pb33f/openapi-changes/html-report"
 	"github.com/pb33f/openapi-changes/model"
 	"github.com/stretchr/testify/assert"
@@ -273,6 +274,27 @@ func TestBuildHTMLReportItems_SplitsStandardAndChangeExplorerGraphs(t *testing.T
 	assert.Contains(t, explorerNodeWithChildChanges, "childChanges", "change explorer nodes render change summaries")
 }
 
+func TestBuildHTMLReportItems_ComposedSchemaTitleRemovalPreservesPropertyLabel(t *testing.T) {
+	leftPath, rightPath := createComposedSchemaTitleRemovalSpecPair(t, "allOf")
+
+	commits, err := loadLeftRightCommits(leftPath, rightPath, summaryOpts{noColor: true})
+	require.NoError(t, err)
+	require.Len(t, commits, 1)
+
+	items, err := buildHTMLReportItems(commits, nil)
+	require.NoError(t, err)
+	require.Len(t, items, 1)
+
+	var changes []*whatChangedModel.Change
+	require.NoError(t, json.Unmarshal(items[0].Graph.Changes, &changes))
+	require.Len(t, changes, 1)
+
+	assert.Equal(t, "title", changes[0].Property)
+	assert.Equal(t, "schema", changes[0].Type)
+	assert.Equal(t, "$.components.schemas['Contract']", changes[0].Path)
+	assert.NotContains(t, string(items[0].Graph.Changes), `"property":"anyOf"`)
+}
+
 type newHtmlNodeGraph struct {
 	Nodes []map[string]any
 	Root  map[string]any

cmd/report_test.go

@@ -264,6 +264,25 @@ func TestRunLeftRightReport_NormalizesParameterPaths(t *testing.T) {
 	assert.Contains(t, content, `"type":"parameter"`)
 }
 
+func TestRunLeftRightReport_ComposedSchemaTitleRemovalDoesNotMislabelAsAnyOf(t *testing.T) {
+	leftPath, rightPath := createComposedSchemaTitleRemovalSpecPair(t, "allOf")
+
+	report, err := runLeftRightReport(leftPath, rightPath, summaryOpts{noColor: true}, nil)
+
+	require.NoError(t, err)
+	require.NotNil(t, report)
+	require.Len(t, report.Changes, 1)
+
+	change := report.Changes[0]
+	assert.Equal(t, "title", change.Property)
+	assert.Equal(t, "schema", change.Type)
+	assert.Equal(t, "$.components.schemas['Contract']", change.Path)
+
+	encoded, err := json.Marshal(report)
+	require.NoError(t, err)
+	assert.NotContains(t, string(encoded), `"property":"anyOf"`)
+}
+
 func TestReportCommand_GitRefUsesLeftRightMode(t *testing.T) {
 	wd, err := os.Getwd()
 	require.NoError(t, err)

cmd/summary_test.go

@@ -404,6 +404,29 @@ func TestRenderSummary_GitRefExplodedSpecDetectsSiblingChanges(t *testing.T) {
 	assert.Contains(t, output, "Breaking Highlights")
 }
 
+func TestRenderSummary_ComposedSchemaTitleRemovalDoesNotMislabelAsAnyOf(t *testing.T) {
+	leftPath, rightPath := createComposedSchemaTitleRemovalSpecPair(t, "allOf")
+
+	commits, err := loadLeftRightCommits(leftPath, rightPath, summaryOpts{noColor: true})
+	require.NoError(t, err)
+	require.Len(t, commits, 1)
+
+	output, hasBreaking, hasChanges, err := renderSummary(
+		commits,
+		nil,
+		false,
+		true,
+		false,
+		summaryStyles{},
+	)
+
+	require.NoError(t, err)
+	assert.True(t, hasChanges)
+	assert.False(t, hasBreaking)
+	assert.Contains(t, output, "title")
+	assert.NotContains(t, output, "anyOf")
+}
+
 func TestLoadLeftRightCommits_ReturnsHTTPStatusErrors(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "missing", http.StatusNotFound)

cmd/test_helpers_test.go

@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -225,6 +226,48 @@ paths:
 	return leftPath, rightPath
 }
 
+func createComposedSchemaTitleRemovalSpecPair(t *testing.T, keyword string) (string, string) {
+	t.Helper()
+
+	left := fmt.Sprintf(`openapi: 3.1.0
+info:
+  title: Contracts API
+  version: "1.0"
+paths: {}
+components:
+  schemas:
+    Contract:
+      title: Contract
+      %s:
+        - type: object
+          properties:
+            id:
+              type: string
+`, keyword)
+
+	right := fmt.Sprintf(`openapi: 3.1.0
+info:
+  title: Contracts API
+  version: "1.0"
+paths: {}
+components:
+  schemas:
+    Contract:
+      %s:
+        - type: object
+          properties:
+            id:
+              type: string
+`, keyword)
+
+	baseDir := t.TempDir()
+	leftPath := filepath.Join(baseDir, "left.yaml")
+	rightPath := filepath.Join(baseDir, "right.yaml")
+	require.NoError(t, os.WriteFile(leftPath, []byte(left), 0o644))
+	require.NoError(t, os.WriteFile(rightPath, []byte(right), 0o644))
+	return leftPath, rightPath
+}
+
 func runGitInDir(t *testing.T, dir string, args ...string) {
 	t.Helper()