Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
docs(website): fix up some old information about AngularJS vs Angular (
  • Loading branch information
juliemr committed Jan 31, 2017
1 parent cd084a0 commit b6207ea
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 23 deletions.
18 changes: 10 additions & 8 deletions docs/debugging.md
Expand Up @@ -76,7 +76,16 @@ wd-debug>
```

Enter `c` to move the test forward by one task.
Enter `repl` to enter interactive mode. In interactive mode, you can send

While the test is paused you may also interact with the browser. Note that
if you open the Chrome Dev Tools, you must close them before continuing
the test because ChromeDriver cannot operate when the Dev Tools are open.

When you finish debugging, exit by pressing `Ctrl-C`. Your tests will continue
where they left off, using the same browser.

You can also use `browser.explore()` in your test script to pause and enter
an interactive repl loop. In this interactive mode, you can send
WebDriver commands to your browser. The resulting value or error will
be reported to the terminal.

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

While the test is paused you may also interact with the browser. Note that
if you open the Chrome Dev Tools, you must close them before continuing
the test because ChromeDriver cannot operate when the Dev Tools are open.

When you finish debugging, exit by pressing `Ctrl-C`. Your tests will continue
where they left off, using the same browser.

**Note:** Since these are asynchronous tasks, you would have to increase the default timeout of your specs else default timeout exception would be thrown!

**Using debugger**
Expand Down
6 changes: 4 additions & 2 deletions docs/faq.md
Expand Up @@ -25,9 +25,11 @@ with more info.
Angular can't be found on my page
---------------------------------

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

The `angular` variable is expected to be available in the global context. Try opening chrome devtools or firefox and see if `angular` is defined.
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.

For Angular apps, you should see a global method `getAllAngularTestabilities`.

How do I deal with my log-in page?
----------------------------------
Expand Down
2 changes: 2 additions & 0 deletions docs/locators.md
Expand Up @@ -25,9 +25,11 @@ by.css('.myclass')
by.id('myid')

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

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

Expand Down
2 changes: 1 addition & 1 deletion lib/browser.ts
Expand Up @@ -967,7 +967,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
// TODO: support mock modules in Angular2. For now, error if someone
// has tried to use one.
if (this.mockModules_.length > 1) {
throw 'Trying to load mock modules on an Angular2 app is not yet supported.';
throw 'Trying to load mock modules on an Angular v2+ app is not yet supported.';
}
}
})
Expand Down
11 changes: 1 addition & 10 deletions spec/angular2Conf.js
@@ -1,15 +1,6 @@
var env = require('./environment');

// This is the configuration for a smoke test for an Angular2 application.
//
// *** NOTE ***
// As Angular2 is in rapid development, the test application that ships with
// the Protractor repository does not yet contain an Angular2 section. This
// configuration assumes that you are serving the examples from the
// angular/angular repository at localhost:8000.
// See https://github.com/angular/angular/blob/master/DEVELOPER.md for
// setup instructions.
//
// This is the configuration for a smoke test for an Angular TypeScript application.
exports.config = {
seleniumAddress: env.seleniumAddress,

Expand Down
4 changes: 2 additions & 2 deletions website/partials/home.html
Expand Up @@ -12,7 +12,7 @@
<div ptor-twitter></div>

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

0 comments on commit b6207ea

Please sign in to comment.