From 098340ce6da64dd169b601c0ca2554738975641f 2015-01-13 00:00:59
From: Min RK <benjaminrk@gmail.com>
Date: 2015-01-13 00:00:59
Subject: [PATCH] Merge pull request #7434 from takluyver/restore-test-all-js

Restore the ability to run all js tests with iptest js
---

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index 87b2459..cd313e2 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -431,8 +431,11 @@ def prepare_controllers(options):
     not to run."""
     testgroups = options.testgroups
     if testgroups:
-        js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
-        py_testgroups = [g for g in testgroups if g not in js_testgroups]
+        if 'js' in testgroups:
+            js_testgroups = all_js_groups()
+        else:
+            js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
+        py_testgroups = [g for g in testgroups if not g.startswith('js')]
     else:
         py_testgroups = py_test_group_names
         if not options.all: