Merge pull request #124 from AtomLinter/arcanemagus/asyncify-specs

Asyncify the specs

Author: Arcanemagus

package.json

@@ -42,7 +42,8 @@
   "devDependencies": {
     "eslint": "^4.6.0",
     "eslint-config-airbnb-base": "^12.0.0",
-    "eslint-plugin-import": "^2.7.0"
+    "eslint-plugin-import": "^2.7.0",
+    "jasmine-fix": "^1.3.1"
   },
   "package-deps": [
     "linter"

spec/linter-ruby-spec.js

@@ -1,23 +1,24 @@
 'use babel';
 
 import { join } from 'path';
+// eslint-disable-next-line no-unused-vars
+import { it, fit, wait, beforeEach, afterEach } from 'jasmine-fix';
 
 const goodPath = join(__dirname, 'fixtures', 'good.rb');
 const badPath = join(__dirname, 'fixtures', 'bad.rb');
 const { lint } = require('../lib/main.js').provideLinter();
 
 describe('The Ruby provider for Linter', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     // Info about this beforeEach() implementation:
     // https://github.com/AtomLinter/Meta/issues/15
     const activationPromise = atom.packages.activatePackage('linter-ruby');
 
-    waitsForPromise(() =>
-      atom.packages.activatePackage('language-ruby').then(() =>
-        atom.workspace.open(goodPath)));
+    await atom.packages.activatePackage('language-ruby');
+    await atom.workspace.open(goodPath);
 
     atom.packages.triggerDeferredActivationHooks();
-    waitsForPromise(() => activationPromise);
+    await activationPromise;
   });
 
   it('should be in the packages list', () =>
@@ -26,38 +27,28 @@ describe('The Ruby provider for Linter', () => {
   it('should be an active package', () =>
     expect(atom.packages.isPackageActive('linter-ruby')).toBe(true));
 
-  describe('checks bad.rb and', () => {
-    let editor = null;
-    beforeEach(() => {
-      waitsForPromise(() =>
-        atom.workspace.open(badPath).then((openEditor) => { editor = openEditor; }));
-    });
-
-    it('verifies the messages are correct', () =>
-      waitsForPromise(() =>
-        lint(editor).then((messages) => {
-          expect(messages.length).toBe(2);
-
-          expect(messages[0].type).toBe('Warning');
-          expect(messages[0].html).not.toBeDefined();
-          expect(messages[0].text).toBe('assigned but unused variable - payload');
-          expect(messages[0].filePath).toBe(badPath);
-          expect(messages[0].range).toEqual([[1, 2], [1, 13]]);
-
-          expect(messages[1].type).toBe('Error');
-          expect(messages[1].html).not.toBeDefined();
-          expect(messages[1].text).toBe('unexpected keyword_end, expecting end-of-input');
-          expect(messages[1].filePath).toBe(badPath);
-          expect(messages[1].range).toEqual([[12, 0], [12, 18]]);
-        })));
+  it('checks bad.rb and verifies the messages are correct', async () => {
+    const editor = await atom.workspace.open(badPath);
+    const messages = await lint(editor);
+
+    expect(messages.length).toBe(2);
+
+    expect(messages[0].type).toBe('Warning');
+    expect(messages[0].html).not.toBeDefined();
+    expect(messages[0].text).toBe('assigned but unused variable - payload');
+    expect(messages[0].filePath).toBe(badPath);
+    expect(messages[0].range).toEqual([[1, 2], [1, 13]]);
+
+    expect(messages[1].type).toBe('Error');
+    expect(messages[1].html).not.toBeDefined();
+    expect(messages[1].text).toBe('unexpected keyword_end, expecting end-of-input');
+    expect(messages[1].filePath).toBe(badPath);
+    expect(messages[1].range).toEqual([[12, 0], [12, 18]]);
   });
 
-  describe('checks good.rb and', () => {
-    it('reports nothing wrong', () =>
-      waitsForPromise(() =>
-        atom.workspace.open(goodPath).then(editor =>
-          lint(editor).then((messages) => {
-            expect(messages.length).toBe(0);
-          }))));
+  it('checks good.rb and reports nothing wrong', async () => {
+    const editor = await atom.workspace.open(goodPath);
+    const messages = await lint(editor);
+    expect(messages.length).toBe(0);
   });
 });