Commit 262d7392 authored by MrMan's avatar MrMan

Add e2e test command, update Makefile & README

parent a2adc72c
.PHONY: all test clean
.PHONY: all test test-e2e clean
all: bundle jspm-css ffos-manifest public-files index-build build-completed-msg
......@@ -42,5 +42,8 @@ setup-dev:
test:
npm test
test-e2e:
npm run test-e2e
clean:
rm -rf dist/*
......@@ -31,16 +31,21 @@ To run the development build (which refreshes on file changes, using [entr](http
(this runs entr, which utilizes jspm to rebuild `dist/` when important files change)
## Running unit tests
## Running tests
To run the unit tests for Kindling (powered by [mocha](http://mochajs.org), run:
### Unit tests
To run the unit tests for Kindling, run:
`make test`
(this runs `npm test`, which ultimately runs mocha)
### End to end tests
To run the end to end tests for Kindling, run:
`make test-e2e`
## Contributing
0. Fork this repo
1. Add fixes
2. Make a PR
2. Run the unit and end to end tests
3. Make a PR
......@@ -42,7 +42,8 @@
"systemjs": "0.19.9"
},
"scripts": {
"test": "./node_modules/.bin/mocha --compilers js:babel-register -R nyan"
"test": "./node_modules/.bin/mocha --compilers js:babel-register -R nyan",
"test-e2e": "./node_modules/.bin/mocha --compilers js:babel-register -R nyan test/e2e"
},
"keywords": [
"tinder",
......
......@@ -44,11 +44,7 @@ describe("Login page", function() {
afterEach(done => {
// End the electron process
Promise.resolve(nm.end())
.then(() => {
console.log("Closed electron process");
done();
});
Promise.resolve(nm.end()).then(done);
});
after(() => NODE_SERVER.close());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment