From ec766b159854069b42a34d2ec9f9a578123ebf01 Mon Sep 17 00:00:00 2001 From: Nia Peeva Date: Thu, 13 Jul 2023 15:05:43 +0300 Subject: [PATCH] feat(ui5-tokenizer): apply review comments --- .../main/test/specs/MultiComboBox.spec.js | 22 ++++++++----------- packages/main/test/specs/MultiInput.spec.js | 20 +++++++---------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/packages/main/test/specs/MultiComboBox.spec.js b/packages/main/test/specs/MultiComboBox.spec.js index b83371fe271c..6c2480ac6c75 100644 --- a/packages/main/test/specs/MultiComboBox.spec.js +++ b/packages/main/test/specs/MultiComboBox.spec.js @@ -1491,22 +1491,18 @@ describe("MultiComboBox general interaction", () => { const tokenizerNMore = await mcNMore.shadow$("ui5-tokenizer"); const nItemsLabel = await tokenizerNItems.shadow$(".ui5-tokenizer-more-text"); const nMoreLabel = await tokenizerNMore.shadow$(".ui5-tokenizer-more-text"); - let resourceBundleTextItems = null; - let resourceBundleTextMore = null; - - - resourceBundleTextItems = await browser.executeAsync(done => { + let resourceBundleText = null; + + resourceBundleText = await browser.executeAsync(done => { const mi = document.getElementById("mc-items"); - done(mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.TOKENIZER_SHOW_ALL_ITEMS, 2)); - }); - - resourceBundleTextMore = await browser.executeAsync(done => { - const mi = document.getElementById("mc-more"); - done(mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.MULTIINPUT_SHOW_MORE_TOKENS, 1)); + done({ + mcItemsLabelText: mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.TOKENIZER_SHOW_ALL_ITEMS, 2), + mcNMoreLabelText: mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.MULTIINPUT_SHOW_MORE_TOKENS, 1) + }); }); - assert.strictEqual(await nItemsLabel.getText(), resourceBundleTextItems, "Text should be 2 Items"); - assert.strictEqual(await nMoreLabel.getText(), resourceBundleTextMore, "Text should be 1 More"); + assert.strictEqual(await nItemsLabel.getText(), resourceBundleText.mcItemsLabelText, "Text should be 2 Items"); + assert.strictEqual(await nMoreLabel.getText(), resourceBundleText.mcNMoreLabelText, "Text should be 1 More"); }); }); diff --git a/packages/main/test/specs/MultiInput.spec.js b/packages/main/test/specs/MultiInput.spec.js index 5a6cf8c04885..8f13769a0857 100644 --- a/packages/main/test/specs/MultiInput.spec.js +++ b/packages/main/test/specs/MultiInput.spec.js @@ -207,22 +207,18 @@ describe("MultiInput general interaction", () => { const tokenizerNMore = await miNMore.shadow$("ui5-tokenizer"); const nItemsLabel = await tokenizerNItems.shadow$(".ui5-tokenizer-more-text"); const nMoreLabel = await tokenizerNMore.shadow$(".ui5-tokenizer-more-text"); - let resourceBundleTextItems = null; - let resourceBundleTextMore = null; - + let resourceBundleText = null; - resourceBundleTextItems = await browser.executeAsync(done => { + resourceBundleText = await browser.executeAsync(done => { const mi = document.getElementById("mi-items"); - done(mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.TOKENIZER_SHOW_ALL_ITEMS, 2)); - }); - - resourceBundleTextMore = await browser.executeAsync(done => { - const mi = document.getElementById("mi-more"); - done(mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.MULTIINPUT_SHOW_MORE_TOKENS, 1)); + done({ + miItemsLabelText: mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.TOKENIZER_SHOW_ALL_ITEMS, 2), + miNMoreLabelText: mi.constructor.i18nBundle.getText(window["sap-ui-webcomponents-bundle"].defaultTexts.MULTIINPUT_SHOW_MORE_TOKENS, 1) + }); }); - assert.strictEqual(await nItemsLabel.getText(), resourceBundleTextItems, "Text should be 2 Items"); - assert.strictEqual(await nMoreLabel.getText(), resourceBundleTextMore, "Text should be 1 More"); + assert.strictEqual(await nItemsLabel.getText(), resourceBundleText.miItemsLabelText, "Text should be 2 Items"); + assert.strictEqual(await nMoreLabel.getText(), resourceBundleText.miNMoreLabelText, "Text should be 1 More"); }); });