Changeset 20887

Timestamp:

07/12/16 11:09:45 (9 years ago)

Author:

glperez

Message:

CHG: Modifications for Jenkins javascript tests.

Location:

issm/trunk-jpl/jenkins/javascript/karma

Files:

• karma.conf.js (modified) (3 diffs)
• package.json (modified) (1 diff)
• scripts/run-server.sh (modified) (1 diff)
• scripts/runscript.js (modified) (1 diff)

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

@@ -14 +14 @@
       'node_modules/jquery/dist/jquery.min.js',
       'node_modules/mathjs/dist/math.min.js',
-      'lib/bin/EnumDefinitions.js',
-      'lib/bin/issm-binaries.js',
-      'lib/bin/issm-extlibraries.js',
-      'lib/bin/matlabfunc.js',
       'lib/Exp/Square.js',
       'lib/Par/SquareShelfConstrained.js',
       'lib/Data/SquareShelfConstrained.data.js',
-      'lib/bin/mesh2d.js',
-      'lib/bin/mesh3dprisms.js',
-      'lib/bin/levelset.js',
-      'lib/bin/mask.js',
-      'lib/bin/geometry.js',
-      'lib/bin/friction.js',
-      'lib/bin/inversion.js',
-      'lib/bin/SMBforcing.js',
-      'lib/bin/initialization.js',
-      'lib/bin/flowequation.js',
-      'lib/bin/stressbalance.js',
-      'lib/bin/thermal.js',
-      'lib/bin/masstransport.js',
-      'lib/bin/calving.js',
-      'lib/bin/hydrologyshreve.js',
-      'lib/bin/matice.js',
-      'lib/bin/damage.js',
-      'lib/bin/qmu.js',
-      'lib/bin/basalforcings.js',
-      'lib/bin/DepthAverage.js',
-      'lib/bin/project2d.js',
-      'lib/bin/project3d.js',
-      'lib/bin/model.js',
-      //'scripts/specs/issm.spec.js'
+      'scripts/specs/issm.spec.js',
+      './../../../bin/issm-bin.js',
+      './../../../bin/issm-prebin.js',
+      './../../../bin/IssmModule.js'
       //'scripts/specs/temp.spec.js'
-      'scripts/test102.js'
       //'scripts/specs/3.spec.js'
     ],
@@ -84 +59 @@
 
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
+    autoWatch: false,
 
 
@@ -90 +65 @@
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     //browsers: ['Chrome'],
-    browsers: ['Chrome'],
+    browsers: ['Firefox'],
 
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false,
+    singleRun: true,
 
     // Concurrency level

issm/trunk-jpl/jenkins/javascript/karma/package.json

@@ -8 +8 @@
     "karma-jasmine-jquery": "^0.1.1",
     "karma-junit-reporter": "^1.0.0",
+    "karma-phantomjs-launcher": "^1.0.1",
     "karma-requirejs": "^1.0.0",
     "mathjs": "^3.2.1",
+    "phantomjs-prebuilt": "^2.1.7",
     "requirejs": "^2.2.0"
   }

issm/trunk-jpl/jenkins/javascript/karma/scripts/run-server.sh

@@ -1 +1 @@
 # Run a file server for serving the tests
-PORT="${1:-8080}"
+PORT="${1:-8081}"
 python2.7 -m SimpleHTTPServer $PORT

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

@@ -4 +4 @@
     });
 
-    var PORT=8080;
+    var PORT=8081;
     var tests = []; //last test to check