From 4c787b2cd92ec6fd548b52c4e22d8e0e0d0b85d3 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Mon, 19 Aug 2019 14:24:36 -0400 Subject: [PATCH] Use closure actions for tests (#291) --- tests/helpers/test-scenarios.js | 9 +- tests/integration/scroll-test.js | 150 +++++++++++++++++-------------- 2 files changed, 90 insertions(+), 69 deletions(-) diff --git a/tests/helpers/test-scenarios.js b/tests/helpers/test-scenarios.js index 2d4e989d..d4ef2d38 100644 --- a/tests/helpers/test-scenarios.js +++ b/tests/helpers/test-scenarios.js @@ -11,7 +11,7 @@ const { PromiseArray } = DS; -export function testScenarios(description, scenarios, template, testFn, preRenderTestFn) { +export function testScenarios(description, scenarios, template, testFn, preRenderTestFn, setValuesBeforeRender) { for (const scenarioName in scenarios) { const scenario = scenarios[scenarioName]; @@ -21,11 +21,16 @@ export function testScenarios(description, scenarios, template, testFn, preRende this.set(key, value); } + // An extra function to set values before render. Mostly to set the closure actions + if (setValuesBeforeRender) { + await setValuesBeforeRender.call(this, assert); + } + await this.render(template); if (preRenderTestFn) { await preRenderTestFn.call(this, assert); - } else { + } else if(testFn) { await wait(); await testFn.call(this, assert); } diff --git a/tests/integration/scroll-test.js b/tests/integration/scroll-test.js index 27c7d67d..7a96d941 100644 --- a/tests/integration/scroll-test.js +++ b/tests/integration/scroll-test.js @@ -52,15 +52,19 @@ testScenarios( testScenarios( 'Sends the firstVisibleChanged action', - scenariosFor(getNumbers(0, 50), { firstVisibleChanged: 'firstVisibleChanged' }), + scenariosFor(getNumbers(0, 50)), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 200); + }, async function(assert) { const called = assert.async(2); let count = 0; - this.on('firstVisibleChanged', (item, index) => { + this.set('firstVisibleChanged', (item, index) => { if (count === 0) { assert.equal(index, 0, 'the first visible item is correct'); } else { @@ -69,23 +73,24 @@ testScenarios( count++; called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 200); } ); testScenarios( 'Sends the lastVisibleChanged action', - scenariosFor(getNumbers(0, 50), { lastVisibleChanged: 'lastVisibleChanged' }), + scenariosFor(getNumbers(0, 50)), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 200); + }, async function(assert) { const called = assert.async(2); let count = 0; - this.on('lastVisibleChanged', (item, index) => { + this.set('lastVisibleChanged', (item, index) => { if (count === 0) { assert.equal(index, 9, 'the first last visible changed is correct'); } else { @@ -94,22 +99,20 @@ testScenarios( count++; called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 200); } ); testScenarios( 'Sends the firstReached action', - scenariosFor(getNumbers(0, 50), { firstReached: 'firstReached' }), + scenariosFor(getNumbers(0, 50)), standardTemplate, false, // Run test function before render + false, async function(assert) { const called = assert.async(1); - this.on('firstReached', (item, index) => { + this.set('firstReached', (item, index) => { assert.equal(index, 0, 'the firstReached item is correct'); called(); }); @@ -120,34 +123,36 @@ testScenarios( testScenarios( 'Sends the lastReached action', - scenariosFor(getNumbers(0, 50), { lastReached: 'lastReached' }), + scenariosFor(getNumbers(0, 50)), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + }, async function(assert) { const called = assert.async(1); - this.on('lastReached', (item, index) => { + this.set('lastReached', (item, index) => { assert.equal(index, 49, 'the lastReached item is correct'); called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); } ); testScenarios( 'Sends the firstReached action after prepend', - standardScenariosFor(getNumbers(0, 20), { firstReached: 'firstReached', bufferSize: 5 }), + standardScenariosFor(getNumbers(0, 20), { bufferSize: 5 }), standardTemplate, false, // Run test function before render + false, function(assert) { assert.expect(0); const called = assert.async(2); - this.on('firstReached', ({ number }) => { + this.set('firstReached', ({ number }) => { prepend(this, getNumbers(number - 3, 5)); called(); }); @@ -156,15 +161,16 @@ testScenarios( testScenarios( 'Sends the lastReached action after append', - standardScenariosFor(getNumbers(0, 5), { lastReached: 'lastReached', bufferSize: 5 }), + standardScenariosFor(getNumbers(0, 5), { bufferSize: 5 }), standardTemplate, false, // Run test function before render + false, async function(assert) { assert.expect(0); const called = assert.async(2); - this.on('lastReached', ({ number }) => { + this.set('lastReached', ({ number }) => { append(this, getNumbers(number + 1, 6)); called(); }); @@ -175,21 +181,22 @@ testScenarios( testScenarios( 'Does not send the firstReached action twice for the same item', - scenariosFor(getNumbers(0, 50), { firstReached: 'firstReached' }), + scenariosFor(getNumbers(0, 50)), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + await scrollTo('.scrollable', 0, 0); + }, async function(assert) { assert.expect(0); const called = assert.async(1); - this.on('firstReached', () => { + this.set('firstReached', () => { called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); - await scrollTo('.scrollable', 0, 0); } ); @@ -199,32 +206,37 @@ testScenarios( standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + await scrollTo('.scrollable', 0, 0); + await scrollTo('.scrollable', 0, 800); + }, async function(assert) { assert.expect(0); const called = assert.async(1); - this.on('lastReached', () => { + this.set('lastReached', () => { called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); - await scrollTo('.scrollable', 0, 0); - await scrollTo('.scrollable', 0, 800); } ); testScenarios( 'Sends the firstVisibleChanged action with renderAll set to true', - scenariosFor(getNumbers(0, 50), { firstVisibleChanged: 'firstVisibleChanged', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 200); + }, async function(assert) { const called = assert.async(2); let count = 0; - this.on('firstVisibleChanged', (item, index) => { + this.set('firstVisibleChanged', (item, index) => { if (count === 0) { assert.equal(index, 0, 'the first visible item is correct'); } else { @@ -233,23 +245,24 @@ testScenarios( count++; called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 200); } ); testScenarios( 'Sends the lastVisibleChanged action with renderAll set to true', - scenariosFor(getNumbers(0, 50), { lastVisibleChanged: 'lastVisibleChanged', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 200); + }, async function(assert) { const called = assert.async(2); let count = 0; - this.on('lastVisibleChanged', (item, index) => { + this.set('lastVisibleChanged', (item, index) => { if (count === 0) { assert.equal(index, 9, 'the first last visible changed is correct'); } else { @@ -258,22 +271,20 @@ testScenarios( count++; called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 200); } ); testScenarios( 'Sends the firstReached action with renderAll set to true', - scenariosFor(getNumbers(0, 50), { firstReached: 'firstReached', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + false, async function(assert) { const called = assert.async(1); - this.on('firstReached', (item, index) => { + this.set('firstReached', (item, index) => { assert.equal(index, 0, 'the firstReached item is correct'); called(); }); @@ -284,34 +295,36 @@ testScenarios( testScenarios( 'Sends the lastReached action with renderAll set to true', - scenariosFor(getNumbers(0, 50), { lastReached: 'lastReached', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + }, async function(assert) { const called = assert.async(1); - this.on('lastReached', (item, index) => { + this.set('lastReached', (item, index) => { assert.equal(index, 49, 'the lastReached item is correct'); called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); } ); testScenarios( 'Sends the firstReached action after prepend with renderAll set to true', - standardScenariosFor(getNumbers(0, 20), { firstReached: 'firstReached', bufferSize: 5, renderAll: true }), + standardScenariosFor(getNumbers(0, 20), { bufferSize: 5, renderAll: true }), standardTemplate, false, // Run test function before render + false, function(assert) { assert.expect(0); const called = assert.async(2); - this.on('firstReached', ({ number }) => { + this.set('firstReached', ({ number }) => { prepend(this, getNumbers(number - 3, 5)); called(); }); @@ -320,15 +333,16 @@ testScenarios( testScenarios( 'Sends the lastReached action after append with renderAll set to true', - standardScenariosFor(getNumbers(0, 5), { lastReached: 'lastReached', bufferSize: 5, renderAll: true }), + standardScenariosFor(getNumbers(0, 5), { bufferSize: 5, renderAll: true }), standardTemplate, false, // Run test function before render + false, async function(assert) { assert.expect(0); const called = assert.async(2); - this.on('lastReached', ({ number }) => { + this.set('lastReached', ({ number }) => { append(this, getNumbers(number + 1, 6)); called(); }); @@ -339,42 +353,44 @@ testScenarios( testScenarios( 'Does not send the firstReached action twice for the same item with renderAll set to true', - scenariosFor(getNumbers(0, 50), { firstReached: 'firstReached', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + await scrollTo('.scrollable', 0, 0); + }, async function(assert) { assert.expect(0); const called = assert.async(1); - this.on('firstReached', () => { + this.set('firstReached', () => { called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); - await scrollTo('.scrollable', 0, 0); } ); testScenarios( 'Does not send the lastReached action twice for the same item with renderAll set to true', - scenariosFor(getNumbers(0, 50), { lastReached: 'lastReached', renderAll: true }), + scenariosFor(getNumbers(0, 50), { renderAll: true }), standardTemplate, false, // Run test function before render + async function() { + await wait(); + await scrollTo('.scrollable', 0, 800); + await scrollTo('.scrollable', 0, 0); + await scrollTo('.scrollable', 0, 800); + }, async function(assert) { assert.expect(0); const called = assert.async(1); - this.on('lastReached', () => { + this.set('lastReached', () => { called(); }); - - await wait(); - await scrollTo('.scrollable', 0, 800); - await scrollTo('.scrollable', 0, 0); - await scrollTo('.scrollable', 0, 800); } );