Show More
@@ -181,7 +181,14 b' class JSController(TestController):' | |||||
181 | import IPython.html.tests as t |
|
181 | import IPython.html.tests as t | |
182 | test_dir = os.path.join(os.path.dirname(t.__file__), 'casperjs') |
|
182 | test_dir = os.path.join(os.path.dirname(t.__file__), 'casperjs') | |
183 | includes = '--includes=' + os.path.join(test_dir,'util.js') |
|
183 | includes = '--includes=' + os.path.join(test_dir,'util.js') | |
|
184 | ||||
|
185 | if self.section == 'js': | |||
184 | test_cases = os.path.join(test_dir, 'test_cases') |
|
186 | test_cases = os.path.join(test_dir, 'test_cases') | |
|
187 | elif self.section == 'notebook': | |||
|
188 | test_cases = os.path.join(test_dir, 'test_cases', 'notebook') | |||
|
189 | elif self.section == 'widgets': | |||
|
190 | test_cases = os.path.join(test_dir, 'test_cases', 'widgets') | |||
|
191 | ||||
185 | port = '--port=' + str(self.server_port) |
|
192 | port = '--port=' + str(self.server_port) | |
186 | self.cmd = ['casperjs', 'test', port, includes, test_cases] |
|
193 | self.cmd = ['casperjs', 'test', port, includes, test_cases] | |
187 |
|
194 | |||
@@ -203,7 +210,7 b' class JSController(TestController):' | |||||
203 | self.server.join() |
|
210 | self.server.join() | |
204 | TestController.cleanup(self) |
|
211 | TestController.cleanup(self) | |
205 |
|
212 | |||
206 | js_test_group_names = {'js'} |
|
213 | js_test_group_names = {'js', 'notebook', 'widgets'} | |
207 |
|
214 | |||
208 | def run_webapp(q, ipydir, nbdir, loglevel=0): |
|
215 | def run_webapp(q, ipydir, nbdir, loglevel=0): | |
209 | """start the IPython Notebook, and pass port back to the queue""" |
|
216 | """start the IPython Notebook, and pass port back to the queue""" |
General Comments 0
You need to be logged in to leave comments.
Login now