Skip to content

fixes broken basic search (#9803) #9816

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
kcondon merged 2 commits into from
Aug 23, 2023
Merged

fixes broken basic search (#9803) #9816

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
0e2f853
fixes broken basic search (#9803)
landreev Aug 22, 2023
8c259b5
fixing the intermittently-failing FilesIT test. #9803
landreev Aug 22, 2023
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
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public String searchRedirect(String dataverseRedirectPage, Dataverse dataverseIn
qParam = "&q=" + query;
}

return widgetWrapper.wrapURL(dataverseRedirectPage + "?faces-redirect=true&q=" + qParam + optionalDataverseScope);
return widgetWrapper.wrapURL(dataverseRedirectPage + "?faces-redirect=true" + qParam + optionalDataverseScope);

}

Expand Down
12 changes: 7 additions & 5 deletions src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,8 +1399,8 @@ public void testGetFileInfo() {
createUser = UtilIT.createRandomUser();
String apiTokenRegular = UtilIT.getApiTokenFromResponse(createUser);

msg("Add tabular file");
String pathToFile = "scripts/search/data/tabular/stata13-auto-withstrls.dta";
msg("Add a non-tabular file");
String pathToFile = "scripts/search/data/binary/trees.png";
Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);

String dataFileId = addResponse.getBody().jsonPath().getString("data.files[0].dataFile.id");
Expand All @@ -1412,10 +1412,12 @@ public void testGetFileInfo() {

getFileDataResponse.prettyPrint();
getFileDataResponse.then().assertThat()
.body("data.label", equalTo("stata13-auto-withstrls.dta"))
.body("data.dataFile.filename", equalTo("stata13-auto-withstrls.dta"))
.body("data.label", equalTo("trees.png"))
.body("data.dataFile.filename", equalTo("trees.png"))
.body("data.dataFile.contentType", equalTo("image/png"))
.body("data.dataFile.filesize", equalTo(8361))
.statusCode(OK.getStatusCode());

getFileDataResponse = UtilIT.getFileData(dataFileId, apiTokenRegular);
getFileDataResponse.then().assertThat()
.statusCode(BAD_REQUEST.getStatusCode());
Expand Down