aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudhir Jonathan2012-10-21 11:50:16 +0530
committerIgor Minar2012-10-31 17:00:00 -0700
commit8ce84cb2eaf34bf084431ba09174be33253abe91 (patch)
tree6894ff5139b15b4d90efea6c05f9443dd6479cbf
parentd981c2a3ecfaf572a836c7533ee3a9553aae327d (diff)
downloadangular.js-8ce84cb2eaf34bf084431ba09174be33253abe91.tar.bz2
chore(testacular): use local testacular version
Making testacular a dependency to avoid having to install it globally. (Causes npm issues on some machines)
-rw-r--r--Rakefile2
-rw-r--r--docs/content/misc/contribute.ngdoc6
-rw-r--r--package.json1
3 files changed, 2 insertions, 7 deletions
diff --git a/Rakefile b/Rakefile
index 8b609082..16b3bcd1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -348,7 +348,7 @@ end
def start_testacular(config, singleRun, browsers, misc_options)
- sh "testacular start " +
+ sh "./node_modules/testacular/bin/testacular start " +
"#{config} " +
"#{'--single-run=true' if singleRun} " +
"#{'--browsers=' + browsers.gsub('+', ',') if browsers} " +
diff --git a/docs/content/misc/contribute.ngdoc b/docs/content/misc/contribute.ngdoc
index 3cd78842..bab8ae2e 100644
--- a/docs/content/misc/contribute.ngdoc
+++ b/docs/content/misc/contribute.ngdoc
@@ -99,12 +99,6 @@ pre-packaged bundle.
* `npm install`
-* Lastly, you'll also need Testacular our spectacular test runner that we use for running unit and end-to-end tests.
-
- * `sudo npm install -g testacular`
-
-
-
## Creating a Github Account and Forking Angular
To create a Github account, follow the instructions {@link https://github.com/signup/free here}.
diff --git a/package.json b/package.json
index e9849fe2..b3833816 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
"name": "AngularJS",
"version": "0.0.0",
"dependencies" : {
+ "testacular" : "canary",
"jasmine-node" : "*",
"q-fs" : "*",
"qq" : "*"