chore: Revert "test: Git integration tests (#38237)" (#38333)

appsmithorg · Dec 23, 2024 · bc38ee7 · bc38ee7
1 parent 5855115
commit bc38ee7
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 1,040 deletions.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java
@@ -13,8 +13,6 @@ default String getBaseId() {
 
     String getName();
 
-    void setName(String artifactName);
-
     String getWorkspaceId();
 
     Boolean getExportWithConfiguration();

diff --git a/.../appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java b/.../appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
@@ -2187,17 +2187,13 @@ public Mono<? extends Artifact> deleteBranch(String baseArtifactId, String branc
                             .onErrorResume(throwable -> {
                                 log.error("Delete branch failed {}", throwable.getMessage());
                                 if (throwable instanceof CannotDeleteCurrentBranchException) {
-                                    return releaseFileLock(baseArtifactId)
-                                            .then(Mono.error(new AppsmithException(
-                                                    AppsmithError.GIT_ACTION_FAILED,
-                                                    "delete branch",
-                                                    "Cannot delete current checked out branch")));
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED,
+                                            "delete branch",
+                                            "Cannot delete current checked out branch"));
                                 }
-                                return releaseFileLock(baseArtifactId)
-                                        .then(Mono.error(new AppsmithException(
-                                                AppsmithError.GIT_ACTION_FAILED,
-                                                "delete branch",
-                                                throwable.getMessage())));
+                                return Mono.error(new AppsmithException(
+                                        AppsmithError.GIT_ACTION_FAILED, "delete branch", throwable.getMessage()));
                             })
                             .flatMap(isBranchDeleted ->
                                     releaseFileLock(baseArtifactId).map(status -> isBranchDeleted))

diff --git a/app/server/appsmith-server/src/test/it/com/appsmith/server/git/GitBranchesIT.java b/app/server/appsmith-server/src/test/it/com/appsmith/server/git/GitBranchesIT.java
diff --git a/...er/appsmith-server/src/test/it/com/appsmith/server/git/templates/contexts/GitContext.java b/...er/appsmith-server/src/test/it/com/appsmith/server/git/templates/contexts/GitContext.java
diff --git a/.../test/it/com/appsmith/server/git/templates/providers/GitBranchesTestTemplateProvider.java b/.../test/it/com/appsmith/server/git/templates/providers/GitBranchesTestTemplateProvider.java
diff --git a/.../it/com/appsmith/server/git/templates/providers/ce/GitBranchesTestTemplateProviderCE.java b/.../it/com/appsmith/server/git/templates/providers/ce/GitBranchesTestTemplateProviderCE.java
diff --git a/...server/appsmith-server/src/test/utils/com/appsmith/server/git/ArtifactBuilderContext.java b/...server/appsmith-server/src/test/utils/com/appsmith/server/git/ArtifactBuilderContext.java
diff --git a/...rver/appsmith-server/src/test/utils/com/appsmith/server/git/ArtifactBuilderExtension.java b/...rver/appsmith-server/src/test/utils/com/appsmith/server/git/ArtifactBuilderExtension.java
diff --git a/app/server/appsmith-server/src/test/utils/com/appsmith/server/git/GitArtifactTestUtils.java b/app/server/appsmith-server/src/test/utils/com/appsmith/server/git/GitArtifactTestUtils.java