Merge 3f99dc0 into e156ba9

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: ci
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x, 10.x, 12.x]
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install
+        run: |
+          npm install
+      - name: Run Tests & generate coverage
+        run: |
+          npm run coveralls
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel: true
+
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true

.gitignore

@@ -1,4 +1,5 @@
 node_modules/*
 coverage
 .nyc_output
-package-lock.json
+package-lock.json
+benchmark/node_modules

.nycrc

@@ -0,0 +1,6 @@
+{
+    "all": true,
+    "check-coverage": true,
+    "reporter": [ "lcov", "text" ],
+    "include": [ "lib" ]
+}

README.md

@@ -1,6 +1,6 @@
 # fast-translation
 
-[![Build Status](https://travis-ci.org/SerayaEryn/fast-translation.svg?branch=master)](https://travis-ci.org/SerayaEryn/fast-translation)
+![Build Status](https://github.com/SerayaEryn/fast-translation/workflows/ci/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/SerayaEryn/fast-translation/badge.svg?branch=master)](https://coveralls.io/github/SerayaEryn/fast-translation?branch=master)
 [![NPM version](https://img.shields.io/npm/v/fast-translation.svg?style=flat)](https://www.npmjs.com/package/fast-translation) [![Greenkeeper badge](https://badges.greenkeeper.io/SerayaEryn/fast-translation.svg)](https://greenkeeper.io/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)

benchmark/.npmrc

@@ -0,0 +1 @@
+package-lock=false

benchmark/benchmark.js

@@ -49,4 +49,4 @@ suite
   .on('complete', function () {
     console.log('Fastest is ' + this.filter('fastest').map('name'))
   })
-  .run({ 'async': true })
+  .run({ async: true })

benchmark/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "benchmark": "^2.1.4",
+    "i18next": "^17.0.0"
+  }
+}

package.json

@@ -4,22 +4,20 @@
   "description": "A performant and simple module for handling translations.",
   "main": "lib/FastTranslation.js",
   "scripts": {
-    "unit": "tap test/*.test.js",
+    "unit": "ava test/*.test.js",
     "test": "npm run lint && npm run unit",
-    "lint": "standard lib/* test/*.test.js benchmark/*",
-    "coveralls": "npm run unit --  --cov",
-    "coverage": "npm run coveralls && tap --coverage-report=lcov",
+    "lint": "standard lib/* test/*.test.js benchmark/*.js",
+    "coveralls": "nyc npm test",
+    "coverage": "nyc npm test && nyc report --reporter=html",
     "benchmark": "node benchmark/benchmark.js"
   },
   "author": "Denis Fäcke",
   "license": "MIT",
   "devDependencies": {
-    "benchmark": "^2.1.4",
-    "coveralls": "^3.0.2",
+    "ava": "^2.4.0",
     "express": "^4.16.3",
-    "i18next": "^17.0.0",
-    "standard": "^14.0.0",
-    "tap": "^14.0.0"
+    "nyc": "^14.1.1",
+    "standard": "^14.0.0"
   },
   "repository": {
     "type": "git",
@@ -38,5 +36,8 @@
     "localization",
     "i18n",
     "translate"
+  ],
+  "files": [
+    "lib"
   ]
 }

test/filesource.test.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('ava')
 const Translation = require('../lib/Translator')
-const FileSource = require('../lib/sources/FileSource')
+const FileSource = require('..').FileSource
 const path = require('path')
 
-test('should laod translation from file', (t) => {
+test('should load translation from file', (t) => {
   t.plan(5)
 
   const translation = new Translation({
@@ -18,29 +17,29 @@ test('should laod translation from file', (t) => {
       return number === 1 ? 0 : 1
     })
     .use(new FileSource({
-      filePath: path.join(__dirname, `/locales/__language_____namespace__.json`)
+      filePath: path.join(__dirname, '/locales/__language_____namespace__.json')
     }))
     .initialize()
     .then(() => {
-      t.strictEquals(translation.translate('unknown.key', {
+      t.is(translation.translate('unknown.key', {
         language: 'de',
         namespace: 'DE'
       }), 'unknown.key')
-      t.strictEquals(translation.translate('test.title', {
+      t.is(translation.translate('test.title', {
         language: 'de',
         namespace: 'DE'
       }), 'undefined singular')
-      t.strictEquals(translation.translate('test.title', {
+      t.is(translation.translate('test.title', {
         count: 1,
         language: 'de',
         namespace: 'DE'
       }), '1 singular')
-      t.strictEquals(translation.translate('test.title', {
+      t.is(translation.translate('test.title', {
         count: 2,
         language: 'de',
         namespace: 'DE'
       }), '2 plural')
-      t.strictEquals(translation.translate('test.title', {
+      t.is(translation.translate('test.title', {
         count: 0,
         language: 'de',
         namespace: 'DE'
@@ -60,11 +59,11 @@ test('Should reject on missing file', (t) => {
       return number === 1 ? 0 : 1
     })
     .use(new FileSource({
-      filePath: path.join(__dirname, `/locales/__language_____namespace__.json`)
+      filePath: path.join(__dirname, '/locales/__language_____namespace__.json')
     }))
     .initialize()
     .catch((err) => {
-      t.ok(err)
+      t.truthy(err)
     })
 })
 
@@ -80,10 +79,10 @@ test('Should reject on invalid json file', (t) => {
       return number === 1 ? 0 : 1
     })
     .use(new FileSource({
-      filePath: path.join(__dirname, `/locales/__language_____namespace__.json`)
+      filePath: path.join(__dirname, '/locales/__language_____namespace__.json')
     }))
     .initialize()
     .catch((err) => {
-      t.ok(err)
+      t.truthy(err)
     })
 })

test/httpsource.test.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const test = require('ava')
 const Translation = require('../lib/Translator')
-const HttpSource = require('../lib/sources/HttpSource')
+const HttpSource = require('..').HttpSource
 const http = require('http')
 
-test('should load translations from http server', (t) => {
+test.cb('should load translations from http server', (t) => {
   t.plan(5)
 
   const express = require('express')
@@ -39,34 +38,35 @@ test('should load translations from http server', (t) => {
       .initialize()
       .then(() => {
         server.unref()
-        t.strictEquals(translation.translate('unknown.key', {
+        t.is(translation.translate('unknown.key', {
           language: 'de',
           namespace: 'DE'
         }), 'unknown.key')
-        t.strictEquals(translation.translate('test.title', {
+        t.is(translation.translate('test.title', {
           language: 'de',
           namespace: 'DE'
         }), 'undefined singular')
-        t.strictEquals(translation.translate('test.title', {
+        t.is(translation.translate('test.title', {
           count: 1,
           language: 'de',
           namespace: 'DE'
         }), '1 singular')
-        t.strictEquals(translation.translate('test.title', {
+        t.is(translation.translate('test.title', {
           count: 2,
           language: 'de',
           namespace: 'DE'
         }), '2 plural')
-        t.strictEquals(translation.translate('test.title', {
+        t.is(translation.translate('test.title', {
           count: 0,
           language: 'de',
           namespace: 'DE'
         }), '0 plural')
+        t.end()
       })
   })
 })
 
-test('', (t) => {
+test.cb('should handle server error', (t) => {
   t.plan(1)
 
   const express = require('express')
@@ -95,12 +95,13 @@ test('', (t) => {
       .initialize()
       .catch((err) => {
         server.unref()
-        t.ok(err)
+        t.truthy(err)
+        t.end()
       })
   })
 })
 
-test('Should reject on invalid json', (t) => {
+test.cb('Should reject on invalid json', (t) => {
   t.plan(1)
 
   const express = require('express')
@@ -128,7 +129,8 @@ test('Should reject on invalid json', (t) => {
       .initialize()
       .catch((err) => {
         server.unref()
-        t.ok(err)
+        t.truthy(err)
+        t.end()
       })
   })
 })