Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Fix new linter issues #2998

Merged
merged 2 commits into from
Nov 24, 2024
Merged

chore: Fix new linter issues #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1066f
chore: Fix new linter issues
dominikschulz Nov 23, 2024
c094513
fix: Do not use JSONeq for mixed content
dominikschulz Nov 23, 2024
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
8 changes: 4 additions & 4 deletions pkg/gopass/secrets/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestYAMLKeyToEmptySecret(t *testing.T) {
// read back key
v, ok := s.Get(yamlKey)
assert.True(t, ok)
assert.Equal(t, yamlValue, v)
assert.YAMLEq(t, yamlValue, v)

// read back whole entry
want := "\n---\n" + yamlKey + ": " + yamlValue + "\n"
Expand Down Expand Up @@ -155,17 +155,17 @@ func TestYAMLSetMultipleKeys(t *testing.T) {
}

// read back the password
assert.Equal(t, yamlPassword, s.Password())
assert.YAMLEq(t, yamlPassword, s.Password())

// read back the keys
for _, key := range keys {
v, ok := s.Get(key)
assert.True(t, ok)
assert.Equal(t, yamlValue, v)
assert.YAMLEq(t, yamlValue, v)
}

// read back whole entry
assert.Equal(t, b.String(), string(s.Bytes()))
assert.YAMLEq(t, b.String(), string(s.Bytes()))
}

func TestYAMLMultilineWithDashes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion tests/insert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ glossary": {
// using show -n to disable parsing
out, err = ts.run("show -f -n some/json")
require.NoError(t, err)
assert.Equal(t, json, out)
assert.Equal(t, json, out) //nolint:testifylint
})

t.Run("Regression test for #1600", func(t *testing.T) {
Expand Down
Loading