Skip to content

Commit 35aa5a0

Browse files
committed
shift to karma from testacular
1 parent fad6065 commit 35aa5a0

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ reverse-proxying the backend server(s) and a webserver(s).
5353
### Running unit tests
5454

5555
We recommend using [jasmine](http://pivotal.github.com/jasmine/) and
56-
[Testacular](http://vojtajina.github.com/testacular/) for your unit tests/specs, but you are free
56+
[karma](http://vojtajina.github.com/karma/) for your unit tests/specs, but you are free
5757
to use whatever works for you.
5858

59-
Requires [node.js](http://nodejs.org/), Testacular (`sudo npm install -g testacular`) and a local
59+
Requires [node.js](http://nodejs.org/), karma (`sudo npm install -g karma`) and a local
6060
or remote browser.
6161

6262
* start `scripts/test.sh` (on windows: `scripts\test.bat`)
63-
* a browser will start and connect to the Testacular server (Chrome is default browser, others can be captured by loading the same url as the one in Chrome or by changing the `config/testacular.conf.js` file)
63+
* a browser will start and connect to the karma server (Chrome is default browser, others can be captured by loading the same url as the one in Chrome or by changing the `config/karma.conf.js` file)
6464
* to run or re-run tests just change any of your source or test javascript files
6565

6666

@@ -79,7 +79,7 @@ info.
7979
* serve your project directory with your http/backend server or node.js + `scripts/web-server.js`
8080
* to run do one of:
8181
* open `http://localhost:port/test/e2e/runner.html` in your browser
82-
* run the tests from console with [Testacular](vojtajina.github.com/testacular) via
82+
* run the tests from console with [karma](vojtajina.github.com/karma) via
8383
`scripts/e2e-test.sh` or `script/e2e-test.bat`
8484

8585
### Continuous Integration
@@ -121,14 +121,14 @@ fetch the changes and merge them into your project with git.
121121
partial1.html
122122
partial2.html
123123

124-
config/testacular.conf.js --> config file for running unit tests with Testacular
125-
config/testacular-e2e.conf.js --> config file for running e2e tests with Testacular
124+
config/karma.conf.js --> config file for running unit tests with karma
125+
config/karma-e2e.conf.js --> config file for running e2e tests with karma
126126

127127
scripts/ --> handy shell/js/ruby scripts
128-
e2e-test.sh --> runs end-to-end tests with Testacular (*nix)
129-
e2e-test.bat --> runs end-to-end tests with Testacular (windows)
130-
test.bat --> autotests unit tests with Testacular (windows)
131-
test.sh --> autotests unit tests with Testacular (*nix)
128+
e2e-test.sh --> runs end-to-end tests with karma (*nix)
129+
e2e-test.bat --> runs end-to-end tests with karma (windows)
130+
test.bat --> autotests unit tests with karma (windows)
131+
test.sh --> autotests unit tests with karma (*nix)
132132
web-server.js --> simple development webserver based on node.js
133133

134134
test/ --> test source files and libraries
File renamed without changes.
File renamed without changes.

scripts/e2e-test.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ REM You have to run server and capture some browser first
55
REM
66
REM Requirements:
77
REM - NodeJS (http://nodejs.org/)
8-
REM - Testacular (npm install -g testacular)
8+
REM - karma (npm install -g karma)
99

1010
set BASE_DIR=%~dp0
11-
testacular start "%BASE_DIR%\..\config\testacular-e2e.conf.js" %*
11+
karma start "%BASE_DIR%\..\config\karma-e2e.conf.js" %*

scripts/e2e-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
BASE_DIR=`dirname $0`
44

55
echo ""
6-
echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
6+
echo "Starting karma Server (http://vojtajina.github.com/karma)"
77
echo "-------------------------------------------------------------------"
88

9-
testacular start $BASE_DIR/../config/testacular-e2e.conf.js $*
9+
karma start $BASE_DIR/../config/karma-e2e.conf.js $*

scripts/test.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ REM You have to run server and capture some browser first
55
REM
66
REM Requirements:
77
REM - NodeJS (http://nodejs.org/)
8-
REM - Testacular (npm install -g testacular)
8+
REM - karma (npm install -g karma)
99

1010
set BASE_DIR=%~dp0
11-
testacular start "%BASE_DIR%\..\config\testacular.conf.js" %*
11+
karma start "%BASE_DIR%\..\config\karma.conf.js" %*

scripts/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
BASE_DIR=`dirname $0`
44

55
echo ""
6-
echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
6+
echo "Starting karma Server (http://vojtajina.github.com/karma)"
77
echo "-------------------------------------------------------------------"
88

9-
testacular start $BASE_DIR/../config/testacular.conf.js $*
9+
karma start $BASE_DIR/../config/karma.conf.js $*

0 commit comments

Comments
 (0)