Skip to content

Commit 026545c

Browse files
committed
fix unit tests in presets
1 parent 356c337 commit 026545c

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

packages/creator-presets-core/src/presets-editable-properties.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ export class CreatorPresetEditablePropertyGridDefinition extends CreatorPresetEd
195195
showPreviewTab: false,
196196
pageEditMode: "single",
197197
allowModifyPages: false,
198-
showSurveyTitle: false
198+
showSurveyTitle: false,
199+
propertyGridNavigationMode: "accordion"
199200
};
200201
const oldSearchValue = settings.propertyGrid.enableSearch;
201202
settings.propertyGrid.enableSearch = false;

packages/creator-presets-core/tests/presets-editor.tests.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ test("Preset edit model, page component", () => {
3333
expect(allItemsQuestion.choices[5].value).toEqual("translation");
3434
expect(allItemsQuestion.choices[0].title).toEqual("Designer");
3535
expect(allItemsQuestion.choices[4].title).toEqual("JSON Editor");
36-
expect([].concat(allItemsQuestion.value)).toEqual(["designer", "preview", "json"]);
37-
expect(itemsQuestion.visibleChoices).toHaveLength(3);
38-
expect([].concat(itemsQuestion.value)).toEqual(["designer", "preview", "json"]);
39-
expect(activeTabQuestion.visibleChoices).toHaveLength(3);
36+
expect([].concat(allItemsQuestion.value)).toEqual(["designer", "preview", "logic", "json"]);
37+
expect(itemsQuestion.visibleChoices).toHaveLength(4);
38+
expect([].concat(itemsQuestion.value)).toEqual(["designer", "preview", "logic", "json"]);
39+
expect(activeTabQuestion.visibleChoices).toHaveLength(4);
4040
expect(activeTabQuestion.value).toEqual("designer");
4141

4242
allItemsQuestion.value = ["designer", "translation"];
@@ -51,7 +51,7 @@ test("Preset edit model, page component", () => {
5151
tabs: { items: ["designer", "translation"], activeTab: "translation" }
5252
});
5353

54-
allItemsQuestion.value = ["designer", "preview", "json"];
54+
allItemsQuestion.value = ["designer", "preview", "logic", "json"];
5555
activeTabQuestion.value = "designer";
5656
const resJson2 = editor.getJsonFromSurveyModel();
5757
expect(resJson2).toEqual({});
@@ -61,14 +61,14 @@ test("Preset edit model, tabs page with creator, default items", () => {
6161
const survey = editor.model;
6262
const itemsQuestion = survey.getQuestionByName("tabs_items");
6363
const defultTabs = JSON.parse(JSON.stringify(itemsQuestion.value));
64-
expect(defultTabs).toEqual(["designer", "preview", "json"]);
64+
expect(defultTabs).toEqual(["designer", "preview", "logic", "json"]);
6565
itemsQuestion.value = ["preview", "logic"];
6666
const activeTabQuestion = survey.getQuestionByName("tabs_activeTab");
6767
activeTabQuestion.value = "logic";
6868
editor.applyFromSurveyModel();
6969
const creator = editor.creator;
7070
expect(creator.tabs).toHaveLength(2);
71-
expect(creator.tabs[0].id).toEqual("test");
71+
expect(creator.tabs[0].id).toEqual("preview");
7272
expect(creator.tabs[1].id).toEqual("logic");
7373
expect(creator.activeTab).toBe("logic");
7474
});
@@ -78,7 +78,7 @@ test("Preset edit model, tabs page one selected element", () => {
7878
const allItemsQuestion = survey.getQuestionByName("tabs_allItems");
7979
const itemsQuestion = survey.getQuestionByName("tabs_items");
8080
const activeTabQuestion = survey.getQuestionByName("tabs_activeTab");
81-
expect([].concat(itemsQuestion.value)).toEqual(["designer", "preview", "json"]);
81+
expect([].concat(itemsQuestion.value)).toEqual(["designer", "preview", "logic", "json"]);
8282
allItemsQuestion.value = ["designer"];
8383
expect([].concat(itemsQuestion.value)).toEqual(["designer"]);
8484
expect(itemsQuestion.isVisible).toBeFalsy();
@@ -129,7 +129,7 @@ test("Preset edit model, toolbox definition page, validate name/json", () => {
129129
});
130130
test("Preset edit model, page component", () => {
131131
const editor = new CreatorPresetEditorModel({ tabs: { items: [] } });
132-
expect(editor.creator.tabs).toHaveLength(3);
132+
expect(editor.creator.tabs).toHaveLength(4);
133133
const survey = editor.model;
134134
const allItemsQuestion = survey.getQuestionByName("tabs_allItems");
135135
const itemsQuestion = survey.getQuestionByName("tabs_items");
@@ -447,7 +447,7 @@ test("Preset edit model, edit matrixdropdowncolumn@default", () => {
447447
survey.setValue("propertyGrid_definition_selector", "matrixdropdowncolumn@default");
448448
const propGridCreator = getPropGridCreator(survey);
449449
const creatorSurvey = propGridCreator.survey;
450-
expect(creatorSurvey.getAllPanels()).toHaveLength(4);
450+
expect(creatorSurvey.getAllPanels()).toHaveLength(5);
451451
expect(creatorSurvey.getAllPanels()[0].elements).toHaveLength(10);
452452
expect(creatorSurvey.getAllPanels()[1].elements).toHaveLength(7);
453453
});
@@ -895,7 +895,7 @@ test("Preset edit model, save creator JSON on applying new preset", () => {
895895
editor.creator.JSON = { elements: [{ type: "text", name: "q1" }, { type: "text", name: "q2" }] };
896896
const itemsQuestion = survey.getQuestionByName("tabs_items");
897897
const defultTabs = JSON.parse(JSON.stringify(itemsQuestion.value));
898-
expect(defultTabs).toEqual(["designer", "preview", "json"]);
898+
expect(defultTabs).toEqual(["designer", "preview", "logic", "json"]);
899899
itemsQuestion.value = ["preview", "logic"];
900900
const activeTabQuestion = survey.getQuestionByName("tabs_activeTab");
901901
activeTabQuestion.value = "logic";
@@ -920,5 +920,5 @@ test("Preset edit model, set json property", () => {
920920
editor.json = json;
921921
expect(JSON.parse(jsonQuestion.value)).toMatchObject(json);
922922
expect(editor.creator.tabs).toHaveLength(2);
923-
expect(editor.creator.activeTab).toBe("test");
923+
expect(editor.creator.activeTab).toBe("preview");
924924
});

0 commit comments

Comments
 (0)