Skip to content

Commit

Permalink
[MM-12333] Convert mocha to jest and move test files adjacent to the …
Browse files Browse the repository at this point in the history
…files being tested (mattermost#745)

* convert mocha to jest and move test files adjacent to the files being tested

* update Jenkins, add jest-junit and removed update  config

* fix merge conflicts and remove unecessary comment
  • Loading branch information
saturninoabril authored Jan 10, 2019
1 parent 216da18 commit b3a7f96
Show file tree
Hide file tree
Showing 61 changed files with 3,433 additions and 299 deletions.
15 changes: 11 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
"./node_modules/eslint-config-mattermost/.eslintrc.json",
"plugin:flowtype/recommended"
],
"env": {
"jest": true
},
"plugins": [
"mocha",
"flowtype"
],
"rules": {
"mocha/no-exclusive-tests": 2
}
"overrides": [
{
"files": ["*.test.js"],
"env": {
"jest": true
}
}
]
}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@ mattermost-redux-*.tgz
/flow-typed
/.flowinstall

.vscode/
.vscode/

# test coverage
coverage
12 changes: 6 additions & 6 deletions build/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ pipeline {

stage('Test') {
steps {
sh "npm run test"
sh 'make test'
}
post {
always {
junit 'build/test-results.xml'
}
}
}
}
post {
always {
junit 'build/test-results.xml'
}
}
}
Loading

0 comments on commit b3a7f96

Please sign in to comment.