Changes in pyenvjasmine/runner.py [36:4c964b691922:33:d466f464c871] in pyenvjasmine

File:

• pyenvjasmine/runner.py (modified) (8 diffs)

pyenvjasmine/runner.py

@@ -89 +89 @@
 
     watchdog.cancel()  # if it's still waiting to run
+
     # if it timed out, success is False
     success = (not kill_check.isSet()) and p.returncode >= 0
@@ -94 +95 @@
     return (success, ''.join(stdout_l), stderr)
 
+
 class Runner(object):
     """
@@ -103 +105 @@
 
     def __init__(self, rootdir=None, testdir=None, configfile=None,
-                 browser_configfile=None, testing_enviroment='phantomjs'):
+                 browser_configfile=None):
         """
         Set up paths, by default everything is
@@ -125 +127 @@
         self.configfile = configfile
         self.browser_configfile = browser_configfile
-        self.runner_js = os.path.join(here, 'run-jasmine3.js')
-        self.testing_enviroment = testing_enviroment
+        self.runner_html = os.path.join(here, 'runner.html')
+
+    def run(self, spec=None, timeout=None):
+        """
+        Run the js tests with envjasmine, return success (true/false) and
+        the captured stdout data
+
+        spec: (relative) path to a spec file (run only that spec)
+        timeout: Set it to a given number of seconds and the process running
+                 the js tests will be killed passed that time
+        """
         environment = get_environment()
         rhino_path = os.path.join(self.rootdir, 'lib', 'rhino', 'js.jar')
@@ -132 +143 @@
         rootdir_param = '--rootDir=%s' % self.rootdir
         testdir_param = '--testDir=%s' % self.testdir
-
-        # using a dictionary to parameterize the different engines
-        self.envs = {
-            'phantomjs' : {
-                'command' : [
-                    'phantomjs',
-                    '--debug=true',
-                    self.runner_js,
-                    'browser.runner.html'
-                ],
-                'runner_html' : 'runner3.html',
-                'failed_mark' : 'FAILED',
-                'success_mark' : '0 failures'
-            },
-            'rhino' : {
-                'command' : [
-                    'java',
-                    '-Duser.timezone=US/Eastern',
-                    '-Dfile.encoding=utf-8',
-                    '-jar',
-                    rhino_path,
-                    envjasmine_js_path,
-                    '--disableColor',
-                    environment,
-                    rootdir_param,
-                    testdir_param
-                ],
-                'runner_html' : 'runner.html',
-                'failed_mark' : 'FAILED',
-                'success_mark' : 'Failed: 0',
-                'command_params_func' : self.command_params_rhino
-            }
-        }
-        self.runner_html = os.path.join(here,
-                              self.envs[self.testing_enviroment]['runner_html'])
-
-    def command_params_rhino(self, command):
-        """
-        Function specific to Rhino to add eventual arguments to the command line.
-        The function is referenced in the dictionary "envs" with key
-        "command_params_func", and for every engine that needs the same type of
-        manipulation there will be a similar function with relative reference in
-        the dictionary
-        """
-        if self.configfile and os.path.exists(self.configfile):
-           command.append('--configFile=%s' % self.configfile)
-        return command
-
-    def run(self, spec=None, timeout=None):
-        """
-        Run the js tests with envjasmine, return success (true/false) and
-        the captured stdout data
-
-        spec: (relative) path to a spec file (run only that spec)
-        timeout: Set it to a given number of seconds and the process running
-                 the js tests will be killed passed that time
-        """
         if self.browser_configfile and os.path.exists(self.browser_configfile):
             self.write_browser_htmlfile()
-        command = self.envs[self.testing_enviroment]['command']
-        # Add eventual other parameters to the command by calling a
-        # function specific for the selected engine (rhino, phantomjs, etc.)
-        if 'command_params_func' in self.envs[self.testing_enviroment]:
-            command = self.envs[self.testing_enviroment]['command_params_func'](command)
+
+        command = [
+            'java',
+            '-Duser.timezone=US/Eastern',
+            '-Dfile.encoding=utf-8',
+            '-jar',
+            rhino_path,
+            envjasmine_js_path,
+            '--disableColor',
+            environment,
+            rootdir_param,
+            testdir_param
+            ]
+
+        if self.configfile and os.path.exists(self.configfile):
+            command.append('--configFile=%s' % self.configfile)
+
         # if we were asked to test only some of the spec files,
         # addd them to the command line:
@@ -208 +174 @@
         stderr = subprocess.PIPE
         input_data = ''
+
         success, stdout, stderr = run_popen_with_timeout(
             command, timeout, input_data, stdin, stdout, stderr
@@ -219 +186 @@
 
     def did_test_pass(self, stdout):
-        if self.envs[self.testing_enviroment]['failed_mark'] in stdout:
+        if 'FAILED' in stdout:
             # it can happen that a test fails because of some timing issues
             # (timer error). In such case it may happen that the test does
@@ -231 +198 @@
         # tests passing ok
         for line in stdout.splitlines():
-            if self.envs[self.testing_enviroment]['success_mark'] in line:
-                return True
+            if 'Failed' in line:
+                failed = line.split(':')[1].strip()
+                return failed == '0'
         return False