Skip to content

Commit f8ade20

Browse files
juliemrigniteram
authored andcommitted
docs(website): fix up some old information about AngularJS vs Angular (angular#4038)
1 parent a39f858 commit f8ade20

File tree

6 files changed

+20
-23
lines changed

6 files changed

+20
-23
lines changed

docs/debugging.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ wd-debug>
7676
```
7777

7878
Enter `c` to move the test forward by one task.
79-
Enter `repl` to enter interactive mode. In interactive mode, you can send
79+
80+
While the test is paused you may also interact with the browser. Note that
81+
if you open the Chrome Dev Tools, you must close them before continuing
82+
the test because ChromeDriver cannot operate when the Dev Tools are open.
83+
84+
When you finish debugging, exit by pressing `Ctrl-C`. Your tests will continue
85+
where they left off, using the same browser.
86+
87+
You can also use `browser.explore()` in your test script to pause and enter
88+
an interactive repl loop. In this interactive mode, you can send
8089
WebDriver commands to your browser. The resulting value or error will
8190
be reported to the terminal.
8291

@@ -88,13 +97,6 @@ NoSuchElementError: No element found using locator: by.binding("nopenopenope")
8897
'Anon'
8998
```
9099

91-
While the test is paused you may also interact with the browser. Note that
92-
if you open the Chrome Dev Tools, you must close them before continuing
93-
the test because ChromeDriver cannot operate when the Dev Tools are open.
94-
95-
When you finish debugging, exit by pressing `Ctrl-C`. Your tests will continue
96-
where they left off, using the same browser.
97-
98100
**Note:** Since these are asynchronous tasks, you would have to increase the default timeout of your specs else default timeout exception would be thrown!
99101

100102
**Using debugger**

docs/faq.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ with more info.
2525
Angular can't be found on my page
2626
---------------------------------
2727

28-
Protractor supports angular 1.0.6/1.1.4 and higher - check that your version of Angular is upgraded.
28+
Protractor supports Angular and AngularJS 1.0.6/1.1.4 and higher - check that your version of Angular is upgraded.
2929

30-
The `angular` variable is expected to be available in the global context. Try opening chrome devtools or firefox and see if `angular` is defined.
30+
For AngularJS apps, the `angular` variable is expected to be available in the global context. Try opening chrome devtools or firefox and see if `angular` is defined.
31+
32+
For Angular apps, you should see a global method `getAllAngularTestabilities`.
3133

3234
How do I deal with my log-in page?
3335
----------------------------------

docs/locators.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ by.css('.myclass')
2525
by.id('myid')
2626

2727
// Find an element with a certain ng-model.
28+
// Note that at the moment, this is only supported for AngularJS apps.
2829
by.model('name')
2930

3031
// Find an element bound to the given variable.
32+
// Note that at the moment, this is only supported for AngularJS apps.
3133
by.binding('bindingname')
3234
```
3335

lib/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
967967
// TODO: support mock modules in Angular2. For now, error if someone
968968
// has tried to use one.
969969
if (this.mockModules_.length > 1) {
970-
throw 'Trying to load mock modules on an Angular2 app is not yet supported.';
970+
throw 'Trying to load mock modules on an Angular v2+ app is not yet supported.';
971971
}
972972
}
973973
})

spec/angular2Conf.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
var env = require('./environment');
22

3-
// This is the configuration for a smoke test for an Angular2 application.
4-
//
5-
// *** NOTE ***
6-
// As Angular2 is in rapid development, the test application that ships with
7-
// the Protractor repository does not yet contain an Angular2 section. This
8-
// configuration assumes that you are serving the examples from the
9-
// angular/angular repository at localhost:8000.
10-
// See https://github.com/angular/angular/blob/master/DEVELOPER.md for
11-
// setup instructions.
12-
//
3+
// This is the configuration for a smoke test for an Angular TypeScript application.
134
exports.config = {
145
seleniumAddress: env.seleniumAddress,
156

website/partials/home.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div ptor-twitter></div>
1313

1414
<p class="lead">
15-
Protractor is an end-to-end test framework for AngularJS applications.
15+
Protractor is an end-to-end test framework for Angular and AngularJS applications.
1616
Protractor runs tests against your application running in a real browser,
1717
interacting with it as a user would.
1818
</p>
@@ -25,7 +25,7 @@ <h3>Test Like a User</h3>
2525
would.
2626
</div>
2727
<div class="col-sm-4">
28-
<h3>For AngularJS Apps</h3>
28+
<h3>For Angular Apps</h3>
2929
Protractor supports Angular-specific locator strategies, which allows you
3030
to test Angular-specific elements without any setup effort on your part.
3131
</div>

0 commit comments

Comments
 (0)