Skip to content

Commit

Permalink
fix travis node tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Gagaro committed Nov 28, 2017
1 parent 5a6423d commit 302a6fb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ before_script:

script:
- python quicktest.py leaflet --db=$DATABASE
- node node_modules/django-leaflet-tests/node_modules/mocha-phantomjs/bin/mocha-phantomjs leaflet/tests/index.html
- node --version
- node node_modules/mocha-phantomjs/bin/mocha-phantomjs leaflet/tests/index.html

after_success:
- coverage run quicktest.py leaflet --db=$DATABASE
Expand Down
10 changes: 5 additions & 5 deletions leaflet/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<div id="map" style="display: none; height: 300px"></div>
<div id="mocha"></div>

<script src="../../node_modules/django-leaflet-tests/node_modules/happen/happen.js"></script>
<script src="../../node_modules/django-leaflet-tests/node_modules/chai/chai.js"></script>
<script src="../../node_modules/django-leaflet-tests/node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/django-leaflet-tests/node_modules/sinon/lib/sinon.js"></script>
<script src="../../node_modules/django-leaflet-tests/node_modules/sinon/lib/sinon/spy.js"></script>
<script src="../../node_modules/happen/happen.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/sinon/lib/sinon.js"></script>
<script src="../../node_modules/sinon/lib/sinon/spy.js"></script>

<script src="../../leaflet/static/leaflet/leaflet-src.js"></script>

Expand Down
11 changes: 6 additions & 5 deletions leaflet/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
"version": "0.8.0",
"description": "Fake package for tests purposes only",
"dependencies": {
"leaflet": "*",
"happen": "*",
"mocha": "1.9.x",
"chai": "1.6.x",
"leaflet": "1.0.3",
"happen": "0.3.x",
"mocha": "4.0.1",
"chai": "4.1.x",
"sinon": "1.7.x",
"mocha-phantomjs": "2.0.x"
"mocha-phantomjs": "4.1.x",
"phantomjs-prebuilt": "2.1.x"
}
}

0 comments on commit 302a6fb

Please sign in to comment.