From a93808d1a85ee723f5f16f0d3c39e47a0f5fbfff Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Thu, 28 Feb 2019 20:39:21 +0100 Subject: [PATCH 1/3] Always use global it, beforeEach and afterEach methods --- packages/about/spec/about-spec.js | 2 -- packages/about/spec/about-status-bar-spec.js | 7 +------ packages/about/spec/update-view-spec.js | 1 - packages/dev-live-reload/spec/dev-live-reload-spec.js | 2 -- packages/dev-live-reload/spec/ui-watcher-spec.js | 7 +------ packages/grammar-selector/spec/grammar-selector-spec.js | 1 - packages/link/spec/link-spec.js | 2 -- spec/application-delegate-spec.js | 1 - spec/atom-environment-spec.js | 7 +------ spec/atom-paths-spec.js | 1 - spec/command-installer-spec.js | 5 ----- spec/command-registry-spec.js | 1 - spec/config-file-spec.js | 6 ------ spec/dock-spec.js | 1 - spec/git-repository-provider-spec.js | 1 - spec/git-repository-spec.js | 1 - spec/grammar-registry-spec.js | 2 -- spec/history-manager-spec.js | 2 -- spec/native-watcher-registry-spec.js | 2 -- spec/package-manager-spec.js | 1 - spec/package-transpilation-registry-spec.js | 2 -- spec/pane-container-spec.js | 5 ----- spec/pane-spec.js | 7 +------ spec/path-watcher-spec.js | 2 +- spec/reopen-project-menu-manager-spec.js | 1 - spec/state-store-spec.js | 1 - spec/text-editor-component-spec.js | 8 +------- spec/text-editor-element-spec.js | 5 ----- spec/text-editor-registry-spec.js | 1 - spec/text-editor-spec.js | 7 ------- spec/text-mate-language-mode-spec.js | 1 - spec/tree-sitter-language-mode-spec.js | 2 -- spec/update-process-env-spec.js | 2 -- spec/uri-handler-registry-spec.js | 2 -- spec/workspace-center-spec.js | 2 -- spec/workspace-element-spec.js | 1 - spec/workspace-spec.js | 7 +------ 37 files changed, 7 insertions(+), 102 deletions(-) diff --git a/packages/about/spec/about-spec.js b/packages/about/spec/about-spec.js index f3352e806..21aa4c5eb 100644 --- a/packages/about/spec/about-spec.js +++ b/packages/about/spec/about-spec.js @@ -1,5 +1,3 @@ -const { it, beforeEach } = require('./helpers/async-spec-helpers') - describe('About', () => { let workspaceElement diff --git a/packages/about/spec/about-status-bar-spec.js b/packages/about/spec/about-status-bar-spec.js index 4190674df..a67c0511c 100644 --- a/packages/about/spec/about-status-bar-spec.js +++ b/packages/about/spec/about-status-bar-spec.js @@ -1,9 +1,4 @@ -const { - it, - beforeEach, - afterEach, - conditionPromise -} = require('./helpers/async-spec-helpers') +const { conditionPromise } = require('./helpers/async-spec-helpers') const MockUpdater = require('./mocks/updater') describe('the status bar', () => { diff --git a/packages/about/spec/update-view-spec.js b/packages/about/spec/update-view-spec.js index 2f593b5bd..8e6587b59 100644 --- a/packages/about/spec/update-view-spec.js +++ b/packages/about/spec/update-view-spec.js @@ -1,5 +1,4 @@ const { shell } = require('electron') -const { it, beforeEach, afterEach } = require('./helpers/async-spec-helpers') const main = require('../lib/main') const AboutView = require('../lib/components/about-view') const UpdateView = require('../lib/components/update-view') diff --git a/packages/dev-live-reload/spec/dev-live-reload-spec.js b/packages/dev-live-reload/spec/dev-live-reload-spec.js index 99b7fe261..7351e0f99 100644 --- a/packages/dev-live-reload/spec/dev-live-reload-spec.js +++ b/packages/dev-live-reload/spec/dev-live-reload-spec.js @@ -1,5 +1,3 @@ -const { it, fit, ffit, afterEach, beforeEach } = require('./async-spec-helpers') // eslint-disable-line no-unused-vars - describe('Dev Live Reload', () => { describe('package activation', () => { let [pack, mainModule] = [] diff --git a/packages/dev-live-reload/spec/ui-watcher-spec.js b/packages/dev-live-reload/spec/ui-watcher-spec.js index ffce8034c..0027dd5c3 100644 --- a/packages/dev-live-reload/spec/ui-watcher-spec.js +++ b/packages/dev-live-reload/spec/ui-watcher-spec.js @@ -2,12 +2,7 @@ const path = require('path') const UIWatcher = require('../lib/ui-watcher') -const { - it, - afterEach, - beforeEach, - conditionPromise -} = require('./async-spec-helpers') +const { conditionPromise } = require('./async-spec-helpers') describe('UIWatcher', () => { let uiWatcher = null diff --git a/packages/grammar-selector/spec/grammar-selector-spec.js b/packages/grammar-selector/spec/grammar-selector-spec.js index 1c27d95a5..400fd6241 100644 --- a/packages/grammar-selector/spec/grammar-selector-spec.js +++ b/packages/grammar-selector/spec/grammar-selector-spec.js @@ -1,6 +1,5 @@ const path = require('path') const SelectListView = require('atom-select-list') -const { it, fit, ffit, beforeEach, afterEach } = require('./async-spec-helpers') // eslint-disable-line describe('GrammarSelector', () => { let [editor, textGrammar, jsGrammar] = [] diff --git a/packages/link/spec/link-spec.js b/packages/link/spec/link-spec.js index 0c0b817a2..e31d3f6ca 100644 --- a/packages/link/spec/link-spec.js +++ b/packages/link/spec/link-spec.js @@ -1,7 +1,5 @@ const { shell } = require('electron') -const { it, fit, ffit, afterEach, beforeEach } = require('./async-spec-helpers') // eslint-disable-line no-unused-vars - describe('link package', () => { beforeEach(async () => { await atom.packages.activatePackage('language-gfm') diff --git a/spec/application-delegate-spec.js b/spec/application-delegate-spec.js index abe86d92d..044e257b5 100644 --- a/spec/application-delegate-spec.js +++ b/spec/application-delegate-spec.js @@ -1,6 +1,5 @@ /** @babel */ -import { it } from './async-spec-helpers' import ApplicationDelegate from '../src/application-delegate' describe('ApplicationDelegate', function () { diff --git a/spec/atom-environment-spec.js b/spec/atom-environment-spec.js index 6b83035d9..537617d56 100644 --- a/spec/atom-environment-spec.js +++ b/spec/atom-environment-spec.js @@ -1,9 +1,4 @@ -const { - it, - beforeEach, - afterEach, - conditionPromise -} = require('./async-spec-helpers') +const { conditionPromise } = require('./async-spec-helpers') const fs = require('fs') const path = require('path') const temp = require('temp').track() diff --git a/spec/atom-paths-spec.js b/spec/atom-paths-spec.js index 0b2a8cdf9..cc4bb769b 100644 --- a/spec/atom-paths-spec.js +++ b/spec/atom-paths-spec.js @@ -1,6 +1,5 @@ /** @babel */ -import { it, beforeEach, afterEach } from './async-spec-helpers' import { app } from 'remote' import atomPaths from '../src/atom-paths' import fs from 'fs-plus' diff --git a/spec/command-installer-spec.js b/spec/command-installer-spec.js index fb114928f..1cf6af5c2 100644 --- a/spec/command-installer-spec.js +++ b/spec/command-installer-spec.js @@ -1,11 +1,6 @@ const path = require('path') const fs = require('fs-plus') const temp = require('temp').track() -const { - it, - beforeEach, - afterEach -} = require('./async-spec-helpers') const CommandInstaller = require('../src/command-installer') describe('CommandInstaller on #darwin', () => { diff --git a/spec/command-registry-spec.js b/spec/command-registry-spec.js index f49ebe942..597a72c35 100644 --- a/spec/command-registry-spec.js +++ b/spec/command-registry-spec.js @@ -1,6 +1,5 @@ const CommandRegistry = require('../src/command-registry') const _ = require('underscore-plus') -const { it, beforeEach, afterEach } = require('./async-spec-helpers') describe('CommandRegistry', () => { let registry, parent, child, grandchild diff --git a/spec/config-file-spec.js b/spec/config-file-spec.js index 1350853f5..d5ae98170 100644 --- a/spec/config-file-spec.js +++ b/spec/config-file-spec.js @@ -1,9 +1,3 @@ -const { - it, - - beforeEach, - afterEach -} = require('./async-spec-helpers') const fs = require('fs-plus') const path = require('path') const temp = require('temp').track() diff --git a/spec/dock-spec.js b/spec/dock-spec.js index d7bd5b1cb..8d2a0907c 100644 --- a/spec/dock-spec.js +++ b/spec/dock-spec.js @@ -2,7 +2,6 @@ const Grim = require('grim') -import { it } from './async-spec-helpers' import etch from 'etch' const getNextUpdatePromise = () => etch.getScheduler().nextUpdatePromise diff --git a/spec/git-repository-provider-spec.js b/spec/git-repository-provider-spec.js index b0ccec89c..5a4c4ba07 100644 --- a/spec/git-repository-provider-spec.js +++ b/spec/git-repository-provider-spec.js @@ -4,7 +4,6 @@ const temp = require('temp').track() const { Directory } = require('pathwatcher') const GitRepository = require('../src/git-repository') const GitRepositoryProvider = require('../src/git-repository-provider') -const { it, beforeEach } = require('./async-spec-helpers') describe('GitRepositoryProvider', () => { let provider diff --git a/spec/git-repository-spec.js b/spec/git-repository-spec.js index ade09da88..ed5699843 100644 --- a/spec/git-repository-spec.js +++ b/spec/git-repository-spec.js @@ -1,4 +1,3 @@ -const { it, beforeEach, afterEach } = require('./async-spec-helpers') const path = require('path') const fs = require('fs-plus') const temp = require('temp').track() diff --git a/spec/grammar-registry-spec.js b/spec/grammar-registry-spec.js index 729d52563..34cea04b5 100644 --- a/spec/grammar-registry-spec.js +++ b/spec/grammar-registry-spec.js @@ -1,5 +1,3 @@ -const { it, beforeEach, afterEach } = require('./async-spec-helpers') - const dedent = require('dedent') const path = require('path') const fs = require('fs-plus') diff --git a/spec/history-manager-spec.js b/spec/history-manager-spec.js index 5f7366118..bdf670425 100644 --- a/spec/history-manager-spec.js +++ b/spec/history-manager-spec.js @@ -1,5 +1,3 @@ -const { it, beforeEach, afterEach } = require('./async-spec-helpers') - const { HistoryManager, HistoryProject } = require('../src/history-manager') const StateStore = require('../src/state-store') diff --git a/spec/native-watcher-registry-spec.js b/spec/native-watcher-registry-spec.js index c83028c73..89f08d79e 100644 --- a/spec/native-watcher-registry-spec.js +++ b/spec/native-watcher-registry-spec.js @@ -1,7 +1,5 @@ /** @babel */ -import { it, beforeEach } from './async-spec-helpers' - import path from 'path' import { Emitter } from 'event-kit' diff --git a/spec/package-manager-spec.js b/spec/package-manager-spec.js index 6e67508b4..599fb0ff9 100644 --- a/spec/package-manager-spec.js +++ b/spec/package-manager-spec.js @@ -8,7 +8,6 @@ const { Disposable } = require('atom') const { buildKeydownEvent } = require('../src/keymap-extensions') const { mockLocalStorage } = require('./spec-helper') const ModuleCache = require('../src/module-cache') -const { it, beforeEach, afterEach } = require('./async-spec-helpers') describe('PackageManager', () => { function createTestElement (className) { diff --git a/spec/package-transpilation-registry-spec.js b/spec/package-transpilation-registry-spec.js index 32b3f375b..df2599db1 100644 --- a/spec/package-transpilation-registry-spec.js +++ b/spec/package-transpilation-registry-spec.js @@ -1,8 +1,6 @@ /** @babel */ import path from 'path' -import { it, beforeEach } from './async-spec-helpers' - import PackageTranspilationRegistry from '../src/package-transpilation-registry' const originalCompiler = { diff --git a/spec/pane-container-spec.js b/spec/pane-container-spec.js index 7450d870b..cd6da9939 100644 --- a/spec/pane-container-spec.js +++ b/spec/pane-container-spec.js @@ -1,9 +1,4 @@ const PaneContainer = require('../src/pane-container') -const { - it, - - beforeEach -} = require('./async-spec-helpers') describe('PaneContainer', () => { let confirm, params diff --git a/spec/pane-spec.js b/spec/pane-spec.js index 17fffaec7..c9ca0fb4b 100644 --- a/spec/pane-spec.js +++ b/spec/pane-spec.js @@ -3,12 +3,7 @@ const { Emitter } = require('event-kit') const Grim = require('grim') const Pane = require('../src/pane') const PaneContainer = require('../src/pane-container') -const { - it, - beforeEach, - conditionPromise, - timeoutPromise -} = require('./async-spec-helpers') +const { conditionPromise, timeoutPromise } = require('./async-spec-helpers') describe('Pane', () => { let confirm, showSaveDialog, deserializerDisposable diff --git a/spec/path-watcher-spec.js b/spec/path-watcher-spec.js index 050f9df45..f6fd2d098 100644 --- a/spec/path-watcher-spec.js +++ b/spec/path-watcher-spec.js @@ -1,6 +1,6 @@ /** @babel */ -import { it, beforeEach, afterEach, promisifySome } from './async-spec-helpers' +import { promisifySome } from './async-spec-helpers' import tempCb from 'temp' import fsCb from 'fs-plus' import path from 'path' diff --git a/spec/reopen-project-menu-manager-spec.js b/spec/reopen-project-menu-manager-spec.js index 442c1a0e5..f122eaa3b 100644 --- a/spec/reopen-project-menu-manager-spec.js +++ b/spec/reopen-project-menu-manager-spec.js @@ -1,6 +1,5 @@ /** @babel */ -import { it, beforeEach } from './async-spec-helpers' import { Disposable } from 'event-kit' const ReopenProjectMenuManager = require('../src/reopen-project-menu-manager') diff --git a/spec/state-store-spec.js b/spec/state-store-spec.js index d890877ab..7b206cdb2 100644 --- a/spec/state-store-spec.js +++ b/spec/state-store-spec.js @@ -1,5 +1,4 @@ /** @babel */ -import { it } from './async-spec-helpers' const StateStore = require('../src/state-store.js') diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js index 4cef9f136..5529f8730 100644 --- a/spec/text-editor-component-spec.js +++ b/spec/text-editor-component-spec.js @@ -1,10 +1,4 @@ -const { - it, - - beforeEach, - afterEach, - conditionPromise -} = require('./async-spec-helpers') +const { conditionPromise } = require('./async-spec-helpers') const Random = require('../script/node_modules/random-seed') const { getRandomBufferRange, buildRandomLines } = require('./helpers/random') diff --git a/spec/text-editor-element-spec.js b/spec/text-editor-element-spec.js index 758384f9e..0d3f23c04 100644 --- a/spec/text-editor-element-spec.js +++ b/spec/text-editor-element-spec.js @@ -1,8 +1,3 @@ -const { - it, - - beforeEach -} = require('./async-spec-helpers') const TextEditor = require('../src/text-editor') const TextEditorElement = require('../src/text-editor-element') diff --git a/spec/text-editor-registry-spec.js b/spec/text-editor-registry-spec.js index 82afa3b0f..4175b863b 100644 --- a/spec/text-editor-registry-spec.js +++ b/spec/text-editor-registry-spec.js @@ -2,7 +2,6 @@ const TextEditorRegistry = require('../src/text-editor-registry') const TextEditor = require('../src/text-editor') const TextBuffer = require('text-buffer') const { Point, Range } = TextBuffer -const { it } = require('./async-spec-helpers') const dedent = require('dedent') describe('TextEditorRegistry', function () { diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js index f70ec4a1e..4f4390561 100644 --- a/spec/text-editor-spec.js +++ b/spec/text-editor-spec.js @@ -1,10 +1,3 @@ -const { - it, - - beforeEach, - afterEach -} = require('./async-spec-helpers') - const fs = require('fs') const path = require('path') const temp = require('temp').track() diff --git a/spec/text-mate-language-mode-spec.js b/spec/text-mate-language-mode-spec.js index 6f60d527a..2fd155e6a 100644 --- a/spec/text-mate-language-mode-spec.js +++ b/spec/text-mate-language-mode-spec.js @@ -4,7 +4,6 @@ const TextBuffer = require('text-buffer') const { Point } = TextBuffer const _ = require('underscore-plus') const dedent = require('dedent') -const { it, beforeEach, afterEach } = require('./async-spec-helpers') describe('TextMateLanguageMode', () => { let languageMode, buffer, config diff --git a/spec/tree-sitter-language-mode-spec.js b/spec/tree-sitter-language-mode-spec.js index 09f134cb0..7cc210c40 100644 --- a/spec/tree-sitter-language-mode-spec.js +++ b/spec/tree-sitter-language-mode-spec.js @@ -1,7 +1,5 @@ /* eslint-disable no-template-curly-in-string */ -const { it, beforeEach, afterEach } = require('./async-spec-helpers') - const fs = require('fs') const path = require('path') const dedent = require('dedent') diff --git a/spec/update-process-env-spec.js b/spec/update-process-env-spec.js index 54b6a9038..5185f0198 100644 --- a/spec/update-process-env-spec.js +++ b/spec/update-process-env-spec.js @@ -1,7 +1,5 @@ /** @babel */ -/* eslint-env jasmine */ -import { it, beforeEach, afterEach } from './async-spec-helpers' import path from 'path' import childProcess from 'child_process' import { diff --git a/spec/uri-handler-registry-spec.js b/spec/uri-handler-registry-spec.js index b17bfa16e..a8faa4500 100644 --- a/spec/uri-handler-registry-spec.js +++ b/spec/uri-handler-registry-spec.js @@ -2,8 +2,6 @@ import url from 'url' -import { it } from './async-spec-helpers' - import URIHandlerRegistry from '../src/uri-handler-registry' describe('URIHandlerRegistry', () => { diff --git a/spec/workspace-center-spec.js b/spec/workspace-center-spec.js index 681074557..b5bf6ba91 100644 --- a/spec/workspace-center-spec.js +++ b/spec/workspace-center-spec.js @@ -2,8 +2,6 @@ const TextEditor = require('../src/text-editor') -import { it } from './async-spec-helpers' - describe('WorkspaceCenter', () => { describe('.observeTextEditors()', () => { it('invokes the observer with current and future text editors', () => { diff --git a/spec/workspace-element-spec.js b/spec/workspace-element-spec.js index 930fedeae..afcb9446a 100644 --- a/spec/workspace-element-spec.js +++ b/spec/workspace-element-spec.js @@ -5,7 +5,6 @@ const etch = require('etch') const path = require('path') const temp = require('temp').track() const { Disposable } = require('event-kit') -const { it, beforeEach, afterEach } = require('./async-spec-helpers') const getNextUpdatePromise = () => etch.getScheduler().nextUpdatePromise diff --git a/spec/workspace-spec.js b/spec/workspace-spec.js index c5e3ff668..50dd57682 100644 --- a/spec/workspace-spec.js +++ b/spec/workspace-spec.js @@ -10,12 +10,7 @@ const _ = require('underscore-plus') const fstream = require('fstream') const fs = require('fs-plus') const AtomEnvironment = require('../src/atom-environment') -const { - it, - beforeEach, - afterEach, - conditionPromise -} = require('./async-spec-helpers') +const { conditionPromise } = require('./async-spec-helpers') describe('Workspace', () => { let workspace From 67afbe60970fd3f1e0f10d74bb865c982f0d27a9 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Thu, 28 Feb 2019 20:53:36 +0100 Subject: [PATCH 2/3] Stop using promisifySome --- spec/path-watcher-spec.js | 59 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/spec/path-watcher-spec.js b/spec/path-watcher-spec.js index f6fd2d098..ec1993f96 100644 --- a/spec/path-watcher-spec.js +++ b/spec/path-watcher-spec.js @@ -1,23 +1,21 @@ /** @babel */ -import { promisifySome } from './async-spec-helpers' -import tempCb from 'temp' -import fsCb from 'fs-plus' +import temp from 'temp' +import fs from 'fs-plus' import path from 'path' +import { promisify } from 'util' import { CompositeDisposable } from 'event-kit' import { watchPath, stopAllWatchers } from '../src/path-watcher' -tempCb.track() +temp.track() -const fs = promisifySome(fsCb, [ - 'writeFile', - 'mkdir', - 'symlink', - 'appendFile', - 'realpath' -]) -const temp = promisifySome(tempCb, ['mkdir']) +const writeFile = promisify(fs.writeFile) +const mkdir = promisify(fs.mkdir) +const appendFile = promisify(fs.appendFile) +const realpath = promisify(fs.realpath) + +const tempMkdir = promisify(temp.mkdir) describe('watchPath', function () { let subs @@ -55,14 +53,14 @@ describe('watchPath', function () { describe('watchPath()', function () { it('resolves the returned promise when the watcher begins listening', async function () { - const rootDir = await temp.mkdir('atom-fsmanager-test-') + const rootDir = await tempMkdir('atom-fsmanager-test-') const watcher = await watchPath(rootDir, {}, () => {}) expect(watcher.constructor.name).toBe('PathWatcher') }) it('reuses an existing native watcher and resolves getStartPromise immediately if attached to a running watcher', async function () { - const rootDir = await temp.mkdir('atom-fsmanager-test-') + const rootDir = await tempMkdir('atom-fsmanager-test-') const watcher0 = await watchPath(rootDir, {}, () => {}) const watcher1 = await watchPath(rootDir, {}, () => {}) @@ -71,7 +69,7 @@ describe('watchPath', function () { }) it("reuses existing native watchers even while they're still starting", async function () { - const rootDir = await temp.mkdir('atom-fsmanager-test-') + const rootDir = await tempMkdir('atom-fsmanager-test-') const [watcher0, watcher1] = await Promise.all([ watchPath(rootDir, {}, () => {}), @@ -81,7 +79,7 @@ describe('watchPath', function () { }) it("doesn't attach new watchers to a native watcher that's stopping", async function () { - const rootDir = await temp.mkdir('atom-fsmanager-test-') + const rootDir = await tempMkdir('atom-fsmanager-test-') const watcher0 = await watchPath(rootDir, {}, () => {}) const native0 = watcher0.native @@ -93,12 +91,12 @@ describe('watchPath', function () { }) it('reuses an existing native watcher on a parent directory and filters events', async function () { - const rootDir = await temp.mkdir('atom-fsmanager-test-').then(fs.realpath) + const rootDir = await tempMkdir('atom-fsmanager-test-').then(realpath) const rootFile = path.join(rootDir, 'rootfile.txt') const subDir = path.join(rootDir, 'subdir') const subFile = path.join(subDir, 'subfile.txt') - await fs.mkdir(subDir) + await mkdir(subDir) // Keep the watchers alive with an undisposed subscription const rootWatcher = await watchPath(rootDir, {}, () => {}) @@ -111,18 +109,17 @@ describe('watchPath', function () { waitForChanges(rootWatcher, subFile), waitForChanges(childWatcher, subFile) ]) - await fs.writeFile(subFile, 'subfile\n', { encoding: 'utf8' }) + await writeFile(subFile, 'subfile\n', { encoding: 'utf8' }) await firstChanges const nextRootEvent = waitForChanges(rootWatcher, rootFile) - await fs.writeFile(rootFile, 'rootfile\n', { encoding: 'utf8' }) + await writeFile(rootFile, 'rootfile\n', { encoding: 'utf8' }) await nextRootEvent }) it('adopts existing child watchers and filters events appropriately to them', async function () { - const parentDir = await temp - .mkdir('atom-fsmanager-test-') - .then(fs.realpath) + const parentDir = await tempMkdir('atom-fsmanager-test-') + .then(realpath) // Create the directory tree const rootFile = path.join(parentDir, 'rootfile.txt') @@ -131,12 +128,12 @@ describe('watchPath', function () { const subDir1 = path.join(parentDir, 'subdir1') const subFile1 = path.join(subDir1, 'subfile1.txt') - await fs.mkdir(subDir0) - await fs.mkdir(subDir1) + await mkdir(subDir0) + await mkdir(subDir1) await Promise.all([ - fs.writeFile(rootFile, 'rootfile\n', { encoding: 'utf8' }), - fs.writeFile(subFile0, 'subfile 0\n', { encoding: 'utf8' }), - fs.writeFile(subFile1, 'subfile 1\n', { encoding: 'utf8' }) + writeFile(rootFile, 'rootfile\n', { encoding: 'utf8' }), + writeFile(subFile0, 'subfile 0\n', { encoding: 'utf8' }), + writeFile(subFile1, 'subfile 1\n', { encoding: 'utf8' }) ]) // Begin the child watchers and keep them alive @@ -162,9 +159,9 @@ describe('watchPath', function () { // Ensure events are filtered correctly await Promise.all([ - fs.appendFile(rootFile, 'change\n', { encoding: 'utf8' }), - fs.appendFile(subFile0, 'change\n', { encoding: 'utf8' }), - fs.appendFile(subFile1, 'change\n', { encoding: 'utf8' }) + appendFile(rootFile, 'change\n', { encoding: 'utf8' }), + appendFile(subFile0, 'change\n', { encoding: 'utf8' }), + appendFile(subFile1, 'change\n', { encoding: 'utf8' }) ]) await Promise.all([ From ec705399e63b49417d0b250984cc20b5817a5254 Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Fri, 1 Mar 2019 12:03:37 +0100 Subject: [PATCH 3/3] 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 6d1d45963..58e17d323 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 5a233973e..e78205989 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 5fe94e859..000000000 --- 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 5a233973e..000000000 --- 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 c6a5920a5..840a04b2a 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