fix: conflict

Solar-Punk-Ltd · May 17, 2024 · e2ba2c9 · e2ba2c9
1 parent 1f47d4d
commit e2ba2c9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/pkg/manifest/mantaray/walker_test.go b/pkg/manifest/mantaray/walker_test.go
@@ -24,9 +24,13 @@ func TestWalkNode(t *testing.T) {
 		{
 			name: "simple",
 			toAdd: [][]byte{
+				[]byte("index.html.backup"),
 				[]byte("index.html"),
-				[]byte("img/1.png"),
+				[]byte("img/test/oho.png"),
+				[]byte("img/test/old/test.png.backup"),
+				[]byte("img/test/old/test.png"),
 				[]byte("img/2.png"),
+				[]byte("img/1.png"),
 				[]byte("robots.txt"),
 			},
 			expected: [][]byte{
@@ -35,7 +39,12 @@ func TestWalkNode(t *testing.T) {
 				[]byte("img/"),
 				[]byte("img/1.png"),
 				[]byte("img/2.png"),
+				[]byte("img/test/o"),
+				[]byte("img/test/oho.png"),
+				[]byte("img/test/old/test.png"),
+				[]byte("img/test/old/test.png.backup"),
 				[]byte("index.html"),
+				[]byte("index.html.backup"),
 				[]byte("robots.txt"),
 			},
 		},