Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Stub trimChat for PhantomJS and move tests_main.js to tests/main.js

Browse Source
This commit is contained in:
JC Brand 2014-05-06 09:56:04 +02:00
parent ad466b62a0
commit 364c340ab5
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.js
View File

@ -1,4 +1,5 @@
config = { config = {
baseUrl: '.',
paths: { paths: {
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort", "jquery.tinysort": "components/tinysort/src/jquery.tinysort",

2
tests.html
View File

@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<script src="main.js"></script> <script src="main.js"></script>
<script data-main="tests_main" src="components/requirejs/require.js"></script> <script data-main="tests/main" src="components/requirejs/require.js"></script>
</head> </head>
<body> <body>

3
tests_main.js → tests/main.js
View File

@ -67,6 +67,9 @@ require([
], function () { ], function () {
// Make sure this callback is only called once. // Make sure this callback is only called once.
delete converse.callback; delete converse.callback;
// Stub the trimChat method. It causes havoc when running with
// phantomJS.
converse.ChatBoxView.prototype.trimChat = function () {};
// Jasmine stuff // Jasmine stuff
var jasmineEnv = jasmine.getEnv(); var jasmineEnv = jasmine.getEnv();