From ec705399e63b49417d0b250984cc20b5817a5254 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Fri, 1 Mar 2019 12:03:37 +0100 Subject: [PATCH] Remove uneeded methods from async-spec-helpers modules --- .../about/spec/helpers/async-spec-helpers.js | 39 ------- .../spec/async-spec-helpers.js | 80 ------------- .../spec/async-spec-helpers.js | 41 ------- packages/link/spec/async-spec-helpers.js | 106 ------------------ spec/async-spec-helpers.js | 72 ------------ 5 files changed, 338 deletions(-) delete mode 100644 packages/grammar-selector/spec/async-spec-helpers.js delete mode 100644 packages/link/spec/async-spec-helpers.js diff --git a/packages/about/spec/helpers/async-spec-helpers.js b/packages/about/spec/helpers/async-spec-helpers.js index 6d1d459636f..58e17d323af 100644 --- a/packages/about/spec/helpers/async-spec-helpers.js +++ b/packages/about/spec/helpers/async-spec-helpers.js @@ -3,35 +3,6 @@ const { now } = Date const { setTimeout } = global -export function beforeEach (fn) { - global.beforeEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -export function afterEach (fn) { - global.afterEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -;['it', 'fit', 'ffit', 'fffit'].forEach(function (name) { - module.exports[name] = function (description, fn) { - global[name](description, function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) - } -}) - export async function conditionPromise (condition) { const startTime = now() @@ -53,13 +24,3 @@ export function timeoutPromise (timeout) { setTimeout(resolve, timeout) }) } - -function waitsForPromise (fn) { - const promise = fn() - global.waitsFor('spec promise to resolve', function (done) { - promise.then(done, function (error) { - jasmine.getEnv().currentSpec.fail(error) - done() - }) - }) -} diff --git a/packages/dev-live-reload/spec/async-spec-helpers.js b/packages/dev-live-reload/spec/async-spec-helpers.js index 5a233973e83..e782059893a 100644 --- a/packages/dev-live-reload/spec/async-spec-helpers.js +++ b/packages/dev-live-reload/spec/async-spec-helpers.js @@ -1,39 +1,5 @@ /** @babel */ -export function beforeEach (fn) { - global.beforeEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -export function afterEach (fn) { - global.afterEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -;['it', 'fit', 'ffit', 'fffit'].forEach(function (name) { - module.exports[name] = function (description, fn) { - if (fn === undefined) { - global[name](description) - return - } - - global[name](description, function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) - } -}) - export async function conditionPromise ( condition, description = 'anonymous condition' @@ -58,49 +24,3 @@ export function timeoutPromise (timeout) { global.setTimeout(resolve, timeout) }) } - -function waitsForPromise (fn) { - const promise = fn() - global.waitsFor('spec promise to resolve', function (done) { - promise.then(done, function (error) { - jasmine.getEnv().currentSpec.fail(error) - done() - }) - }) -} - -export function emitterEventPromise (emitter, event, timeout = 15000) { - return new Promise((resolve, reject) => { - const timeoutHandle = setTimeout(() => { - reject(new Error(`Timed out waiting for '${event}' event`)) - }, timeout) - emitter.once(event, () => { - clearTimeout(timeoutHandle) - resolve() - }) - }) -} - -export function promisify (original) { - return function (...args) { - return new Promise((resolve, reject) => { - args.push((err, ...results) => { - if (err) { - reject(err) - } else { - resolve(...results) - } - }) - - return original(...args) - }) - } -} - -export function promisifySome (obj, fnNames) { - const result = {} - for (const fnName of fnNames) { - result[fnName] = promisify(obj[fnName]) - } - return result -} diff --git a/packages/grammar-selector/spec/async-spec-helpers.js b/packages/grammar-selector/spec/async-spec-helpers.js deleted file mode 100644 index 5fe94e8593d..00000000000 --- a/packages/grammar-selector/spec/async-spec-helpers.js +++ /dev/null @@ -1,41 +0,0 @@ -exports.beforeEach = function beforeEach (fn) { - global.beforeEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise('beforeEach promise', result) - } - }) -} - -exports.afterEach = function afterEach (fn) { - global.afterEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise('afterEach promise', result) - } - }) -} -;['it', 'fit', 'ffit', 'fffit'].forEach(function (name) { - exports[name] = function (description, fn) { - if (fn === undefined) { - global[name](description) - return - } - - global[name](description, function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise('test promise', result) - } - }) - } -}) - -function waitsForPromise (message, promise) { - global.waitsFor(message, done => { - promise.then(done, error => { - jasmine.getEnv().currentSpec.fail(error) - done() - }) - }) -} diff --git a/packages/link/spec/async-spec-helpers.js b/packages/link/spec/async-spec-helpers.js deleted file mode 100644 index 5a233973e83..00000000000 --- a/packages/link/spec/async-spec-helpers.js +++ /dev/null @@ -1,106 +0,0 @@ -/** @babel */ - -export function beforeEach (fn) { - global.beforeEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -export function afterEach (fn) { - global.afterEach(function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -;['it', 'fit', 'ffit', 'fffit'].forEach(function (name) { - module.exports[name] = function (description, fn) { - if (fn === undefined) { - global[name](description) - return - } - - global[name](description, function () { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) - } -}) - -export async function conditionPromise ( - condition, - description = 'anonymous condition' -) { - const startTime = Date.now() - - while (true) { - await timeoutPromise(100) - - if (await condition()) { - return - } - - if (Date.now() - startTime > 5000) { - throw new Error('Timed out waiting on ' + description) - } - } -} - -export function timeoutPromise (timeout) { - return new Promise(function (resolve) { - global.setTimeout(resolve, timeout) - }) -} - -function waitsForPromise (fn) { - const promise = fn() - global.waitsFor('spec promise to resolve', function (done) { - promise.then(done, function (error) { - jasmine.getEnv().currentSpec.fail(error) - done() - }) - }) -} - -export function emitterEventPromise (emitter, event, timeout = 15000) { - return new Promise((resolve, reject) => { - const timeoutHandle = setTimeout(() => { - reject(new Error(`Timed out waiting for '${event}' event`)) - }, timeout) - emitter.once(event, () => { - clearTimeout(timeoutHandle) - resolve() - }) - }) -} - -export function promisify (original) { - return function (...args) { - return new Promise((resolve, reject) => { - args.push((err, ...results) => { - if (err) { - reject(err) - } else { - resolve(...results) - } - }) - - return original(...args) - }) - } -} - -export function promisifySome (obj, fnNames) { - const result = {} - for (const fnName of fnNames) { - result[fnName] = promisify(obj[fnName]) - } - return result -} diff --git a/spec/async-spec-helpers.js b/spec/async-spec-helpers.js index c6a5920a5d5..840a04b2afa 100644 --- a/spec/async-spec-helpers.js +++ b/spec/async-spec-helpers.js @@ -1,37 +1,3 @@ -function beforeEach (fn) { - global.beforeEach(() => { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -function afterEach (fn) { - global.afterEach(() => { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) -} - -;['it', 'fit', 'ffit', 'fffit'].forEach(name => { - exports[name] = (description, fn) => { - if (fn === undefined) { - global[name](description) - return - } - - global[name](description, () => { - const result = fn() - if (result instanceof Promise) { - waitsForPromise(() => result) - } - }) - } -}) - async function conditionPromise ( condition, description = 'anonymous condition' @@ -57,16 +23,6 @@ function timeoutPromise (timeout) { }) } -function waitsForPromise (fn) { - const promise = fn() - global.waitsFor('spec promise to resolve', done => { - promise.then(done, error => { - jasmine.getEnv().currentSpec.fail(error) - done() - }) - }) -} - function emitterEventPromise (emitter, event, timeout = 15000) { return new Promise((resolve, reject) => { const timeoutHandle = setTimeout(() => { @@ -79,34 +35,6 @@ function emitterEventPromise (emitter, event, timeout = 15000) { }) } -function promisify (original) { - return function (...args) { - return new Promise((resolve, reject) => { - args.push((err, ...results) => { - if (err) { - reject(err) - } else { - resolve(...results) - } - }) - - return original(...args) - }) - } -} - -function promisifySome (obj, fnNames) { - const result = {} - for (const fnName of fnNames) { - result[fnName] = promisify(obj[fnName]) - } - return result -} - -exports.afterEach = afterEach -exports.beforeEach = beforeEach exports.conditionPromise = conditionPromise exports.emitterEventPromise = emitterEventPromise -exports.promisify = promisify -exports.promisifySome = promisifySome exports.timeoutPromise = timeoutPromise