diff options
| -rw-r--r-- | docs/content/guide/dev_guide.e2e-testing.ngdoc | 7 | ||||
| -rw-r--r-- | docs/content/misc/contribute.ngdoc | 6 | ||||
| -rwxr-xr-x | jenkins_build.sh | 1 | ||||
| -rw-r--r-- | lib/grunt/utils.js | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/docs/content/guide/dev_guide.e2e-testing.ngdoc b/docs/content/guide/dev_guide.e2e-testing.ngdoc index 4e58f839..ce4e586c 100644 --- a/docs/content/guide/dev_guide.e2e-testing.ngdoc +++ b/docs/content/guide/dev_guide.e2e-testing.ngdoc @@ -3,9 +3,10 @@ @name Developer Guide: E2E Testing @description -**If you're starting a new Angular project, you may want to look into -using {@link https://github.com/angular/protractor Protractor}, as it is going to -replace the current method of E2E Testing in the near future.** +**Angular Scenario Runner is in maintenance mode - If you're starting a new Angular project, +consider using {@link https://github.com/angular/protractor Protractor}.** + + As applications grow in size and complexity, it becomes unrealistic to rely on manual testing to verify the correctness of new features, catch bugs and notice regressions. diff --git a/docs/content/misc/contribute.ngdoc b/docs/content/misc/contribute.ngdoc index 5c7c2601..cfed161b 100644 --- a/docs/content/misc/contribute.ngdoc +++ b/docs/content/misc/contribute.ngdoc @@ -135,7 +135,7 @@ made available a local web server based on Node.js. ## Running the Unit Test Suite -We write unit and integration tests with Jasmine and execute them with Karma. To run all of the +We write unit tests with Jasmine and execute them with Karma. To run all of the tests once on Chrome run: ```shell @@ -178,11 +178,11 @@ grunt --help ## Running the End-to-end Test Suite -Simply run: +Angular's end to end tests are run with Protractor. Simply run: ```shell grunt test:e2e ``` -This will start the webserver and run the tests. +This will start the webserver and run the tests on Chrome. diff --git a/jenkins_build.sh b/jenkins_build.sh index 60a702b4..17610a92 100755 --- a/jenkins_build.sh +++ b/jenkins_build.sh @@ -35,7 +35,6 @@ grunt test:docgen --no-color grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color # END TO END TESTS # -grunt test:e2e --browsers $BROWSERS_E2E --reporters=dots,junit --no-colors --no-color grunt test:protractor # Promises/A+ TESTS # diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 24788bff..311bbef2 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -136,7 +136,12 @@ module.exports = { }, - updateWebdriver: function(done){ + updateWebdriver: function(done){ + if (process.env.TRAVIS) { + // Skip the webdriver-manager update on Travis, since the browsers will + // be provided remotely. + done(); + } var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']); p.stdout.pipe(process.stdout); p.stderr.pipe(process.stderr); |