Merge efc1c44 into 47ab901

vaadin · Aug 1, 2018 · a63213f · a63213f
2 parents 47ab901 + efc1c44
commit a63213f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/src/vaadin-time-picker.html b/src/vaadin-time-picker.html
@@ -293,16 +293,10 @@
 
           const stepResolution = this.__validDayDivisor(this.step) && this.step || 60;
 
-          if (!this.step || stepResolution >= 15 * 60) {
-            return;
-          }
-
           if (Polymer.IronA11yKeysBehavior.keyboardEventMatchesKeys(e, 'down')) {
             this.__onArrowPressWithStep(-stepResolution);
           } else if (Polymer.IronA11yKeysBehavior.keyboardEventMatchesKeys(e, 'up')) {
             this.__onArrowPressWithStep(stepResolution);
-          } else if (Polymer.IronA11yKeysBehavior.keyboardEventMatchesKeys(e, 'esc')) {
-            this.__memoValue = this.value && this.__validateTime(this.i18n.parseTime(this.value));
           }
         }
 
@@ -487,7 +481,7 @@
          * Focusable element used by vaadin-control-state-mixin
          */
         get focusElement() {
-          return this.__inputElement || this;
+          return this.__inputElement;
         }
 
         /**

diff --git a/test/input-test.html b/test/input-test.html
@@ -29,6 +29,20 @@
         timePicker = fixture('default');
       });
 
+      describe('element', () => {
+        it('should have a valid localName', () => {
+          expect(timePicker.localName).to.be.equal('vaadin-time-picker');
+        });
+
+        it('should be registered in Vaadin namespace', () => {
+          expect(Vaadin.TimePickerElement.is).to.be.equal('vaadin-time-picker');
+        });
+
+        it('should have a valid version', () => {
+          expect(Vaadin.TimePickerElement.version).to.be.ok;
+        });
+      });
+
       it('vaadin-time-picker-text-field should exist', () => {
         expect(timePicker.__inputElement.localName).to.be.equal('vaadin-time-picker-text-field');
       });

diff --git a/test/keyboard-navigation.html b/test/keyboard-navigation.html
@@ -29,6 +29,10 @@
         MockInteractions.pressAndReleaseKeyOn(getInput(), 40);
       }
 
+      function escape() {
+        MockInteractions.pressAndReleaseKeyOn(timePicker.__dropdownElement, 27);
+      }
+
       function getInput() {
         return timePicker.__inputElement;
       }
@@ -228,6 +232,14 @@
           arrowUp();
           expect(document.querySelector('vaadin-combo-box-overlay')).not.to.be.ok;
         });
+
+        it('should not change value on escape', () => {
+          timePicker.step = 0.5;
+          arrowUp();
+          expect(timePicker.__inputElement.value).to.be.equal('00:00:00.500');
+          escape();
+          expect(timePicker.__inputElement.value).to.be.equal('');
+        });
       });
     });
   </script>

diff --git a/test/step-test.html b/test/step-test.html
@@ -28,6 +28,21 @@
         expect(timePicker.step).to.be.equal(undefined);
       });
 
+      it('should have dropdown items if step is undefined', () => {
+        timePicker.step = undefined;
+        expect(timePicker.__dropdownItems.length).to.be.equal(24);
+      });
+
+      it('should have dropdown items if step is bigger or equal than 15min', () => {
+        timePicker.step = 15 * 60;
+        expect(timePicker.__dropdownItems.length).to.be.equal(96);
+      });
+
+      it('should not have dropdown items if step is lesser than 15min', () => {
+        timePicker.step = 15 * 60 - 1;
+        expect(timePicker.__dropdownItems.length).to.be.equal(0);
+      });
+
       it('should allow setting valid step property value', () => {
         timePicker.step = 0.5;
         expect(timePicker.step).to.be.equal(0.5);