Skip to content

Commit ca399b2

Browse files
SparshithNRSparshithNR
committed
linkedin#52: Changed name of constant and value to avoid confusion
1 parent 8398fff commit ca399b2

7 files changed

+25
-25
lines changed

‎src/metal/engine.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
import { EngineInterface } from './interfaces';
1313
import W from './window-proxy';
1414

15-
const NUM_SKIPPED_FRAMES = 4;
15+
const NUM_SKIPPED_FRAMES = 3;
1616

1717
export class Engine implements EngineInterface {
1818
private reads: Array<Function> = [];
1919
private work: Array<Function> = [];
2020
private running: Boolean = false;
21-
private skipCounter: number = NUM_SKIPPED_FRAMES;
21+
private skipCounter: number = NUM_SKIPPED_FRAMES + 1;
2222
scheduleRead(callback: Function) {
2323
this.reads.unshift(callback);
2424
this.run();
@@ -31,7 +31,7 @@ export class Engine implements EngineInterface {
3131
if (!this.running) {
3232
this.running = true;
3333
W.rAF(() => {
34-
if (this.skipCounter > NUM_SKIPPED_FRAMES - 1) {
34+
if (this.skipCounter > NUM_SKIPPED_FRAMES) {
3535
this.skipCounter = 0;
3636
for (let i = 0, rlen = this.reads.length; i < rlen; i++) {
3737
this.reads.pop()();

‎test/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const constants = {
55
SMALL: 5
66
},
77
ITEM_TO_OBSERVE: 5,
8-
SKIP_CYCLE: 3
8+
NUM_SKIPPED_FRAMES: 3
99
};
1010

1111

‎test/headless/specs/utilities.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313
import constants from './../../constants.js';
1414

15-
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, SKIP_CYCLE } = constants;
15+
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, NUM_SKIPPED_FRAMES } = constants;
1616

1717
testModule('elementSatisfiesRatio', class extends TestClass {
1818
['@test passes true into callback when ratio satisfied']() {
@@ -79,11 +79,11 @@ testModule('Eventing', class extends TestClass {
7979
});
8080
})
8181
.scrollTo(10)
82-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
82+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
8383
.scrollTo(20)
84-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
84+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
8585
.getExecution()
86-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
86+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
8787
.evaluate(function() {
8888
return window.STATE.scrollEvents;
8989
}).then(function(result) {

‎test/headless/specs/watcher/exposed-event.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313
import constants from './../../../constants.js';
1414

15-
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, SKIP_CYCLE } = constants;
15+
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, NUM_SKIPPED_FRAMES } = constants;
1616

1717
testModule('Watcher Exposed Event', class extends WatcherTestClass {
1818
['@test should not fire if item is not exposed']() {
@@ -40,13 +40,13 @@ testModule('Watcher Exposed Event', class extends WatcherTestClass {
4040
['@test should fire twice if moved in, out, and then back in viewport']() {
4141
return this.context.scrollTo(100)
4242
.scrollTo(140)
43-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
43+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
4444
.scrollTo(120)
45-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
45+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
4646
.scrollTo(0)
47-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
47+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
4848
.scrollTo(50)
49-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
49+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
5050
.assertEvent(ITEM_TO_OBSERVE, 'exposed', 2)
5151
.done();
5252
}

‎test/headless/specs/watcher/impression-complete-event.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313
import constants from './../../../constants.js';
1414

15-
const { time: { IMPRESSION_THRESHOLD, RAF_THRESHOLD }, ITEM_TO_OBSERVE, SKIP_CYCLE } = constants;
15+
const { time: { IMPRESSION_THRESHOLD, RAF_THRESHOLD }, ITEM_TO_OBSERVE, NUM_SKIPPED_FRAMES } = constants;
1616

1717
testModule('Impression Complete event', class extends WatcherTestClass {
1818
['@test should not fire if item is not exposed']() {
@@ -56,7 +56,7 @@ testModule('Impression Complete event', class extends WatcherTestClass {
5656
return this.context.scrollTo(200)
5757
.wait(IMPRESSION_THRESHOLD + RAF_THRESHOLD * 4)
5858
.unwatch(ITEM_TO_OBSERVE)
59-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
59+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
6060
.assertOnce(ITEM_TO_OBSERVE, 'impression-complete')
6161
.done();
6262
}
@@ -65,9 +65,9 @@ testModule('Impression Complete event', class extends WatcherTestClass {
6565
return this.context.scrollTo(150)
6666
.wait(IMPRESSION_THRESHOLD * 5)
6767
.scrollTo(0)
68-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
68+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
6969
.assert(function(e) {
70-
return e.meta.duration >= ((IMPRESSION_THRESHOLD * 5) - (RAF_THRESHOLD * SKIP_CYCLE)) && e.meta.duration <= ((IMPRESSION_THRESHOLD * 5) + (RAF_THRESHOLD * SKIP_CYCLE)) && e.id === 5 && e.e === 'impression-complete';
70+
return e.meta.duration >= ((IMPRESSION_THRESHOLD * 5) - (RAF_THRESHOLD * NUM_SKIPPED_FRAMES)) && e.meta.duration <= ((IMPRESSION_THRESHOLD * 5) + (RAF_THRESHOLD * NUM_SKIPPED_FRAMES)) && e.id === 5 && e.e === 'impression-complete';
7171
}, 1)
7272
.done();
7373
}
@@ -91,7 +91,7 @@ testModule('Impression Complete event', class extends WatcherTestClass {
9191
.scrollTo(250)
9292
.wait(IMPRESSION_THRESHOLD + RAF_THRESHOLD * 4)
9393
.scrollTo(0)
94-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
94+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
9595
.assertEvent(ITEM_TO_OBSERVE, 'impression-complete', 2)
9696
.done();
9797
}

‎test/headless/specs/watcher/impression-event.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import {
1212

1313
import constants from './../../../constants.js';
1414

15-
const { time: { IMPRESSION_THRESHOLD, RAF_THRESHOLD, SMALL }, ITEM_TO_OBSERVE, SKIP_CYCLE } = constants;
15+
const { time: { IMPRESSION_THRESHOLD, RAF_THRESHOLD, SMALL }, ITEM_TO_OBSERVE, NUM_SKIPPED_FRAMES } = constants;
1616

1717
testModule('Impression event', class extends WatcherTestClass {
1818
['@test should not fire if item is exposed but not impressed']() {
1919
return this.context.scrollTo(50)
20-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
20+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
2121
.assertOnce(ITEM_TO_OBSERVE, 'exposed')
2222
.assertNever(ITEM_TO_OBSERVE, 'impressed')
2323
.assertOnce(ITEM_TO_OBSERVE, 'exposed')
@@ -65,7 +65,7 @@ testModule('Impression event', class extends WatcherTestClass {
6565
.wait(RAF_THRESHOLD)
6666
.assertNever(ITEM_TO_OBSERVE, 'impressed')
6767
.scrollTo(200)
68-
.wait(IMPRESSION_THRESHOLD + RAF_THRESHOLD * SKIP_CYCLE)
68+
.wait(IMPRESSION_THRESHOLD + RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
6969
.assertOnce(ITEM_TO_OBSERVE, 'impressed')
7070
.done();
7171
}

‎test/headless/specs/watcher/visible-event.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import {
1212

1313
import constants from './../../../constants.js';
1414

15-
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, SKIP_CYCLE } = constants;
15+
const { time: { RAF_THRESHOLD }, ITEM_TO_OBSERVE, NUM_SKIPPED_FRAMES } = constants;
1616

1717
testModule('Visible event', class extends WatcherTestClass {
1818
['@test should not fire if item is exposed but not visible']() {
1919
return this.context.scrollTo(50)
20-
.wait(RAF_THRESHOLD * 2)
20+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
2121
.assertOnce(ITEM_TO_OBSERVE, 'exposed')
2222
.assertNever(ITEM_TO_OBSERVE, 'visible')
2323
.done();
@@ -36,7 +36,7 @@ testModule('Visible event', class extends WatcherTestClass {
3636
.scrollTo(300)
3737
.wait(RAF_THRESHOLD * 5)
3838
.scrollTo(250)
39-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
39+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
4040
.assertOnce(ITEM_TO_OBSERVE, 'visible')
4141
.done();
4242
}
@@ -51,7 +51,7 @@ testModule('Visible event', class extends WatcherTestClass {
5151
.scrollTo(10)
5252
.wait(RAF_THRESHOLD * 5)
5353
.scrollTo(200)
54-
.wait(RAF_THRESHOLD * SKIP_CYCLE)
54+
.wait(RAF_THRESHOLD * NUM_SKIPPED_FRAMES)
5555
.assertEvent(ITEM_TO_OBSERVE, 'visible', 2)
5656
.done();
5757
}

0 commit comments

Comments
 (0)