npm test and grunt browsertest can run side by side now; npm tests pass, browser stuck on problem related to asn1.js

This commit is contained in:
Mahrud Sayrafi
2018-01-04 01:32:04 -08:00
committed by Sanjana Rajan
parent 21ae66c604
commit dcff16d32b
5 changed files with 93 additions and 45 deletions

View File

@@ -10,11 +10,11 @@
<div id="mocha"></div>
<!-- libs -->
<script src="../dist/openpgp.js"></script>
<script src="../dist/openpgp_browser.js"></script>
<script src="lib/chai.js"></script>
<script src="lib/mocha.js"></script>
<script src="lib/fetch.js"></script>
<script>
] <script>
mocha.setup('bdd');
mocha.timeout(240000);
</script>