Merge pull request #192 from AtomLinter/arcanemagus/update-specs-ci

Update the specs and CI configuration

Author: Arcanemagus

.circleci/config.yml

@@ -0,0 +1,19 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/linter-clang
+    docker:
+      - image: walberla/buildenv-ubuntu-clang:4.0
+        environment:
+          DISPLAY: ":99"
+    steps:
+      - run: apt-get update
+      # Install some pre-requisite packages and missing dependencies from the atom package
+      - run: apt-get --assume-yes --quiet --no-install-suggests --no-install-recommends install sudo xvfb libxss1 libasound2
+      # Fire up a VFB to run Atom in
+      - run: /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
+      - checkout
+      # Download and run the (modified) Atom CI script
+      - run: curl -s -O https://raw.githubusercontent.com/Arcanemagus/ci/atomlinter/build-package.sh
+      - run: chmod u+x build-package.sh
+      - run: ./build-package.sh

.travis.yml

@@ -30,7 +30,8 @@
   "devDependencies": {
     "eslint": "^3.13.0",
     "eslint-config-airbnb-base": "^11.0.1",
-    "eslint-plugin-import": "^2.2.0"
+    "eslint-plugin-import": "^2.2.0",
+    "jasmine-fix": "^1.0.1"
   },
   "package-deps": [
     "linter"

package.json

@@ -1,64 +1,57 @@
 'use babel';
 
-import * as path from 'path';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { beforeEach, it } from 'jasmine-fix';
+import { join } from 'path';
 
-const miPath = path.join(__dirname, 'files', 'missing_import');
-const validPath = path.join(__dirname, 'files', 'valid.c');
+const lint = require('../lib/main').provideLinter().lint;
 
-describe('The Clang provider for AtomLinter', () => {
-  const lint = require('../lib/main').provideLinter().lint;
-
-  beforeEach(() => {
-    waitsForPromise(() => atom.packages.activatePackage('linter-clang'));
-  });
-
-  it('finds nothing wrong with a valid file', () => {
-    waitsForPromise(() =>
-      atom.workspace.open(validPath).then(editor =>
-        lint(editor).then((messages) => {
-          expect(messages.length).toBe(0);
-        }),
-      ),
-    );
-  });
-
-  it('finds a fatal error in "missing_import.c"', () => {
-    waitsForPromise(() => atom.workspace.open(`${miPath}.c`).then(
-      editor => lint(editor).then((messages) => {
-        expect(messages.length).toEqual(1);
-        expect(messages[0].type).toEqual('fatal error');
-        expect(messages[0].text).toEqual("'nothing.h' file not found");
-      }),
-    ));
-  });
+const miPath = join(__dirname, 'files', 'missing_import');
+const validPath = join(__dirname, 'files', 'valid.c');
 
-  it('finds a fatal error in "missing_import.cpp"', () => {
-    waitsForPromise(() => atom.workspace.open(`${miPath}.cpp`).then(
-      editor => lint(editor).then((messages) => {
-        expect(messages.length).toEqual(1);
-        expect(messages[0].type).toEqual('fatal error');
-        expect(messages[0].text).toEqual("'nothing.h' file not found");
-      }),
-    ));
+describe('The Clang provider for AtomLinter', () => {
+  beforeEach(async () => {
+    await atom.packages.activatePackage('language-c');
+    await atom.packages.activatePackage('linter-clang');
   });
 
-  it('finds a fatal error in "missing_import.m"', () => {
-    waitsForPromise(() => atom.workspace.open(`${miPath}.m`).then(
-      editor => lint(editor).then((messages) => {
-        expect(messages.length).toEqual(1);
-        expect(messages[0].type).toEqual('fatal error');
-        expect(messages[0].text).toEqual("'nothing.h' file not found");
-      }),
-    ));
+  it('finds nothing wrong with a valid file', async () => {
+    const editor = await atom.workspace.open(validPath);
+    const messages = await lint(editor);
+    expect(messages.length).toBe(0);
   });
 
-  it('finds a fatal error in "missing_import.mm"', () => {
-    waitsForPromise(() => atom.workspace.open(`${miPath}.mm`).then(
-      editor => lint(editor).then((messages) => {
-        expect(messages.length).toEqual(1);
-        expect(messages[0].type).toEqual('fatal error');
-        expect(messages[0].text).toEqual("'nothing.h' file not found");
-      }),
-    ));
+  describe('handles errors in different file types', () => {
+    it('finds a fatal error in "missing_import.c"', async () => {
+      const editor = await atom.workspace.open(`${miPath}.c`);
+      const messages = await lint(editor);
+      expect(messages.length).toBe(1);
+      expect(messages[0].type).toBe('fatal error');
+      expect(messages[0].text).toBe("'nothing.h' file not found");
+    });
+
+    it('finds a fatal error in "missing_import.cpp"', async () => {
+      const editor = await atom.workspace.open(`${miPath}.cpp`);
+      const messages = await lint(editor);
+      expect(messages.length).toBe(1);
+      expect(messages[0].type).toEqual('fatal error');
+      expect(messages[0].text).toEqual("'nothing.h' file not found");
+    });
+
+    it('finds a fatal error in "missing_import.m"', async () => {
+      const editor = await atom.workspace.open(`${miPath}.m`);
+      const messages = await lint(editor);
+      expect(messages.length).toBe(1);
+      expect(messages[0].type).toEqual('fatal error');
+      expect(messages[0].text).toEqual("'nothing.h' file not found");
+    });
+
+    it('finds a fatal error in "missing_import.mm"', async () => {
+      const editor = await atom.workspace.open(`${miPath}.mm`);
+      const messages = await lint(editor);
+      expect(messages.length).toBe(1);
+      expect(messages[0].type).toEqual('fatal error');
+      expect(messages[0].text).toEqual("'nothing.h' file not found");
+    });
   });
 });