Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set up Karma and Browserify #378

Merged
merged 18 commits into from
Dec 21, 2016
Merged

Set up Karma and Browserify #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c50b33f
docs: Simplified language in the opening paragraph. Closes #340
yamikuronue Dec 15, 2016
2a146b6
fix: Adjust wording as per @thebigredgeek
yamikuronue Dec 16, 2016
f42b962
refactor: Moved source files to /src. Moved test files to client and …
yamikuronue Dec 16, 2016
88766af
fix: update package.json so karma gets installed.
yamikuronue Dec 16, 2016
adf6ccf
fix: Add karma-mocha dependency, and remove browserify
yamikuronue Dec 16, 2016
bb1e132
chore: add phantomjs for travis
yamikuronue Dec 16, 2016
6bc5986
test: Added an expectation to the client-side test, and the necessary…
yamikuronue Dec 16, 2016
46ccb74
Testing precommit hook by tweaking linting issues
yamikuronue Dec 16, 2016
9011c5a
chore: Add pre-commit hook via ghooks so it can be shared
yamikuronue Dec 19, 2016
92e0e88
feature: Combined backend and frontend tests
yamikuronue Dec 19, 2016
0d7c9eb
fix: remove ES6 features since this also now runs on the browser
yamikuronue Dec 19, 2016
6a8d525
chore: add coveralls
yamikuronue Dec 19, 2016
2a01c6c
Merged from upstream/master. I left the dist/debug in place because m…
yamikuronue Dec 20, 2016
67182fd
fix: Whoops, didn't merge the tests properly. Resolved.
yamikuronue Dec 20, 2016
3e1a15d
fix: merged again, because it didn't take. Guess I did it wrong?
yamikuronue Dec 20, 2016
23af483
Merge remote-tracking branch 'upstream/master' into replace-babel-wit…
AccaliaDeElementia Dec 20, 2016
f484cfe
fix merge errors
AccaliaDeElementia Dec 20, 2016
f512cf2
Merge remote-tracking branch 'upstream/master' into replace-babel-wit…
AccaliaDeElementia Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ install:
script:
- make lint
- make test
- make coveralls
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ lint: .FORCE
eslint browser.js debug.js index.js node.js

test: .FORCE
mocha

istanbul cover node_modules/mocha/bin/_mocha -- test/**.js
karma start --single-run

coveralls:
cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

.PHONY: all install clean distclean
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "visionmedia-debug",
"main": "./debug.js",
"main": "./src/debug.js",
"homepage": "https://github.com/visionmedia/debug",
"authors": [
"TJ Holowaychuk <tj@vision-media.ca>",
Expand Down
6 changes: 3 additions & 3 deletions component.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"log",
"debugger"
],
"main": "browser.js",
"main": "src/browser.js",
"scripts": [
"browser.js",
"debug.js"
"src/browser.js",
"src/debug.js"
],
"dependencies": {
"rauchg/ms.js": "0.7.1"
Expand Down
Loading