diff --git a/IPython/html/tests/util.js b/IPython/html/tests/util.js
index 7d9be63..2a04af4 100644
--- a/IPython/html/tests/util.js
+++ b/IPython/html/tests/util.js
@@ -3,9 +3,9 @@
//
casper.get_notebook_server = function () {
// Get the URL of a notebook server on which to run tests.
- port = casper.cli.get("port");
+ var port = casper.cli.get("port");
port = (typeof port === 'undefined') ? '8888' : port;
- return 'http://127.0.0.1:' + port;
+ return casper.cli.get("url") || 'http://127.0.0.1:' + port;
};
casper.open_new_notebook = function () {
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index 87277cd..ca4251e 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -220,16 +220,18 @@ def all_js_groups():
class JSController(TestController):
"""Run CasperJS tests """
+
requirements = ['zmq', 'tornado', 'jinja2', 'casperjs', 'sqlite3',
'jsonschema']
display_slimer_output = False
- def __init__(self, section, xunit=True, engine='phantomjs'):
+ def __init__(self, section, xunit=True, engine='phantomjs', url=None):
"""Create new test runner."""
TestController.__init__(self)
self.engine = engine
self.section = section
self.xunit = xunit
+ self.url = url
self.slimer_failure = re.compile('^FAIL.*', flags=re.MULTILINE)
js_test_dir = get_js_test_dir()
includes = '--includes=' + os.path.join(js_test_dir,'util.js')
@@ -247,14 +249,18 @@ class JSController(TestController):
if self.xunit:
self.add_xunit()
- # start the ipython notebook, so we get the port number
- self.server_port = 0
- self._init_server()
- if self.server_port:
- self.cmd.append("--port=%i" % self.server_port)
+ # If a url was specified, use that for the testing.
+ if self.url:
+ self.cmd.append("--url=%s" % self.url)
else:
- # don't launch tests if the server didn't start
- self.cmd = [sys.executable, '-c', 'raise SystemExit(1)']
+ # start the ipython notebook, so we get the port number
+ self.server_port = 0
+ self._init_server()
+ if self.server_port:
+ self.cmd.append("--port=%i" % self.server_port)
+ else:
+ # don't launch tests if the server didn't start
+ self.cmd = [sys.executable, '-c', 'raise SystemExit(1)']
def add_xunit(self):
xunit_file = os.path.abspath(self.section.replace('/','.') + '.xunit.xml')
@@ -401,7 +407,7 @@ def prepare_controllers(options):
js_testgroups = all_js_groups()
engine = 'slimerjs' if options.slimerjs else 'phantomjs'
- c_js = [JSController(name, xunit=options.xunit, engine=engine) for name in js_testgroups]
+ c_js = [JSController(name, xunit=options.xunit, engine=engine, url=options.url) for name in js_testgroups]
c_py = [PyTestController(name, options) for name in py_testgroups]
controllers = c_py + c_js
@@ -509,6 +515,9 @@ def run_iptestall(options):
slimerjs : bool
Use slimerjs if it's installed instead of phantomjs for casperjs tests.
+ url : unicode
+ Address:port to use when running the JS tests.
+
xunit : bool
Produce Xunit XML output. This is written to multiple foo.xunit.xml files.
@@ -637,6 +646,8 @@ argparser.add_argument('--all', action='store_true',
help='Include slow tests not run by default.')
argparser.add_argument('--slimerjs', action='store_true',
help="Use slimerjs if it's installed instead of phantomjs for casperjs tests.")
+argparser.add_argument('--url', const=None, default='', type=unicode,
+ help="URL to use for the JS tests.")
argparser.add_argument('-j', '--fast', nargs='?', const=None, default=1, type=int,
help='Run test sections in parallel. This starts as many '
'processes as you have cores, or you can specify a number.')