Skip to content

Commit

Permalink
Merge pull request #133 from ml5js/tests
Browse files Browse the repository at this point in the history
Adding Karma + Jasmine and some other changes
  • Loading branch information
cvalenzuela authored Jun 4, 2018
2 parents 2c048fd + 8bf39a7 commit 7957507
Show file tree
Hide file tree
Showing 15 changed files with 6,639 additions and 3,236 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8.9.0
- image: circleci/node:8.9.0-browsers
environment:
CHROME_BIN: "/usr/bin/google-chrome"

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"no-console":0
},
"env": {
"browser": true
"browser": true,
"jasmine": true
}
}
20 changes: 0 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,7 @@ Create a new folder called `/experiments` in the project's root folder. Create a
## Running Unit Tests
This project uses [Jest](https://facebook.github.io/jest/) to run unit tests.
Jest is an open-source framework to run javascript tests.
If you are unfamiliar with running unit tests on Javascript, consider watching [this tutorial](https://egghead.io/lessons/javascript-unit-testing-with-mocha-and-chai).
We recommend having two open tabs in your terminal window: one monitoring your source code (as shown above) and another watching for unit tests.
To start the test environment, run:
```bash
npm run test:dev
```
This will watch for files changes and run tests when necessary.
If you just want to check if all tests are passing:
```bash
npm run test
```
## ML5 Website
Expand Down
2 changes: 1 addition & 1 deletion dist/ml5.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ml5.min.js

Large diffs are not rendered by default.

61 changes: 61 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Karma configuration
// Generated on Thu Mar 29 2018 11:50:44 GMT-0400 (EDT)

module.exports = (config) => {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['jasmine'],
// list of files / patterns to load in the browser
files: [
'src/*/*.test.js',
'src/images/*.jpg',
],
// list of files / patterns to exclude
exclude: [],
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
// add webpack as preprocessor
'src/*/*.test.js': ['webpack'],
},
webpack: {
// karma watches the test entry points
// (you don't need to specify the entry option)
// webpack watches dependencies

// webpack configuration

},
webpackMiddleware: {
// webpack-dev-middleware configuration
// i. e.
stats: 'errors-only',
},
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],
// web server port
port: 9876,
// enable / disable colors in the output (reporters and logs)
colors: true,
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
// browsers: ['Chrome', 'Firefox', 'Safari'],
browsers: ['Chrome'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false,
// Concurrency level
// how many browser should be started simultaneous
concurrency: Infinity,
});
};
Loading

0 comments on commit 7957507

Please sign in to comment.