Commit 74ec7bac authored by Tristan Cavelier's avatar Tristan Cavelier

jiotests updated

some jiotests_withoutrequirejs scripts were moved/removed/added,
jiotests.js updated to use only required denpendencies
parent 29e111b1
(function () { var thisfun = function(loader) { (function () { var thisfun = function(loader) {
var JIO = loader.JIO, var JIO = loader.JIO;
sjcl = loader.sjcl,
Base64 = loader.Base64,
$ = loader.jQuery;
// localStorage cleanup // localStorage cleanup
var k; var k;
...@@ -145,12 +142,12 @@ basicTickFunction = function (obj) { ...@@ -145,12 +142,12 @@ basicTickFunction = function (obj) {
myLog = function (html_string) { myLog = function (html_string) {
document.querySelector ('div#log').innerHTML += html_string + '<hr/>'; document.querySelector ('div#log').innerHTML += html_string + '<hr/>';
}, },
getXML = function (url) { // getXML = function (url) {
var tmp = ''; // var tmp = '';
$.ajax({'url':url,async:false, // $.ajax({'url':url,async:false,
dataType:'text',success:function(xml){tmp=xml;}}); // dataType:'text',success:function(xml){tmp=xml;}});
return tmp; // return tmp;
}, // },
objectifyDocumentArray = function (array) { objectifyDocumentArray = function (array) {
var obj = {}, k; var obj = {}, k;
for (k = 0; k < array.length; k += 1) { for (k = 0; k < array.length; k += 1) {
...@@ -3418,10 +3415,7 @@ if (window.requirejs) { ...@@ -3418,10 +3415,7 @@ if (window.requirejs) {
}); });
require(['jiotestsloader'],thisfun); require(['jiotestsloader'],thisfun);
} else { } else {
thisfun ({JIO:jIO, thisfun ({JIO:jIO});
sjcl:sjcl,
Base64:Base64,
jQuery:jQuery});
} }
}()); }());
...@@ -10,19 +10,25 @@ ...@@ -10,19 +10,25 @@
<script type="text/javascript" src="../lib/qunit/qunit.js"></script> <script type="text/javascript" src="../lib/qunit/qunit.js"></script>
<script type="text/javascript" src="../lib/sinon/sinon.js"></script> <script type="text/javascript" src="../lib/sinon/sinon.js"></script>
<script type="text/javascript" src="../lib/sinon/sinon-qunit.js"></script> <script type="text/javascript" src="../lib/sinon/sinon-qunit.js"></script>
<script type="text/javascript" src="../lib/jquery/jquery.min.js"></script>
<script type="text/javascript" src="./browserlocalstorage.stub.js"></script> <script type="text/javascript" src="./browserlocalstorage.stub.js"></script>
<script type="text/javascript" src="../lib/md5/md5.js"></script> <script type="text/javascript" src="../lib/md5/md5.js"></script>
<script type="text/javascript" src="../jio.js"></script> <script type="text/javascript" src="../jio.js"></script>
<script type="text/javascript" src="../lib/base64/base64.js"></script>
<script type="text/javascript" src="../lib/sjcl/sjcl.min.js"></script>
<script type="text/javascript" src="../lib/jsSha2/sha2.js"></script>
<script type="text/javascript" src="../src/jio.dummystorages.js"></script> <script type="text/javascript" src="../src/jio.dummystorages.js"></script>
<script type="text/javascript" src="../jio.storage.js"></script>
<script type="text/javascript" src="../src/jio.storage/localstorage.js">
</script>
<script type="text/javascript" src="../lib/jsSha2/sha2.js"></script>
<script type="text/javascript" src="../src/jio.storage/revisionstorage.js"> <script type="text/javascript" src="../src/jio.storage/revisionstorage.js">
</script> </script>
<script type="text/javascript"
src="../src/jio.storage/replicaterevisionstorage.js">
</script>
<script type="text/javascript" src="./jiotests.js"></script> <script type="text/javascript" src="./jiotests.js"></script>
</body> </body>
</html> </html>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment