Changeset 19:ab5f65372038 in pyenvjasmine for pyenvjasmine/envjasmine/lib/envjasmine.js

Timestamp:

Apr 24, 2015, 1:03:31 PM (9 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Imported latest envjasmine version, the initial import from darcs had the wrong version

File:

• pyenvjasmine/envjasmine/lib/envjasmine.js (modified) (8 diffs)

pyenvjasmine/envjasmine/lib/envjasmine.js

@@ -40 +40 @@
 };
 
+EnvJasmine.printDebug = function(str) {
+    if (EnvJasmine.debug) {
+        print(str);
+    }
+}
+
 EnvJasmine.normalizePath = function(path) {
     var endsInSlash = (path.slice(-1) == "/");
@@ -59 +65 @@
             EnvJasmine.cx.evaluateReader(scope, fileIn, normalizedPath, 0, null);
         } catch (e) {
+            print (e);
             print('Could not read file: ' + normalizedPath );
         } finally {
@@ -88 +95 @@
 };
 
+EnvJasmine.setJsDir = function(jsDir) {
+    EnvJasmine.jsDir = jsDir;
+};
+
 // Process command line options
-
 (function(argumentList) {
     var arg, nameValue, spec = "", specLoc;
@@ -97 +107 @@
     EnvJasmine.failedCount = 0;
     EnvJasmine.totalCount = 0;
-
     for (var i = 0; i < argumentList.length; i++) {
         arg = argumentList[i];
-
         if (arg.slice(0, 2) == "--") {
             nameValue = arg.slice(2).split('=');
-
             switch(nameValue[0]) {
                 case "testDir":
@@ -112 +119 @@
                     EnvJasmine.setTestDir(nameValue[1]); // Set the root as the default testDir.
                     break;
+                case "jsDir":
+                    EnvJasmine.setJsDir(nameValue[1]);
+                    break;
                 case "environment":
                     EnvJasmine.environment = nameValue[1];
@@ -129 +139 @@
                 case "customSpecsDir":
                     EnvJasmine.customSpecsDir = nameValue[1];
+                    break;
+                case "plugin":
+                    EnvJasmine.addPlugin(nameValue[1]);
+                    break;
+                case "debug":
+                    EnvJasmine.debug = true;
                     break;
                 case "help":
@@ -196 +212 @@
 EnvJasmine.results = [];
 
+EnvJasmine.addFinallyFunction = function(f) {
+    EnvJasmine.finallyFunctions.push(f);
+};
+EnvJasmine.finallyFunctions = [];
+
+
 EnvJasmine.loadConfig = function () {
     EnvJasmine.loadGlobal(EnvJasmine.configFile);
 };
 
+EnvJasmine.plugins = [];
+EnvJasmine.addPlugin = function(path) {
+    EnvJasmine.plugins.push(path);
+};
+
 (function() {
     var i, fileIn, len;
 
     EnvJasmine.loadConfig();
-    
+
+    for (i = 0; i < EnvJasmine.plugins.length; i++) {
+        EnvJasmine.loadGlobal(EnvJasmine.plugins[i]);
+    }
+
     if (typeof EnvJasmine.reporterClass === "undefined") {
         // Use the standard reporter
         EnvJasmine.reporterClass = RhinoReporter;
     }
-    
+
 
     jasmine.getEnv().addReporter(new EnvJasmine.reporterClass());
@@ -242 +273 @@
             EnvJasmine.cx.evaluateString(EnvJasmine.currentScope, 'window.location.assign(["file://", EnvJasmine.libDir, "envjasmine.html"].join(EnvJasmine.SEPARATOR));', 'Executing '+EnvJasmine.specs[i], 0, null);
         }
+        catch (e) {
+            print("Problem opening " + EnvJasmine.specFile + ": " + e);
+        }
         finally {
-            fileIn.close();
-        }
+            if(fileIn) {
+                fileIn.close();
+            }
+        }
+    }
+
+    for (i = 0; i < EnvJasmine.finallyFunctions.length; i++) {
+        EnvJasmine.finallyFunctions[i]();
     }