summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2020-01-09 15:48:07 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-09 15:48:07 +0000
commit1a38683847c91ec6f3861b83582ce7441d3050ca (patch)
treec89079dd7847bae0977075e5e3c62557e2ec7331 /vid-webpack-master/src
parent2d701e93373c70e33c2f797d7b2c177cfe96bc2e (diff)
parent6b5dd86a3557e8eed2c4584f5d16df5654cbc57b (diff)
Merge "Fix the format of supplementary file and user params for aLaCarte requests"
Diffstat (limited to 'vid-webpack-master/src')
-rw-r--r--vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts10
1 files changed, 3 insertions, 7 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
index 94def926a..578c37ef0 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
@@ -1,10 +1,6 @@
import {LogService} from "../../../../utils/log/log.service";
import {NgRedux} from "@angular-redux/store";
-import {
- ControlGeneratorUtil,
- SDN_C_PRE_LOAD,
- SUPPLEMENTARY_FILE
-} from "../../../genericForm/formControlsServices/control.generator.util.service";
+import {ControlGeneratorUtil, SDN_C_PRE_LOAD, SUPPLEMENTARY_FILE} from "../../../genericForm/formControlsServices/control.generator.util.service";
import {AaiService} from "../../../../services/aaiService/aai.service";
import {HttpClient} from "@angular/common/http";
import {GenericFormService} from "../../../genericForm/generic-form.service";
@@ -192,7 +188,7 @@ describe('VFModule popup service', () => {
};
form.controls = {
supplementaryFile_hidden_content : {
- value: '{"c": "c", "d": 1}'
+ value: '[{"name": "c", "value": "c"}, {"name": "d", "value": "1"}]'
},
supplementaryFile_hidden : {
value: {
@@ -204,7 +200,7 @@ describe('VFModule popup service', () => {
let expectedMergePayload = {
a: "value",
b: "another",
- supplementaryFileContent: {c: "c", d: 1},
+ supplementaryFileContent: [{"name": "c", "value": "c"}, {"name": "d", "value": "1"}],
supplementaryFileName: "name"
};