From a93808d1a85ee723f5f16f0d3c39e47a0f5fbfff Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@github.com>
Date: Thu, 28 Feb 2019 20:39:21 +0100
Subject: [PATCH] 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 f3352e80655..21aa4c5eb56 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 4190674df5c..a67c0511c32 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 2f593b5bd01..8e6587b59f7 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 99b7fe261c0..7351e0f9920 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 ffce8034c8a..0027dd5c36a 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 1c27d95a540..400fd624101 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 0c0b817a202..e31d3f6ca91 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 abe86d92d51..044e257b5a2 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 6b83035d951..537617d5692 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 0b2a8cdf9e8..cc4bb769b9a 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 fb114928fe9..1cf6af5c254 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 f49ebe9420a..597a72c352b 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 1350853f5ac..d5ae98170d0 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 d7bd5b1cba0..8d2a0907c57 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 b0ccec89c80..5a4c4ba0708 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 ade09da8835..ed5699843aa 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 729d5256364..34cea04b5bd 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 5f736611871..bdf670425c5 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 c83028c73bf..89f08d79ead 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 6e67508b455..599fb0ff982 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 32b3f375b11..df2599db10a 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 7450d870b7d..cd6da993939 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 17fffaec7f9..c9ca0fb4bb8 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 050f9df45a2..f6fd2d0986c 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 442c1a0e585..f122eaa3b94 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 d890877ab3f..7b206cdb21c 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 4cef9f13667..5529f873083 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 758384f9e7f..0d3f23c04dd 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 82afa3b0fce..4175b863b4d 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 f70ec4a1e5f..4f439056130 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 6f60d527aeb..2fd155e6ab4 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 09f134cb08e..7cc210c40af 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 54b6a9038ee..5185f019823 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 b17bfa16e46..a8faa45006e 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 681074557ee..b5bf6ba911b 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 930fedeae7d..afcb9446ac5 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 c5e3ff66852..50dd5768215 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