some minor fixes

SAP · May 15, 2019 · e950be6 · e950be6
1 parent bfa5566
commit e950be6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/main/src/MultiComboBox.hbs b/packages/main/src/MultiComboBox.hbs
@@ -6,7 +6,7 @@
 		?readonly={{ctr.readonly}}
 		value-state="{{ctr.valueState}}"
 		show-suggestions
-		@input="{{ctr._inputChage}}"
+		@ui5-input="{{ctr._inputChage}}"
 		@keydown="{{ctr._keydown}}">
 
 		<ui5-tokenizer data-ui5-slot="_beginContent"

diff --git a/packages/main/src/MultiComboBox.js b/packages/main/src/MultiComboBox.js
@@ -217,17 +217,19 @@ class MultiComboBox extends UI5Element {
 			const value = input.value;
 			const filteredItems = this._filterItems(value);
 			const oldValueState = input.valueState;
+			debugger
 
 			if (!filteredItems.length && value && this.validateInput) {
 				input.value = this._inputLastValue;
 				input.valueState = "Error";
-
+				
 				setTimeout(() => {
 					input.valueState = oldValueState;
 				}, 2000);
 				return;
 			}
 
+
 			this._inputLastValue = input.value;
 			this.value = input.value;
 			this._filteredItems = filteredItems;
@@ -329,6 +331,7 @@ class MultiComboBox extends UI5Element {
 		}
 
 		otherPopover && otherPopover.close();
+
 		popover && popover.openBy(this);
 	}
 

diff --git a/packages/main/test/specs/MultiComboBox.spec.js b/packages/main/test/specs/MultiComboBox.spec.js
@@ -44,9 +44,11 @@ describe("MultiComboBox general interaction", () => {
 			input.click();
 			input.keys("c");
 
-			const list = browser.findElementDeep("#mcb >>> .ui5-multi-combobox-all-items--popover ui5-list");
+			const list = browser.findElementDeep("#mcb >>> .ui5-multi-combobox-all-items-list");
 
 			assert.ok(popover.isDisplayedInViewport(), "Popover should be displayed in the viewport");
+
+
 			assert.strictEqual(list.getProperty("items").length, 3, "3 items should be shown");
 
 			input.keys("o");
@@ -85,13 +87,9 @@ describe("MultiComboBox general interaction", () => {
 		it("tests if n more is applied and corresponding popover", () => {
 			$("#more-mcb").scrollIntoView();
 
-			const token1 = browser.findElementDeep("#more-mcb >>> ui5-tokenizer ui5-token[slot='tokens-1']");
-			const token2 = browser.findElementDeep("#more-mcb >>> ui5-tokenizer ui5-token[slot='tokens-2']");
-			const token3 = browser.findElementDeep("#more-mcb >>> ui5-tokenizer ui5-token[slot='tokens-3']");
+			const nMoreText = browser.findElementDeep("#more-mcb >>> ui5-tokenizer >>> .ui5-tokenizer-more-text");
 
-			assert.ok(token1.isDisplayed(), "token 1 should be visible");
-			assert.ok(token2.isDisplayed(), "token 2 should be visible");
-			assert.ok(!token3.isDisplayed(), "token 3 should not be visible");
+			assert.ok(nMoreText.getText(), "1 More", "token 1 should be visible");
 		});
 	});
 });