From 0accc9f09d0aaf2292cb94e3c4e438c3f76f89e5 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 5 May 2021 15:58:40 +0800 Subject: refactor: ... --- .../IntegratedTests/HttpClientTimelineExtensions.cs | 4 ++-- BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs | 12 ++++++------ BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'BackEnd/Timeline.Tests') diff --git a/BackEnd/Timeline.Tests/IntegratedTests/HttpClientTimelineExtensions.cs b/BackEnd/Timeline.Tests/IntegratedTests/HttpClientTimelineExtensions.cs index ac60ce7c..5ae4d8a2 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/HttpClientTimelineExtensions.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/HttpClientTimelineExtensions.cs @@ -15,7 +15,7 @@ namespace Timeline.Tests.IntegratedTests public static Task PutTimelineMemberAsync(this HttpClient client, string timelineName, string memberUsername) => client.TestPutAsync($"timelines/{timelineName}/members/{memberUsername}"); - public static Task DeleteTimelineMemberAsync(this HttpClient client, string timelineName, string memberUsername, bool? delete) - => client.TestDeleteAsync($"timelines/{timelineName}/members/{memberUsername}", delete); + public static Task DeleteTimelineMemberAsync(this HttpClient client, string timelineName, string memberUsername) + => client.TestDeleteAsync($"timelines/{timelineName}/members/{memberUsername}"); } } diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs index 0e7bb735..e5fa310a 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs @@ -209,16 +209,16 @@ namespace Timeline.Tests.IntegratedTests using var client = await CreateClientAsAdministrator(); await client.TestDeleteAssertInvalidModelAsync("timelines/!!!"); - await client.TestDeleteAsync("timelines/t2"); - await client.TestDeleteAsync("timelines/t2"); + await client.TestDeleteAsync("timelines/t2", true); + await client.TestDeleteAsync("timelines/t2", false); } { using var client = await CreateClientAs(1); await client.TestDeleteAssertInvalidModelAsync("timelines/!!!"); - await client.TestDeleteAsync("timelines/t1"); - await client.TestDeleteAsync("timelines/t1"); + await client.TestDeleteAsync("timelines/t1", true); + await client.TestDeleteAssertForbiddenAsync("timelines/t1"); } } @@ -298,9 +298,9 @@ namespace Timeline.Tests.IntegratedTests await AssertEmptyMembers(); await client.PutTimelineMemberAsync(timelineName, "user2"); await AssertMembers(new List { await client.GetUserAsync("user2") }); - await client.DeleteTimelineMemberAsync(timelineName, "user2", true); + await client.DeleteTimelineMemberAsync(timelineName, "user2"); await AssertEmptyMembers(); - await client.TestDeleteAsync($"timelines/{timelineName}/members/usernotexist", false); + await client.TestDeleteAssertErrorAsync($"timelines/{timelineName}/members/usernotexist"); await AssertEmptyMembers(); } diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs index bdb376de..a5877dde 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs @@ -190,7 +190,7 @@ namespace Timeline.Tests.IntegratedTests const string url = "users/user123/permissions/UserManagement"; await client.TestPutAssertErrorAsync(url, errorCode: ErrorCodes.NotExist.User); - await client.TestDeleteAsync(url); + await client.TestDeleteAssertErrorAsync(url); } } } -- cgit v1.2.3