aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/tutorial/step_02.ngdoc
diff options
context:
space:
mode:
authorPete Bacon Darwin2013-04-15 12:28:31 +0100
committerPete Bacon Darwin2013-04-15 12:30:33 +0100
commitef334d0070754a40d9330ab496bd80587de2ccc3 (patch)
treef78c88e5be3626ec5122c82680ef5afaf7809c46 /docs/content/tutorial/step_02.ngdoc
parent9f08d039782f917caeec4289c8caecec4e81adb2 (diff)
downloadangular.js-ef334d0070754a40d9330ab496bd80587de2ccc3.tar.bz2
docs(tutorial): testacular renamed to karma
Replaced instances of 'Testacular' with 'Karma' to reflect name change of test runner. Replaced instances of 'http://vojtajina.github.com/testacular' with 'http://karma-runner.github.io/' to reflect dedicated page for Karma Test Runner. Added location of config file needed to start the Karma server. This is still labeled 'testacular.conf.js' and needs file name to be updated in the phone example repo.
Diffstat (limited to 'docs/content/tutorial/step_02.ngdoc')
-rw-r--r--docs/content/tutorial/step_02.ngdoc13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/content/tutorial/step_02.ngdoc b/docs/content/tutorial/step_02.ngdoc
index d874b8ba..d8fa03f9 100644
--- a/docs/content/tutorial/step_02.ngdoc
+++ b/docs/content/tutorial/step_02.ngdoc
@@ -146,24 +146,25 @@ http://pivotal.github.com/jasmine/ Jasmine home page} and on the {@link
https://github.com/pivotal/jasmine/wiki Jasmine wiki}.
The angular-seed project is pre-configured to run all unit tests using {@link
-http://vojtajina.github.com/testacular/ Testacular}. To run the test, do the following:
+http://karma-runner.github.io/ Karma}. To run the test, do the following:
1. In a _separate_ terminal window or tab, go to the `angular-phonecat` directory and run
-`./scripts/test.sh` to start the Testacular server.
+`./scripts/test.sh` to start the Karma server (the config file necessary to start the server
+is located at `./config/testacular.conf.js`).
-2. Testacular will start a new instance of Chrome browser automatically. Just ignore it and let it run in
- the background. Testacular will use this browser for test execution.
+2. Karma will start a new instance of Chrome browser automatically. Just ignore it and let it run in
+ the background. Karma will use this browser for test execution.
3. You should see the following or similar output in the terminal:
- info: Testacular server started at http://localhost:9876/
+ info: Karma server started at http://localhost:9876/
info (launcher): Starting browser "Chrome"
info (Chrome 22.0): Connected on socket id tPUm9DXcLHtZTKbAEO-n
Chrome 22.0: Executed 1 of 1 SUCCESS (0.093 secs / 0.004 secs)
Yay! The test passed! Or not...
-4. To rerun the tests, just change any of the source or test files. Testacular will notice the change
+4. To rerun the tests, just change any of the source or test files. Karma will notice the change
and will rerun the tests for you. Now isn't that sweet?
# Experiments