Skip to content

Commit

Permalink
shift to karma from testacular
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelneale committed Apr 10, 2013
1 parent fad6065 commit 35aa5a0
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ reverse-proxying the backend server(s) and a webserver(s).
### Running unit tests

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

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

* start `scripts/test.sh` (on windows: `scripts\test.bat`)
* 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)
* 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)
* to run or re-run tests just change any of your source or test javascript files


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

### Continuous Integration
Expand Down Expand Up @@ -121,14 +121,14 @@ fetch the changes and merge them into your project with git.
partial1.html
partial2.html

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

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

test/ --> test source files and libraries
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/e2e-test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ REM You have to run server and capture some browser first
REM
REM Requirements:
REM - NodeJS (http://nodejs.org/)
REM - Testacular (npm install -g testacular)
REM - karma (npm install -g karma)

set BASE_DIR=%~dp0
testacular start "%BASE_DIR%\..\config\testacular-e2e.conf.js" %*
karma start "%BASE_DIR%\..\config\karma-e2e.conf.js" %*
4 changes: 2 additions & 2 deletions scripts/e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
BASE_DIR=`dirname $0`

echo ""
echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
echo "Starting karma Server (http://vojtajina.github.com/karma)"
echo "-------------------------------------------------------------------"

testacular start $BASE_DIR/../config/testacular-e2e.conf.js $*
karma start $BASE_DIR/../config/karma-e2e.conf.js $*
4 changes: 2 additions & 2 deletions scripts/test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ REM You have to run server and capture some browser first
REM
REM Requirements:
REM - NodeJS (http://nodejs.org/)
REM - Testacular (npm install -g testacular)
REM - karma (npm install -g karma)

set BASE_DIR=%~dp0
testacular start "%BASE_DIR%\..\config\testacular.conf.js" %*
karma start "%BASE_DIR%\..\config\karma.conf.js" %*
4 changes: 2 additions & 2 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
BASE_DIR=`dirname $0`

echo ""
echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
echo "Starting karma Server (http://vojtajina.github.com/karma)"
echo "-------------------------------------------------------------------"

testacular start $BASE_DIR/../config/testacular.conf.js $*
karma start $BASE_DIR/../config/karma.conf.js $*

0 comments on commit 35aa5a0

Please sign in to comment.