diff options
Diffstat (limited to 'tests/frontend/helper.js')
| -rw-r--r-- | tests/frontend/helper.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/frontend/helper.js b/tests/frontend/helper.js index 196414a9..ec4bd19c 100644 --- a/tests/frontend/helper.js +++ b/tests/frontend/helper.js @@ -7,7 +7,8 @@ var helper = {}; $iframeContainer = $("#iframe-container"); $.get('/static/js/jquery.js').done(function(code){ - jsLibraries["jquery"] = code; + // make sure we don't override existing jquery + jsLibraries["jquery"] = "if(typeof $ === 'undefined') {\n" + code + "\n}"; $.get('/tests/frontend/sendkeys.js').done(function(code){ jsLibraries["sendkeys"] = code; |