Changeset 21944

Timestamp:

08/12/17 12:21:20 (8 years ago)

Author:

dlcheng

Message:

CHG: Updating javascript testing files

Location:

issm/trunk-jpl/jenkins/javascript/karma

Files:

• index.html (modified) (1 diff)
• karma.conf.js (modified) (1 diff)
• lib (deleted)
• node_modules (deleted)
• scripts/runscript.js (modified) (2 diffs)
• spec (deleted)

issm/trunk-jpl/jenkins/javascript/karma/index.html

@@ -7 +7 @@
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"></link>
-        <script type="text/javascript" src="lib/bin/issm-binaries.js"> </script>
-        <script type="text/javascript" src="lib/bin/issm-extlibraries.js"> </script>
-        <script type="text/javascript" src="lib/Exp/Square.js"></script>
-        <script type="text/javascript" src="lib/Par/SquareShelfConstrained.js"></script>
-        <script type="text/javascript" src="lib/Data/SquareShelfConstrained.data.js"></script>
-        <script type="text/javascript" src="lib/mesh2d.js"></script>
-        <script type="text/javascript" src="lib/mesh3dprisms.js"></script>
-        <script type="text/javascript" src="lib/bin/model.js"></script>
-        <!--<script src="scripts/runscript.js"></script>-->
-        <script src="scripts/runscript.js"></script>
+        <script type="text/javascript" src="../../../bin/issm-bin.js"> </script>
+        <script type="text/javascript" src="../../../bin/IssmModule.js"> </script>
+        <script type="text/javascript" src="../../../bin/issm-prebin.js"> </script>
+        <script type="text/javascript" src="../../../test/Exp/Square.js"></script>
+        <script type="text/javascript" src="../../../test/Par/SquareShelfConstrained.js"></script>
+        <script type="text/javascript" src="../../../test/Data/SquareShelfConstrained.data.js"></script>
+        <script src="./scripts/runscript.js"></script>
 
         <style>

issm/trunk-jpl/jenkins/javascript/karma/karma.conf.js

@@ -12 +12 @@
     // list of files / patterns to load in the browser
     files: [
-      'node_modules/jquery/dist/jquery.min.js',
-      'node_modules/mathjs/dist/math.min.js',
+      './../../../externalpackages/emscripten/src/node/4.1.1_64bit/lib/node_modules/jquery/dist/jquery.min.js',
+      './../../../externalpackages/emscripten/src/node/4.1.1_64bit/lib/node_modules/mathjs/dist/math.min.js',
       'lib/Exp/Square.js',
       'lib/Par/SquareShelfConstrained.js',

issm/trunk-jpl/jenkins/javascript/karma/scripts/runscript.js

@@ -4 +4 @@
     });
 
-    var PORT=8081;
+    var PORT=80;
     var tests = []; //last test to check
 
@@ -30 +30 @@
             $('#debug').empty();
             var id = this.id.replace(/[^\d]/g, ''); 
-            $.getScript('http://localhost:'+PORT+'/test'+id+'.js', function(src, status) {
+            $.getScript('../../../test/NightlyRun/test'+id+'.js', function(src, status) {
                 console.log('='.repeat(30));
                 console.log('Status: ' + status);