jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix not-allowed inline scripts error

This commit is contained in:
Matt Corallo 2014-07-26 01:37:47 -04:00
parent a6b0d1f84b
commit d9f53d4c01
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/test.js
View File

@ -14,6 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
mocha.setup("bdd");
window.assert = chai.assert;
describe("ArrayBuffer->String conversion", function() {
it('works', function() {
var b = new ArrayBuffer(3);
@ -137,9 +140,9 @@ describe("Curve25519", function() {
// this is a just cute little trick to get a nice-looking note about
// which curve25519 impl we're using.
if (window.textsecure.nacl.USE_NACL) {
it("is NACL");
it("is NACL", function(done) { done(); });
} else {
it("is JavaScript");
it("is JavaScript", function(done) { done(); });
}
});
@ -395,3 +398,8 @@ describe("Axolotl", function() {
});
});
});
if (window.mochaPhantomJS)
mochaPhantomJS.run();
else
mocha.run();

15
test.html
View File

@ -19,11 +19,11 @@
<link rel="stylesheet" href="test/mocha.css" />
</head>
<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
<h2>Run this out of the chrome-plugin:// namespace (and expect plugin state to be cleared/corrupted), not file://</h2>
<div id="listener"></div>
<div id="log"></div>
<h2>Run this out of the chrome-plugin:// namespace (and expect plugin state to be cleared/corrupted), not file://</h1>
<div id="mocha">
</div>
<div id="tests">
@ -31,10 +31,6 @@
<script type="text/javascript" src="test/mocha.js"></script>
<script type="text/javascript" src="test/chai.js"></script>
<script>
mocha.setup("bdd")
window.assert = chai.assert;
</script>
<script type="text/javascript" src="js-deps/nacl-common.js"></script>
<script type="text/javascript" src="js-deps/jquery.js"></script>
@ -62,12 +58,5 @@
<script type="text/javascript" src="js/fake_api.js"></script>
<script type="text/javascript" src="js/testvectors.js"></script>
<script type="text/javascript" src="js/test.js"></script>
<script type="text/javascript">
if (window.mochaPhantomJS)
mochaPhantomJS.run();
else
mocha.run();
</script>
</body>
</html>