From 25855804472d54af77711d15fbe17b0b6c5ef0e3 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 27 Sep 2023 10:17:44 +0800
Subject: [PATCH] Fix yaml test

---
 models/fixture_generation.go | 4 +++-
 models/fixture_test.go       | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/fixture_generation.go b/models/fixture_generation.go
index abf880ee8e2bc..d342919895458 100644
--- a/models/fixture_generation.go
+++ b/models/fixture_generation.go
@@ -40,7 +40,9 @@ func GetYamlFixturesAccess() (string, error) {
 		fmt.Fprintf(&b, "  user_id: %d\n", a.UserID)
 		fmt.Fprintf(&b, "  repo_id: %d\n", a.RepoID)
 		fmt.Fprintf(&b, "  mode: %d\n", a.Mode)
-		fmt.Fprintf(&b, "\n")
+		if i < len(accesses)-1 {
+			fmt.Fprintf(&b, "\n")
+		}
 	}
 
 	return b.String(), nil
diff --git a/models/fixture_test.go b/models/fixture_test.go
index 8a28db8164921..b70fdb536d3eb 100644
--- a/models/fixture_test.go
+++ b/models/fixture_test.go
@@ -22,12 +22,13 @@ func TestFixtureGeneration(t *testing.T) {
 		if !assert.NoError(t, err) {
 			return
 		}
-		bytes, err := os.ReadFile(filepath.Join(unittest.FixturesDir(), name+".yml"))
+		p := filepath.Join(unittest.FixturesDir(), name+".yml")
+		bytes, err := os.ReadFile(p)
 		if !assert.NoError(t, err) {
 			return
 		}
 		data := string(util.NormalizeEOL(bytes))
-		assert.True(t, data == expected, "Differences detected for %s.yml", name)
+		assert.EqualValues(t, expected, data, "Differences detected for %s", p)
 	}
 
 	test(GetYamlFixturesAccess, "access")