From e8607c7bcacc74ccf34bb93e6cd508216fa8975f Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 19 Apr 2016 09:17:13 +0000
Subject: [PATCH] SSDM-3524 : Jquery set to non conflict mode, now needs to be
declared explicitly
SVN: 36224
---
.../tests/1/as/webapps/openbis-v3-api-test/html/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/index.html b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/index.html
index 2f9cf3b638e..437e84dbb24 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/index.html
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/index.html
@@ -27,7 +27,7 @@
<script src="/openbis/resources/api/v3/require.js"></script>
<script>
- require([ 'test/qunit', 'test/qunit-report', 'test/main' ], function(qunit, report, main) {
+ require([ 'jquery', 'test/qunit', 'test/qunit-report', 'test/main' ], function($, qunit, report, main) {
qunit.config.autostart = false;
qunit.config.testTimeout = 10000;
qunit.jUnitReport = function(report) {
--
GitLab