Skip to content

Commit

Permalink
fix: resolve a merge conflict in migration_test (#2811)
Browse files Browse the repository at this point in the history
  • Loading branch information
grantzvolsky authored and aeneasr committed Aug 18, 2022
1 parent d6ec84c commit 18e32db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion persistence/sql/migratest/migration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestMigrations(t *testing.T) {
t.Run(fmt.Sprintf("case=jwk migration %d", i), func(t *testing.T) {
actual := &jwk.SQLData{}
require.NoError(t, c.Where("pk_deprecated = ?", i).First(actual))
assertUUID(t, &actual.ID)
uuid.AssertUUID(t, &actual.ID)
expected := expectedJWK(actual.ID, i)
assertEqualJWKs(t, expected, actual)
})
Expand Down

0 comments on commit 18e32db

Please sign in to comment.