Skip to content

Commit

Permalink
Merge pull request #5 from lorena-ssi/fixbuild
Browse files Browse the repository at this point in the history
Fix build by using hardcoded version of zenroom-lib
  • Loading branch information
celeduc committed Mar 12, 2020
2 parents 752b4d8 + b13b952 commit 1af8ce8
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 26 deletions.
43 changes: 24 additions & 19 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
module.exports = {
env: {
browser: true,
commonjs: true,
es6: true,
mocha: true,
},
extends: [
'standard'
],
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly'
},
parserOptions: {
ecmaVersion: 2018
},
rules: {
}
env: {
browser: true,
commonjs: true,
es6: true,
mocha: true,
},
extends: [
'standard',
'plugin:chai-friendly/recommended',
'plugin:jsdoc/recommended'
],
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly'
},
parserOptions: {
ecmaVersion: 2018
},
plugins: [
'chai-friendly',
'jsdoc'
],
rules: {
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.nyc_output/
coverage/
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: node_js
node_js:
- "12"
- "10"
install:
- npm install
script:
- npm run lint
- npm test
after_script:
- npm run coveralls
26 changes: 26 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Mocha Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"bdd",
"--timeout",
"999999",
"--colors",
"${workspaceFolder}/test"
],
"internalConsoleOptions": "openOnSessionStart",
"skipFiles": [
"<node_internals>/**"
]
}
]
}
11 changes: 8 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"main": "src/index.js",
"scripts": {
"coverage": "nyc npm run mocha && nyc report --reporter=html",
"coveralls": "nyc mocha test --timeout 20000 && nyc report --reporter=text-lcov | coveralls",
"coveralls": "nyc npm run mocha && nyc report --reporter=text-lcov | coveralls",
"debug": "./pds 1",
"lint": "eslint ./examples ./src ./test --fix",
"mocha": "mocha test --timeout 50000 --bail",
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"@lorena-ssi/matrix-lib": "^1.0.7",
"@lorena-ssi/zenroom-lib": "^1.3.3",
"@lorena-ssi/zenroom-lib": "lorena-ssi/zenroom-lib#v1.3.3",
"axios": "^0.19.2",
"chalk": "^3.0.0",
"chalk-pipe": "^3.0.0",
Expand All @@ -36,6 +36,7 @@
"coveralls": "^3.0.9",
"eslint": "^6.8.0",
"eslint-config-standard": "^14.1.0",
"eslint-plugin-chai-friendly": "^0.5.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jsdoc": "^18.4.3",
"eslint-plugin-node": "^11.0.0",
Expand Down
3 changes: 3 additions & 0 deletions test/lorena-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ describe('Lorena API', function () {
threadId: 2, // Local id for your process
payload: {}
}
/**
*
*/
function pong () {
expect(onpong).to.have.been.called()
done()
Expand Down

0 comments on commit 1af8ce8

Please sign in to comment.