fix: Revert "fix(scheduler): prevent unwanted clearInterval (#3044)"

This reverts commit 7d722d4.
ReactiveX · Dec 2, 2017 · 64f9285 · 64f9285
1 parent fdfeef2
commit 64f9285
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 57 deletions.
diff --git a/spec/schedulers/AsapScheduler-spec.ts b/spec/schedulers/AsapScheduler-spec.ts
@@ -40,59 +40,6 @@ describe('Scheduler.asap', () => {
     sandbox.restore();
   });
 
-  it('should reuse the interval for recursively scheduled actions with the same delay', () => {
-    const sandbox = sinon.sandbox.create();
-    const fakeTimer = sandbox.useFakeTimers();
-    // callThrough is missing from the declarations installed by the typings tool in stable
-    const stubSetInterval = (<any> sinon.stub(global, 'setInterval')).callThrough();
-    function dispatch(state: any): void {
-      state.index += 1;
-      if (state.index < 3) {
-        (<any> this).schedule(state, state.period);
-      }
-    }
-    const period = 50;
-    const state = { index: 0, period };
-    asap.schedule(dispatch, period, state);
-    expect(state).to.have.property('index', 0);
-    expect(stubSetInterval).to.have.property('callCount', 1);
-    fakeTimer.tick(period);
-    expect(state).to.have.property('index', 1);
-    expect(stubSetInterval).to.have.property('callCount', 1);
-    fakeTimer.tick(period);
-    expect(state).to.have.property('index', 2);
-    expect(stubSetInterval).to.have.property('callCount', 1);
-    stubSetInterval.restore();
-    sandbox.restore();
-  });
-
-  it('should not reuse the interval for recursively scheduled actions with a different delay', () => {
-    const sandbox = sinon.sandbox.create();
-    const fakeTimer = sandbox.useFakeTimers();
-    // callThrough is missing from the declarations installed by the typings tool in stable
-    const stubSetInterval = (<any> sinon.stub(global, 'setInterval')).callThrough();
-    function dispatch(state: any): void {
-      state.index += 1;
-      state.period -= 1;
-      if (state.index < 3) {
-        (<any> this).schedule(state, state.period);
-      }
-    }
-    const period = 50;
-    const state = { index: 0, period };
-    asap.schedule(dispatch, period, state);
-    expect(state).to.have.property('index', 0);
-    expect(stubSetInterval).to.have.property('callCount', 1);
-    fakeTimer.tick(period);
-    expect(state).to.have.property('index', 1);
-    expect(stubSetInterval).to.have.property('callCount', 2);
-    fakeTimer.tick(period);
-    expect(state).to.have.property('index', 2);
-    expect(stubSetInterval).to.have.property('callCount', 3);
-    stubSetInterval.restore();
-    sandbox.restore();
-  });
-
   it('should schedule an action to happen later', (done: MochaDone) => {
     let actionHappened = false;
     asap.schedule(() => {

diff --git a/src/scheduler/AsyncAction.ts b/src/scheduler/AsyncAction.ts
@@ -29,6 +29,10 @@ export class AsyncAction<T> extends Action<T> {
     // Always replace the current state with the new state.
     this.state = state;
 
+    // Set the pending flag indicating that this action has been scheduled, or
+    // has recursively rescheduled itself.
+    this.pending = true;
+
     const id = this.id;
     const scheduler = this.scheduler;
 
@@ -57,10 +61,6 @@ export class AsyncAction<T> extends Action<T> {
       this.id = this.recycleAsyncId(scheduler, id, delay);
     }
 
-    // Set the pending flag indicating that this action has been scheduled, or
-    // has recursively rescheduled itself.
-    this.pending = true;
-
     this.delay = delay;
     // If this action has already an async Id, don't request a new one.
     this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);