Commit Graph

11 Commits

Author SHA1 Message Date
rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Filipe Silva 5042b3021c chore(test): add protractor4 (#2233)
* chore(test): add protractor4

* fix lint, remove boilerplate files, fix less gen

* separate scripts between package.json

* ignore a2docs.css in boilerplate

* remove tslint in _examples
2016-10-06 15:25:52 -07:00
Ward Bell 8a5df4cfa9 chore: support e2e-specs written in TypeScript
Update gulpfile and project to add a tsconfig to protractor test folders
Change all sample e2e-spec.js -> e2e-spec.ts
Split typings between e2e-spec & app code
Use same config for all e2e tests
Only 1/3 e2e specs truly converted.
Most don't pass because they fail TS transpile by Protractor due to missing type annotations
2016-05-31 22:03:13 -07:00
Foxandxss 9b2c54e77f chore: disable ngAnimate for ng1 protractor tests
closes #1543
2016-05-29 14:34:15 -07:00
Ward Bell 269269a54d chore: revert `sendKeys` change from e1862887
closes #1175
2016-04-25 15:49:38 -07:00
Ward Bell e1862887ae docs(testing): more testing samples and infrastructure setup
added wallaby config; revised karma-test-shim
2016-04-22 13:24:44 -07:00
Ward Bell 555ec46be3 docs(e2e): workaround comp-comm interval timer tests
closes #1081
Note how `browser.get('?e2e')` enables app to know it is running under protractor
2016-04-12 18:51:17 -07:00
Tero Parviainen ec4c1edff4 docs(upgrade): add E2E tests, update PhoneCat dependencies
closes #1070
Separates UpgradeAdapter reference guide examples from the PhoneCat tutorial examples
and update dependencies for phonecat upgrade examples
2016-04-11 12:40:09 -07:00
Jay Traband 3460f35a9f chore(testing): updated jasmine.Reporter
See #670
2016-01-08 18:47:14 -08:00
Jay Traband a5067e6bab chore(testing): e2e testing improvements; more devguide sample tests
closes #643
2016-01-04 11:23:48 -08:00
Jay Traband 872064e12e feat(e2e testing): testing framework + initial tests
close #604
2015-12-30 17:58:09 -08:00