Merge 3f8beb9 into f36cd6c

vaadin · Oct 10, 2018 · 2803bad · 2803bad
2 parents f36cd6c + 3f8beb9
commit 2803bad
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/vaadin-combo-box-data-provider-mixin.html b/src/vaadin-combo-box-data-provider-mixin.html
@@ -164,6 +164,7 @@
       if (!this.dataProvider) {
         return;
       }
+      this._pendingRequests = {};
       const filteredItems = [];
       filteredItems.length = this.size || 0;
       this.filteredItems = new Array(...filteredItems).map(item => {

diff --git a/test/lazy-loading.html b/test/lazy-loading.html
@@ -614,6 +614,18 @@
               const params = spyDataProvider.firstCall.args[0];
               expect(params.page).to.equal(0);
             });
+
+            it('should clear old pending requests', () => {
+              let slowCallback;
+              comboBox.dataProvider = (params, callback) => {
+                if (!slowCallback) {
+                  slowCallback = callback;
+                }
+              };
+              comboBox.clearCache();
+              slowCallback([{}]);
+              expect(comboBox.filteredItems).to.be.empty;
+            });
           });
 
           describe('after closed', () => {