diff --git a/healthcare/datasets/createDataset.js b/healthcare/datasets/createDataset.js index 984974fb4e..ba729f8f04 100644 --- a/healthcare/datasets/createDataset.js +++ b/healthcare/datasets/createDataset.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_create_dataset] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const createDataset = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/deidentifyDataset.js b/healthcare/datasets/deidentifyDataset.js index ea5f1f5e0d..9474627714 100644 --- a/healthcare/datasets/deidentifyDataset.js +++ b/healthcare/datasets/deidentifyDataset.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_dicom_keeplist_deidentify_dataset] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const deidentifyDataset = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/deleteDataset.js b/healthcare/datasets/deleteDataset.js index 845527b1ee..cb0c0f7bb8 100644 --- a/healthcare/datasets/deleteDataset.js +++ b/healthcare/datasets/deleteDataset.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_delete_dataset] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const deleteDataset = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/getDataset.js b/healthcare/datasets/getDataset.js index 7eb9178283..f1264a7972 100644 --- a/healthcare/datasets/getDataset.js +++ b/healthcare/datasets/getDataset.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_get_dataset] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getDataset = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/getDatasetIamPolicy.js b/healthcare/datasets/getDatasetIamPolicy.js index 1a28d2ed95..2e85636b84 100644 --- a/healthcare/datasets/getDatasetIamPolicy.js +++ b/healthcare/datasets/getDatasetIamPolicy.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_dataset_get_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getDatasetIamPolicy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/listDatasets.js b/healthcare/datasets/listDatasets.js index fb18b03a11..925ada1340 100644 --- a/healthcare/datasets/listDatasets.js +++ b/healthcare/datasets/listDatasets.js @@ -22,7 +22,7 @@ const main = ( ) => { // [START healthcare_list_datasets] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const listDatasets = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/package.json b/healthcare/datasets/package.json index 3d5438604d..140bec5988 100644 --- a/healthcare/datasets/package.json +++ b/healthcare/datasets/package.json @@ -15,7 +15,7 @@ "mocha": "^7.0.0" }, "dependencies": { - "googleapis": "^48.0.0", + "googleapis": "^49.0.0", "uuid": "^7.0.0", "yargs": "^15.0.0" }, diff --git a/healthcare/datasets/patchDataset.js b/healthcare/datasets/patchDataset.js index a7a39e0fad..580f2d74c6 100644 --- a/healthcare/datasets/patchDataset.js +++ b/healthcare/datasets/patchDataset.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_patch_dataset] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const patchDataset = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/setDatasetIamPolicy.js b/healthcare/datasets/setDatasetIamPolicy.js index af80f08b43..7572fc07cb 100644 --- a/healthcare/datasets/setDatasetIamPolicy.js +++ b/healthcare/datasets/setDatasetIamPolicy.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_dataset_set_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const setDatasetIamPolicy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/datasets/system-test/datasets.test.js b/healthcare/datasets/system-test/datasets.test.js index f10c9c26ff..ebd0824082 100644 --- a/healthcare/datasets/system-test/datasets.test.js +++ b/healthcare/datasets/system-test/datasets.test.js @@ -19,7 +19,6 @@ const assert = require('assert'); const uuid = require('uuid'); const {execSync} = require('child_process'); -const cwd = path.join(__dirname, '..'); const projectId = process.env.GCLOUD_PROJECT; const datasetId = `dataset-${uuid.v4()}`.replace(/-/gi, '_'); const destinationDatasetId = `destination-${uuid.v4()}`.replace(/-/gi, '_'); @@ -39,8 +38,7 @@ before(() => { after(() => { try { execSync( - `node deleteDataset.js ${projectId} ${cloudRegion} ${destinationDatasetId}`, - cwd + `node deleteDataset.js ${projectId} ${cloudRegion} ${destinationDatasetId}` ); // eslint-disable-next-line no-empty } catch (err) {} // Ignore error @@ -48,16 +46,14 @@ after(() => { it('should create a dataset', () => { const output = execSync( - `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwd + `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}` ); - assert.strictEqual(output, `Created dataset: ${datasetId}`); + assert.ok(output.includes('Created dataset')); }); it('should get a dataset', () => { const output = execSync( `node getDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwd ); assert.ok(output.includes('name')); }); @@ -66,30 +62,24 @@ it('should patch a dataset', () => { const timeZone = 'GMT'; const output = execSync( `node patchDataset.js ${projectId} ${cloudRegion} ${datasetId} ${timeZone}`, - cwd ); - assert.strictEqual( - output, - `Dataset ${datasetId} patched with time zone ${timeZone}` + assert.ok( + output.includes('patched with time zone') ); }); it('should list datasets', () => { - const output = execSync( - `node listDatasets.js ${projectId} ${cloudRegion}`, - cwd - ); + const output = execSync(`node listDatasets.js ${projectId} ${cloudRegion}`, { + }); assert.ok(output.includes('datasets')); }); it('should de-identify data in a dataset and write to a new dataset', () => { const output = execSync( `node deidentifyDataset.js ${projectId} ${cloudRegion} ${datasetId} ${destinationDatasetId} ${keeplistTags}`, - cwd ); - assert.strictEqual( - output, - `De-identified data written from dataset ${datasetId} to dataset ${destinationDatasetId}` + assert.ok( + output.includes('De-identified data written') ); }); @@ -99,7 +89,6 @@ it('should create and get a dataset IAM policy', () => { let output = execSync( `node setDatasetIamPolicy.js ${projectId} ${cloudRegion} ${datasetId} ${localMember} ${localRole}`, - cwd ); assert.ok(output.includes, 'ETAG'); @@ -112,7 +101,6 @@ it('should create and get a dataset IAM policy', () => { it('should delete a dataset', () => { const output = execSync( `node deleteDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwd ); - assert.strictEqual(output, `Deleted dataset: ${datasetId}`); + assert.ok(output.includes('Deleted dataset')); }); diff --git a/healthcare/dicom/createDicomStore.js b/healthcare/dicom/createDicomStore.js index 1b2a0c9835..f83b0ad15c 100644 --- a/healthcare/dicom/createDicomStore.js +++ b/healthcare/dicom/createDicomStore.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_create_dicom_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const createDicomStore = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/deleteDicomStore.js b/healthcare/dicom/deleteDicomStore.js index c084df8db6..c5328849c8 100644 --- a/healthcare/dicom/deleteDicomStore.js +++ b/healthcare/dicom/deleteDicomStore.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_delete_dicom_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const deleteDicomStore = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/dicomWebDeleteStudy.js b/healthcare/dicom/dicomWebDeleteStudy.js index 9123586324..8db5a88556 100644 --- a/healthcare/dicom/dicomWebDeleteStudy.js +++ b/healthcare/dicom/dicomWebDeleteStudy.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_dicomweb_delete_study] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const dicomWebDeleteStudy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/dicomWebRetrieveInstance.js b/healthcare/dicom/dicomWebRetrieveInstance.js index bd5ae6b67d..1358b0d2cd 100644 --- a/healthcare/dicom/dicomWebRetrieveInstance.js +++ b/healthcare/dicom/dicomWebRetrieveInstance.js @@ -27,7 +27,7 @@ const main = ( ) => { // [START healthcare_dicomweb_retrieve_instance] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const util = require('util'); const writeFile = util.promisify(fs.writeFile); diff --git a/healthcare/dicom/dicomWebRetrieveRendered.js b/healthcare/dicom/dicomWebRetrieveRendered.js index 2f15ec104d..5a2ae23f12 100644 --- a/healthcare/dicom/dicomWebRetrieveRendered.js +++ b/healthcare/dicom/dicomWebRetrieveRendered.js @@ -27,7 +27,7 @@ const main = ( ) => { // [START healthcare_dicomweb_retrieve_rendered] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const util = require('util'); const writeFile = util.promisify(fs.writeFile); diff --git a/healthcare/dicom/dicomWebRetrieveStudy.js b/healthcare/dicom/dicomWebRetrieveStudy.js index afb7b02e0d..2bb38f7a8e 100644 --- a/healthcare/dicom/dicomWebRetrieveStudy.js +++ b/healthcare/dicom/dicomWebRetrieveStudy.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_dicomweb_retrieve_study] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const util = require('util'); const writeFile = util.promisify(fs.writeFile); diff --git a/healthcare/dicom/dicomWebSearchForInstances.js b/healthcare/dicom/dicomWebSearchForInstances.js index 045148889c..6f5d5abc83 100644 --- a/healthcare/dicom/dicomWebSearchForInstances.js +++ b/healthcare/dicom/dicomWebSearchForInstances.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_dicomweb_search_instances] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const dicomWebSearchForInstances = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/dicomWebSearchStudies.js b/healthcare/dicom/dicomWebSearchStudies.js index 560645d5ac..69b116fd60 100644 --- a/healthcare/dicom/dicomWebSearchStudies.js +++ b/healthcare/dicom/dicomWebSearchStudies.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_dicomweb_search_studies] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const dicomWebSearchStudies = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/dicomWebStoreInstance.js b/healthcare/dicom/dicomWebStoreInstance.js index b7758b4b92..9be8773149 100644 --- a/healthcare/dicom/dicomWebStoreInstance.js +++ b/healthcare/dicom/dicomWebStoreInstance.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_dicomweb_store_instance] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const binaryData = fs.createReadStream(dcmFile); diff --git a/healthcare/dicom/exportDicomInstanceGcs.js b/healthcare/dicom/exportDicomInstanceGcs.js index 2040952cbe..fa33d69052 100644 --- a/healthcare/dicom/exportDicomInstanceGcs.js +++ b/healthcare/dicom/exportDicomInstanceGcs.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_export_dicom_instance_gcs] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const exportDicomInstanceGcs = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/getDicomStore.js b/healthcare/dicom/getDicomStore.js index d1b56611b5..226bfb2250 100644 --- a/healthcare/dicom/getDicomStore.js +++ b/healthcare/dicom/getDicomStore.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_get_dicom_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getDicomStore = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/getDicomStoreIamPolicy.js b/healthcare/dicom/getDicomStoreIamPolicy.js index 43fce3d3a4..ba0921ed21 100644 --- a/healthcare/dicom/getDicomStoreIamPolicy.js +++ b/healthcare/dicom/getDicomStoreIamPolicy.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_dicom_store_get_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getDicomStoreIamPolicy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/importDicomInstance.js b/healthcare/dicom/importDicomInstance.js index ccd4cf9c08..d881e5851d 100644 --- a/healthcare/dicom/importDicomInstance.js +++ b/healthcare/dicom/importDicomInstance.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_import_dicom_instance] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const sleep = require('../sleep'); const importDicomInstance = async () => { diff --git a/healthcare/dicom/listDicomStores.js b/healthcare/dicom/listDicomStores.js index 702c7d08c4..e8b2e38373 100644 --- a/healthcare/dicom/listDicomStores.js +++ b/healthcare/dicom/listDicomStores.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_list_dicom_stores] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const listDicomStores = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/package.json b/healthcare/dicom/package.json index 1e295155ce..7fb821592e 100644 --- a/healthcare/dicom/package.json +++ b/healthcare/dicom/package.json @@ -17,7 +17,7 @@ "mocha": "^7.0.0" }, "dependencies": { - "googleapis": "^48.0.0", + "googleapis": "^49.0.0", "uuid": "^7.0.0", "yargs": "^15.0.0", "gtoken": "^5.0.0", diff --git a/healthcare/dicom/patchDicomStore.js b/healthcare/dicom/patchDicomStore.js index 912169f693..cffe674a48 100644 --- a/healthcare/dicom/patchDicomStore.js +++ b/healthcare/dicom/patchDicomStore.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_patch_dicom_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const patchDicomStore = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/setDicomStoreIamPolicy.js b/healthcare/dicom/setDicomStoreIamPolicy.js index 13a12d5355..2b993984c1 100644 --- a/healthcare/dicom/setDicomStoreIamPolicy.js +++ b/healthcare/dicom/setDicomStoreIamPolicy.js @@ -26,7 +26,7 @@ const main = ( ) => { // [START healthcare_dicom_store_set_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const setDicomStoreIamPolicy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/dicom/system-test/dicom_stores.test.js b/healthcare/dicom/system-test/dicom_stores.test.js index 34734d406c..c1545e8a82 100644 --- a/healthcare/dicom/system-test/dicom_stores.test.js +++ b/healthcare/dicom/system-test/dicom_stores.test.js @@ -59,10 +59,9 @@ before(async () => { // Create a Pub/Sub topic to be used for testing. const [topic] = await pubSubClient.createTopic(topicName); console.log(`Topic ${topic.name} created.`); - execSync( - `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwdDatasets - ); + execSync(`node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`, { + cwd: cwdDatasets, + }); }); after(async () => { @@ -75,17 +74,16 @@ after(async () => { await pubSubClient.topic(topicName).delete(); console.log(`Topic ${topicName} deleted.`); - execSync( - `node deleteDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwdDatasets - ); + execSync(`node deleteDataset.js ${projectId} ${cloudRegion} ${datasetId}`, { + cwd: cwdDatasets, + }); } catch (err) {} // Ignore error }); it('should create a DICOM store', () => { const output = execSync( `node createDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); assert.ok(output.includes('Created DICOM store')); }); @@ -93,7 +91,7 @@ it('should create a DICOM store', () => { it('should get a DICOM store', () => { const output = execSync( `node getDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); assert.ok(output.includes('name')); }); @@ -101,7 +99,7 @@ it('should get a DICOM store', () => { it('should patch a DICOM store', () => { const output = execSync( `node patchDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${topicName}`, - cwd + {cwd} ); assert.ok(output.includes('Patched DICOM store')); }); @@ -109,7 +107,7 @@ it('should patch a DICOM store', () => { it('should list DICOM stores', () => { const output = execSync( `node listDicomStores.js ${projectId} ${cloudRegion} ${datasetId}`, - cwd + {cwd} ); assert.ok(output.includes('dicomStores')); }); @@ -120,7 +118,7 @@ it('should create and get a DICOM store IAM policy', () => { let output = execSync( `node setDicomStoreIamPolicy.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${localMember} ${localRole}`, - cwd + {cwd} ); assert.ok(output.includes, 'ETAG'); @@ -133,7 +131,7 @@ it('should create and get a DICOM store IAM policy', () => { it('should import a DICOM object from GCS', () => { const output = execSync( `node importDicomInstance.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${gcsUri}`, - cwd + {cwd} ); assert.ok(output.includes('Successfully imported DICOM instances')); }); @@ -141,7 +139,7 @@ it('should import a DICOM object from GCS', () => { it('should export a DICOM instance', () => { const output = execSync( `node exportDicomInstanceGcs.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${bucketName}`, - cwd + {cwd} ); assert.ok(output.includes('Exported DICOM instances')); }); @@ -149,7 +147,7 @@ it('should export a DICOM instance', () => { it('should delete a DICOM store', () => { const output = execSync( `node deleteDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); assert.ok(output.includes('Deleted DICOM store')); }); diff --git a/healthcare/dicom/system-test/dicomweb.test.js b/healthcare/dicom/system-test/dicomweb.test.js index 2500148749..f15719c085 100644 --- a/healthcare/dicom/system-test/dicomweb.test.js +++ b/healthcare/dicom/system-test/dicomweb.test.js @@ -50,29 +50,28 @@ before(() => { process.env.GOOGLE_APPLICATION_CREDENTIALS, `Must set GOOGLE_APPLICATION_CREDENTIALS environment variable!` ); - execSync( - `node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`, - cwdDatasets - ); + execSync(`node createDataset.js ${projectId} ${cloudRegion} ${datasetId}`, { + cwd: cwdDatasets, + }); execSync( `node createDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); }); after(() => { try { execSync( `node deleteDicomStore.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); - execSync(`node deleteDataset.js ${datasetId}`, cwdDatasets); + execSync(`node deleteDataset.js ${datasetId}`, {cwd: cwdDatasets}); } catch (err) {} // Ignore error }); it('should store a DICOM instance', () => { const output = execSync( `node dicomWebStoreInstance.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${dcmFile}`, - cwd + {cwd} ); assert.ok(output.includes('Stored DICOM instance')); }); @@ -80,7 +79,7 @@ it('should store a DICOM instance', () => { it('should search DICOM instances', () => { const output = execSync( `node dicomWebSearchForInstances.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); assert.ok(output.includes('Found')); }); @@ -88,7 +87,7 @@ it('should search DICOM instances', () => { it('should retrieve a DICOM study', () => { const output = execSync( `node dicomWebRetrieveStudy.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${studyUid}`, - cwd + {cwd} ); assert.ok(output.includes('Retrieved study')); }); @@ -96,7 +95,7 @@ it('should retrieve a DICOM study', () => { it('should retrieve a DICOM instance', () => { const output = execSync( `node dicomWebRetrieveInstance.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${studyUid} ${seriesUid} ${instanceUid}`, - cwd + {cwd} ); assert.ok(output.includes('Retrieved DICOM instance')); }); @@ -104,7 +103,7 @@ it('should retrieve a DICOM instance', () => { it('should retrieve a DICOM rendered PNG image', () => { const output = execSync( `node dicomWebRetrieveRendered.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${studyUid} ${seriesUid} ${instanceUid}`, - cwd + {cwd} ); assert.ok(output.includes('Retrieved rendered image')); }); @@ -112,7 +111,7 @@ it('should retrieve a DICOM rendered PNG image', () => { it('should search for DICOM studies', () => { const output = execSync( `node dicomWebSearchStudies.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId}`, - cwd + {cwd} ); assert.ok(output.includes('Found')); }); @@ -120,7 +119,7 @@ it('should search for DICOM studies', () => { it('should delete a DICOM study', () => { const output = execSync( `node dicomWebDeleteStudy.js ${projectId} ${cloudRegion} ${datasetId} ${dicomStoreId} ${studyUid}`, - cwd + {cwd} ); - assert.ok(output.includes('Deleted study')); + assert.ok(output.includes('Deleted DICOM study')); });