1
0
mirror of https://github.com/taigrr/yq synced 2025-01-18 04:53:17 -08:00

Merge branch 'coryrc-fix-merge-with-dots' into compare

This commit is contained in:
Mike Farah
2020-02-07 09:10:25 +11:00
3 changed files with 14 additions and 6 deletions

View File

@@ -1525,7 +1525,7 @@ c:
toast: leave
test: 1
tell: 1
taco: cool
tasty.taco: cool
`
filename := test.WriteTempYamlFile(content)
defer test.RemoveTempYamlFile(filename)
@@ -1540,7 +1540,7 @@ c:
b: [3, 4]
c:
toast: leave
taco: cool
tasty.taco: cool
`
test.AssertResult(t, expectedOutput, result.Output)
}
@@ -1706,7 +1706,7 @@ c:
test: 1
toast: leave
tell: 1
taco: cool
tasty.taco: cool
`
test.AssertResult(t, expectedOutput, result.Output)
}
@@ -1921,7 +1921,7 @@ c:
test: 1
toast: leave
tell: 1
taco: cool
tasty.taco: cool
`
test.AssertResult(t, expectedOutput, gotOutput)
test.AssertResult(t, os.FileMode(int(0666)), info.Mode())