Skip to content

fix: Unit test fix #36471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sondermanish merged 2 commits into from
Sep 23, 2024
Merged

fix: Unit test fix #36471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5472f0
added fix for unit tests
sondermanish Sep 23, 2024
f59a368
added a constant file
sondermanish Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/constants/ImportExportConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.appsmith.server.constants;

public class ImportExportConstants {

public static final String ARTIFACT_JSON_IMPORT_VALIDATION_ERROR_MESSAGE =
"'. Sorry! It seems you've imported a page-level JSON instead of an application. Please use the import within the page.";
}
10 changes: 5 additions & 5 deletions ...psmith-server/src/main/java/com/appsmith/server/imports/internal/ImportServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.appsmith.external.models.Datasource;
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.constants.ImportExportConstants;
import com.appsmith.server.converters.ArtifactExchangeJsonAdapter;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.Artifact;
Expand Down Expand Up @@ -421,11 +422,10 @@ private Mono<Artifact> importArtifactInWorkspace(
log.error("Error in importing {}. Field {} is missing", artifactContextString, errorField);

if (errorField.equals(artifactContextString)) {
return Mono.error(
new AppsmithException(
AppsmithError.VALIDATION_FAILURE,
"Field '" + artifactContextString
+ "'. Sorry! It seems you've imported a page-level JSON instead of an application. Please use the import within the page."));
return Mono.error(new AppsmithException(
AppsmithError.VALIDATION_FAILURE,
"Field '" + artifactContextString
+ ImportExportConstants.ARTIFACT_JSON_IMPORT_VALIDATION_ERROR_MESSAGE));
}

return Mono.error(new AppsmithException(
Expand Down
14 changes: 6 additions & 8 deletions ...ppsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.constants.ImportExportConstants;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.Application;
Expand Down Expand Up @@ -895,14 +896,11 @@ public void importArtifactFromInvalidJsonFileWithoutArtifactTest() {
importService.extractArtifactExchangeJsonAndSaveArtifact(filePart, workspaceId, null);

StepVerifier.create(resultMono)
.expectErrorMatches(
throwable -> throwable instanceof AppsmithException
&& throwable
.getMessage()
.equals(
AppsmithError.VALIDATION_FAILURE.getMessage(
"Field '" + FieldName.APPLICATION
+ "' Sorry! Seems like you've imported a page-level json instead of an application. Please use the import within the page.")))
.expectErrorMatches(throwable -> throwable instanceof AppsmithException
&& throwable
.getMessage()
.equals(AppsmithError.VALIDATION_FAILURE.getMessage("Field '" + FieldName.APPLICATION
+ ImportExportConstants.ARTIFACT_JSON_IMPORT_VALIDATION_ERROR_MESSAGE)))
.verify();
}

Expand Down