Refactor common assertions about project creation

sillsdev · Aug 22, 2024 · 0af5fb2 · 0af5fb2
1 parent a5b5449
commit 0af5fb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/LfMerge.Core.Tests/E2E/E2ETestBase.cs b/src/LfMerge.Core.Tests/E2E/E2ETestBase.cs
@@ -160,8 +160,6 @@ public async Task<string> CreateEmptyFlexProjectInLexbox()
 			MercurialTestHelper.CreateFlexRepo(testPath);
 			// Now create project in LexBox
 			var result = await TestEnv.CreateLexBoxProject(testCode, randomGuid);
-			Assert.That(result.Result, Is.EqualTo(LexboxGraphQLTypes.CreateProjectResult.Created));
-			Assert.That(result.Id, Is.EqualTo(randomGuid));
 			var pushUrl = SRTestEnvironment.LexboxUrlForProjectWithAuth(testCode).AbsoluteUri;
 			MercurialTestHelper.HgPush(testPath, pushUrl);
 			ProjectIdToDelete = result.Id;
@@ -175,8 +173,6 @@ public async Task<string> CreateNewProjectFromTemplate(string origZipPath)
 			var testPath = TestFolderForProject(testCode);
 			// Now create project in LexBox
 			var result = await TestEnv.CreateLexBoxProject(testCode, randomGuid);
-			Assert.That(result.Result, Is.EqualTo(LexboxGraphQLTypes.CreateProjectResult.Created));
-			Assert.That(result.Id, Is.EqualTo(randomGuid));
 			await TestEnv.ResetAndUploadZip(testCode, origZipPath);
 			ProjectIdToDelete = result.Id;
 			return testCode;

diff --git a/src/LfMerge.Core.Tests/SRTestEnvironment.cs b/src/LfMerge.Core.Tests/SRTestEnvironment.cs
@@ -108,9 +108,12 @@ ... on DbError {
 				Query = mutation,
 				Variables = new { input },
 			};
-			var response = await GqlClient.SendMutationAsync<LexboxGraphQLTypes.CreateProjectGqlResponse>(request);
-			Assert.That(response.Errors, Is.Null.Or.Empty, () => string.Join("\n", response.Errors.Select(error => error.Message)));
-			return response.Data.CreateProject.CreateProjectResponse;
+			var gqlResponse = await GqlClient.SendMutationAsync<LexboxGraphQLTypes.CreateProjectGqlResponse>(request);
+			Assert.That(gqlResponse.Errors, Is.Null.Or.Empty, () => string.Join("\n", gqlResponse.Errors.Select(error => error.Message)));
+			var response = gqlResponse.Data.CreateProject.CreateProjectResponse;
+			Assert.That(response.Result, Is.EqualTo(LexboxGraphQLTypes.CreateProjectResult.Created));
+			Assert.That(response.Id, Is.EqualTo(projId));
+			return response;
 		}
 
 		public async Task DeleteLexBoxProject(Guid projectId)