Skip to content

Commit

Permalink
Removed mocha .gitmodule and added as NPM devDependency
Browse files Browse the repository at this point in the history
make test uses NPM modules

Removed 0.9 and added make before_script

Added make to travis install

Make is installed, so reference component via NPM

Component doesn't work with 0.6
  • Loading branch information
ericclemmons committed Dec 19, 2012
1 parent c94e3dd commit 556875e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
components
build
node_modules
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- 0.6
- 0.8
- 0.9
before_script:
- make
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
build: index.js components
@component build --dev
@node_modules/.bin/component build --dev

components: component.json
@component install --dev
@node_modules/.bin/component install --dev

clean:
rm -fr build components template.js

test:
@mocha-phantomjs test/index.html
@node_modules/.bin/mocha-phantomjs test/index.html

.PHONY: test clean
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,10 @@
"event"
],
"author": "Eric Clemmons <eric@smarterspam.com>",
"license": "MIT"
"license": "MIT",
"devDependencies": {
"component": "~0.10.1",
"mocha": "~1.7.4",
"mocha-phantomjs": "~1.1.1"
}
}
4 changes: 2 additions & 2 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<head>
<title>unique-selector tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="mocha/mocha.css" />
<script src="mocha/mocha.js"></script>
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
<script src="../node_modules/mocha/mocha.js"></script>
<script>
mocha.setup({
'ignoreLeaks' : true,
Expand Down
1 change: 0 additions & 1 deletion test/mocha
Submodule mocha deleted from 0eb8c2

0 comments on commit 556875e

Please sign in to comment.