Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ wget --no-check-certificate \
--header="X-Okapi-Tenant: consortium" \
--header="Content-Type: application/json" \
--header="X-Okapi-Url: http://localhost:9130" \
--post-data='{"module_to":"mod-inventory-storage-30.1.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \
--post-data='{"module_to":"mod-inventory-storage-30.0.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \
http://localhost:8081/_/tenant
```

Expand All @@ -210,7 +210,7 @@ wget --no-check-certificate \
--header="X-Okapi-Tenant: member" \
--header="Content-Type: application/json" \
--header="X-Okapi-Url: http://localhost:9130" \
--post-data='{"module_to":"mod-inventory-storage-30.1.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \
--post-data='{"module_to":"mod-inventory-storage-30.0.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \
http://localhost:8081/_/tenant
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public class TenantRefApi extends TenantAPI {
"nature-of-content-terms",
"statistical-code-types",
"statistical-codes",
"service-points",
"subject-sources",
"subject-types"
};
Expand Down Expand Up @@ -137,6 +136,7 @@ private void configureReferenceData(TenantLoading tl) {
private void configureSampleData(TenantLoading tl) {
tl.withKey(SAMPLE_KEY).withLead(SAMPLE_LEAD);
tl.withPostIgnore();
tl.add("service-points");
tl.add("service-points-users");
tl.add("location-units/institutions");
tl.add("location-units/campuses");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,47 +155,6 @@ void health() {
.body(is("\"OK\""));
}

@Test
void installWithReferenceDataOnly() {
setTenant("refonly");

JsonObject body = new JsonObject()
.put("module_to", "mod-inventory-storage-999999.0.0")
.put("parameters", new JsonArray()
.add(new JsonObject().put("key", "loadReference").put("value", "true")));

postTenant(body);
referenceDataSmokeTest();
}

private void referenceDataSmokeTest() {
// reference data loaded
when()
.get("/classification-types?limit=1000")
.then()
.statusCode(200)
.body("classificationTypes.size()", is(10));

when()
.get("/service-points?limit=1000")
.then()
.statusCode(200)
.body("servicepoints.size()", is(4));

// sample data not loaded
when()
.get("/location-units/institutions")
.then()
.statusCode(200)
.body("locinsts.size()", is(0));

when()
.get("/locations")
.then()
.statusCode(200)
.body("locations.size()", is(0));
}

@Test
void installAndUpgrade() {
when()
Expand Down
Loading