chore(package): update ava to version 3.1.0

Author: greenkeeper[bot]

package.json

@@ -4,9 +4,6 @@
   "version": "0.0.0-development",
   "author": "Pierre Vanduynslager (https://github.com/pvdlg)",
   "ava": {
-    "helpers": [
-      "test/helpers/**/*"
-    ],
     "files": [
       "test/*.test.js"
     ]
@@ -23,7 +20,7 @@
   },
   "devDependencies": {
     "@metahub/karma-jasmine-jquery": "^3.0.0",
-    "ava": "^2.4.0",
+    "ava": "^3.1.0",
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "codecov": "^3.0.0",

test/helpers/karma.js

@@ -1,7 +1,7 @@
-import pEvent from 'p-event';
-import {Server, constants} from 'karma';
-import karmaPreprocessor from '../..';
-import {mockFactory} from './mock';
+const pEvent = require('p-event');
+const {Server, constants} = require('karma');
+const karmaPreprocessor = require('../..');
+const {mockFactory} = require('./mock');
 
 /**
  * Base Karma configuration tu run preprocessor.
@@ -44,7 +44,7 @@ const KARMA_CONFIG = {
  * @param {Object} [config] configuration to pass to the preprocessor.
  * @return {Promise<KarmaOutput>} A `Promise` that resolve to the Karma execution results.
  */
-export async function run(files, config) {
+async function run(files, config) {
 	const server = createServer(files, config, false, karmaPreprocessor);
 
 	server.start();
@@ -64,7 +64,7 @@ export async function run(files, config) {
  * @param {Object} [config] configuration to pass to the preprocessor.
  * @return {Server} The started Karma Server.
  */
-export async function watch(files, config) {
+async function watch(files, config) {
 	const {factory, watcher} = mockFactory(true);
 	const server = createServer(files, config, true, factory);
 
@@ -103,7 +103,7 @@ function createServer(files, config, autoWatch, processorFactory) {
  * @param {Server} server A Karma server started in autoWatch mode.
  * @return {Promise<KarmaOutput>} A `Promise` that resolve to the Karma execution results.
  */
-export async function waitForRunComplete(server) {
+async function waitForRunComplete(server) {
 	try {
 		const [, result] = await pEvent(server, 'run_complete', {
 			multiArgs: true,
@@ -121,3 +121,5 @@ export async function waitForRunComplete(server) {
 		return {success, failed, error: err, disconnected, exitCode: 1};
 	}
 }
+
+module.exports = {run, watch, waitForRunComplete};

test/helpers/mock.js

@@ -1,7 +1,7 @@
-import {EventEmitter} from 'events';
-import proxyquire from 'proxyquire';
-import {spy, stub} from 'sinon';
-import pify from 'pify';
+const {EventEmitter} = require('events');
+const proxyquire = require('proxyquire');
+const {spy, stub} = require('sinon');
+const pify = require('pify');
 
 /**
  * @typedef {Object} MockPreprocessor
@@ -30,7 +30,7 @@ import pify from 'pify';
  * @param {Boolean} autoWatch `true` for autoWatch mode, `false` for a single run.
  * @return {MockFactory} mocked preprocessor factory and watcher.
  */
-export function mockFactory(autoWatch) {
+function mockFactory(autoWatch) {
 	const FSWatcher = stub();
 
 	return {
@@ -64,7 +64,7 @@ export function mockFactory(autoWatch) {
  * @param {Object} [config={}] Karma config to pass to the factory.
  * @return {MockPreprocessor} mocked preprocessor function and spies.
  */
-export async function mockPreprocessor(args = {}, config = {}) {
+async function mockPreprocessor(args = {}, config = {}) {
 	const debug = spy();
 	const error = spy();
 	const info = spy();
@@ -85,3 +85,5 @@ export async function mockPreprocessor(args = {}, config = {}) {
 
 	return {preprocessor, debug, error, info, refreshFiles, watcher: await watcher, FSWatcher};
 }
+
+module.exports = {mockFactory, mockPreprocessor};

test/helpers/utils.js

@@ -1,8 +1,8 @@
-import path from 'path';
-import {readFile} from 'fs-extra';
-import pEvent from 'p-event';
-import sourceMappingURL from 'source-map-url';
-import postcss from 'postcss';
+const path = require('path');
+const {readFile} = require('fs-extra');
+const pEvent = require('p-event');
+const sourceMappingURL = require('source-map-url');
+const postcss = require('postcss');
 
 /**
  * Return a Promise that resolve when an event is emitted and reject after a timeout expire if the event is not emitted.
@@ -13,7 +13,7 @@ import postcss from 'postcss';
  * @param {Number} [timeout=30000] maximum time to wait for the event to be emitted.
  * @return {Promise} Promise tht resolve when the event is emitted.
  */
-export function waitFor(emitter, event, timeout = 30000) {
+function waitFor(emitter, event, timeout = 30000) {
 	return pEvent(emitter, event, {timeout});
 }
 
@@ -31,7 +31,7 @@ export function waitFor(emitter, event, timeout = 30000) {
  * @param {Object} [options={}] postcss options.
  * @return {Compiled} compiled code and source map.
  */
-export async function compile(file, options = {}) {
+async function compile(file, options = {}) {
 	if (options.sourceMap || options.map) {
 		options.map = {inline: false};
 	}
@@ -51,3 +51,5 @@ export async function compile(file, options = {}) {
 		map: map ? JSON.parse(map.toString()) : undefined,
 	};
 }
+
+module.exports = {waitFor, compile};

test/integration.test.js

@@ -1,13 +1,13 @@
-import path from 'path';
-import {copy} from 'fs-extra';
-import test from 'ava';
-import {stub} from 'sinon';
-import tempy from 'tempy';
-import cssnano from 'cssnano';
-import mixins from 'postcss-mixins';
-import simpleVars from 'postcss-simple-vars';
-import atImport from 'postcss-import';
-import {run, watch, waitForRunComplete} from './helpers/karma';
+const path = require('path');
+const {copy} = require('fs-extra');
+const test = require('ava');
+const {stub} = require('sinon');
+const tempy = require('tempy');
+const cssnano = require('cssnano');
+const mixins = require('postcss-mixins');
+const simpleVars = require('postcss-simple-vars');
+const atImport = require('postcss-import');
+const {run, watch, waitForRunComplete} = require('./helpers/karma');
 
 let stubWrite;
 

test/unit.test.js

@@ -1,14 +1,14 @@
-import path from 'path';
-import {readFile, copy, outputFile, remove} from 'fs-extra';
-import test from 'ava';
-import {spy, match} from 'sinon';
-import tempy from 'tempy';
-import cssnano from 'cssnano';
-import mixins from 'postcss-mixins';
-import simpleVars from 'postcss-simple-vars';
-import atImport from 'postcss-import';
-import {waitFor, compile} from './helpers/utils';
-import {mockPreprocessor} from './helpers/mock';
+const path = require('path');
+const {readFile, copy, outputFile, remove} = require('fs-extra');
+const test = require('ava');
+const {spy, match} = require('sinon');
+const tempy = require('tempy');
+const cssnano = require('cssnano');
+const mixins = require('postcss-mixins');
+const simpleVars = require('postcss-simple-vars');
+const atImport = require('postcss-import');
+const {waitFor, compile} = require('./helpers/utils');
+const {mockPreprocessor} = require('./helpers/mock');
 
 test('Compile css file', async t => {
 	const fixture = 'test/fixtures/basic.css';
@@ -155,7 +155,7 @@ test('Log error on invalid css file', async t => {
 	const options = {plugins: [atImport, mixins, simpleVars, cssnano]};
 	const {preprocessor, debug, error} = await mockPreprocessor({}, {postcssPreprocessor: {options}});
 	const file = {originalPath: fixture};
-	const err = await t.throwsAsync(preprocessor(await readFile(fixture), file), {instanceOf: Object});
+	const err = await t.throwsAsync(preprocessor(await readFile(fixture), file), {instanceOf: Error});
 
 	t.is(err.name, 'CssSyntaxError');
 	t.true(debug.firstCall.calledWith(match('Processing'), fixture));
@@ -467,7 +467,7 @@ test('Call refreshFiles when dependency is deleted and added', async t => {
 	t.true(refreshFiles.calledOnce);
 	info.resetHistory();
 	refreshFiles.resetHistory();
-	await t.throwsAsync(preprocessor(await readFile(fixture), file), Error);
+	await t.throwsAsync(preprocessor(await readFile(fixture), file), {instanceOf: Error});
 	const cpy = waitFor(watcher, 'add');
 
 	await copy('test/fixtures/partials/partial.css', partial);