fix tests

ampproject · Mar 12, 2020 · d86c273 · d86c273
1 parent 2a32f0b
commit d86c273
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/amp-story-player.js b/src/amp-story-player.js
@@ -49,8 +49,9 @@ const IframePosition = {
  * @enum {number}
  */
 const SwipingState = {
-  SWIPING_TO_LEFT: 0,
-  SWIPING_TO_RIGHT: 1,
+  NOT_SWIPING: 0,
+  SWIPING_TO_LEFT: 1,
+  SWIPING_TO_RIGHT: 2,
 };
 
 /** @const {number} */
@@ -111,8 +112,8 @@ export class AmpStoryPlayer {
     /** @private {number} */
     this.currentIdx_ = 0;
 
-    /** @private {?SwipingState} */
-    this.swipingState_ = null;
+    /** @private {!SwipingState} */
+    this.swipingState_ = SwipingState.NOT_SWIPING;
 
     /** @private {!Object} */
     this.touchEventState_ = {
@@ -538,6 +539,7 @@ export class AmpStoryPlayer {
     this.touchEventState_.startY = 0;
     this.touchEventState_.lastX = 0;
     this.touchEventState_.isSwipeX = null;
+    this.swipingState_ = SwipingState.NOT_SWIPING;
   }
 
   /**

diff --git a/test/unit/test-amp-story-player.js b/test/unit/test-amp-story-player.js
@@ -193,9 +193,11 @@ describes.realWin('AmpStoryPlayer', {amp: false}, env => {
     const fakeData = {next: true};
     fireHandler['selectDocument']('selectDocument', fakeData);
 
-    const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
-    expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
-    expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    win.requestAnimationFrame(() => {
+      const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
+      expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
+      expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    });
   });
 
   it('should navigate when swiping', async () => {
@@ -204,9 +206,11 @@ describes.realWin('AmpStoryPlayer', {amp: false}, env => {
 
     swipeLeft();
 
-    const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
-    expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
-    expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    win.requestAnimationFrame(() => {
+      const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
+      expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
+      expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    });
   });
 
   it('should not navigate when swiping last story', async () => {
@@ -217,8 +221,10 @@ describes.realWin('AmpStoryPlayer', {amp: false}, env => {
     swipeLeft();
     swipeLeft();
 
-    const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
-    expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
-    expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    win.requestAnimationFrame(() => {
+      const iframes = playerEl.shadowRoot.querySelectorAll('iframe');
+      expect(iframes[0].getAttribute('i-amphtml-iframe-position')).to.eql('-1');
+      expect(iframes[1].getAttribute('i-amphtml-iframe-position')).to.eql('0');
+    });
   });
 });