johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

OAuth2: Remove client soft delete and fix client add command #213 #3943

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2024-01-29 21:08:01 +01:00
parent fd0006928e
commit d0ad3c23fb
20 changed files with 216 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/commands/clients_remove_test.go
View File

@@ -19,8 +19,8 @@ func TestCientsRemoveCommand(t *testing.T) {
//t.Logf(output0)
assert.NoError(t, err)
assert.NotContains(t, output0, "| DeletedAt | time.Date")
assert.Contains(t, output0, "| DeletedAt | <nil>")
assert.NotContains(t, output0, "not found")
assert.Contains(t, output0, "client_credentials")
// Create test context with flags and arguments.
ctx := NewTestContext([]string{"rm", "cs7pvt5h8rw9aaqj"})
@@ -43,8 +43,8 @@ func TestCientsRemoveCommand(t *testing.T) {
//t.Logf(output2)
assert.NoError(t, err)
assert.NotContains(t, output2, "| DeletedAt | time.Date")
assert.Contains(t, output2, "| DeletedAt | <nil>")
assert.NotContains(t, output2, "not found")
assert.Contains(t, output2, "client_credentials")
})
t.Run("RemoveClient", func(t *testing.T) {
var err error
@@ -57,8 +57,8 @@ func TestCientsRemoveCommand(t *testing.T) {
//t.Logf(output0)
assert.NoError(t, err)
assert.NotContains(t, output0, "| DeletedAt | time.Date")
assert.Contains(t, output0, "| DeletedAt | <nil>")
assert.NotContains(t, output0, "not found")
assert.Contains(t, output0, "client_credentials")
// Create test context with flags and arguments.
ctx := NewTestContext([]string{"rm", "--force", "cs7pvt5h8rw9aaqj"})
@@ -69,7 +69,6 @@ func TestCientsRemoveCommand(t *testing.T) {
})
// Check command output for plausibility.
//t.Logf(output)
assert.NoError(t, err)
assert.Empty(t, output)
@@ -79,10 +78,8 @@ func TestCientsRemoveCommand(t *testing.T) {
err = ClientsShowCommand.Run(ctx2)
})
//t.Logf(output2)
assert.NoError(t, err)
assert.Contains(t, output2, "| DeletedAt | time.Date")
assert.NotContains(t, output2, "| DeletedAt | <nil>")
assert.Error(t, err)
assert.Empty(t, output2)
})
t.Run("NotFound", func(t *testing.T) {
var err error
@@ -96,23 +93,6 @@ func TestCientsRemoveCommand(t *testing.T) {
})
// Check command output for plausibility.
//t.Logf(output)
assert.Error(t, err)
assert.Empty(t, output)
})
t.Run("AlreadyDeleted", func(t *testing.T) {
var err error
// Create test context with flags and arguments.
ctx := NewTestContext([]string{"rm", "--force", "cs5cpu17n6gj2gf7"})
// Run command with test context.
output := capture.Output(func() {
err = ClientsRemoveCommand.Run(ctx)
})
// Check command output for plausibility.
//t.Logf(output)
assert.Error(t, err)
assert.Empty(t, output)
})