Skip to content

Commit

Permalink
Merge pull request #80 from landonp1203/dev
Browse files Browse the repository at this point in the history
Maintenance
  • Loading branch information
Brendan Goldberg authored Feb 20, 2018
2 parents 13a353e + 46604d1 commit d8ac212
Show file tree
Hide file tree
Showing 7 changed files with 366 additions and 124 deletions.
16 changes: 14 additions & 2 deletions Server Backend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"extends": "standard",
"extends": [
"standard",
"plugin:jasmine/recommended"
],
"plugins": [
"jasmine"
],
"env": {
"jasmine": true
},
"rules": {
"space-before-function-paren": ["error", "never"]
"space-before-function-paren": [
"error",
"never"
]
}
}
118 changes: 0 additions & 118 deletions Server Backend/Tests/test.js

This file was deleted.

79 changes: 79 additions & 0 deletions Server Backend/package-lock.json

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

15 changes: 11 additions & 4 deletions Server Backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "server.js",
"scripts": {
"start": "nodemon server.js",
"test": "ava Tests/*.js -v; exit 0",
"test": "node tests/setup.js",
"cover": "nyc npm run test",
"report": "nyc --reporter=lcov npm run test",
"lint": "eslint **/*.js --ignore-pattern node_modules/; exit 0"
Expand All @@ -19,15 +19,22 @@
"lodash": "^4.17.5"
},
"devDependencies": {
"ava": "^0.25.0",
"chai": "^4.1.2",
"eslint": "^4.18.0",
"eslint-config-standard": "^11.0.0-beta.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jasmine": "^2.9.2",
"eslint-plugin-node": "^6.0.0",
"eslint-plugin-promise": "^3.6.0",
"eslint-plugin-standard": "^3.0.1",
"jasmine": "^3.0.0",
"jasmine-console-reporter": "^2.0.1",
"nodemon": "^1.14.12",
"nyc": "^11.4.1"
"nyc": "^11.4.1",
"path": "^0.12.7"
},
"nyc": {
"exclude": [
"tests/setup.js"
]
}
}
34 changes: 34 additions & 0 deletions Server Backend/tests/setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
const Jasmine = require('jasmine')
const Reporter = require('jasmine-console-reporter')

const jasmine = new Jasmine()

jasmine.loadConfig({
'spec_dir': 'tests',
'spec_files': [
'*.js'
],
'helpers': [
'helpers/**/*.js'
],
'stopSpecOnExpectationFailure': false,
'random': false
})

jasmine.addReporter(new Reporter({
colors: 1,
cleanStack: 1,
verbosity: 4,
listStyle: 'indent',
activity: false
}))

jasmine.onComplete(passed => {
if (passed) {
console.log('All specs have passed')
} else {
console.log('At least one spec has failed')
}
})

jasmine.execute()
Loading

0 comments on commit d8ac212

Please sign in to comment.