protractor
Advanced tools
Comparing version 5.2.0 to 5.2.1
@@ -181,3 +181,3 @@ /** | ||
if (testability) { | ||
return testability.whenStable(testCallback); | ||
return testability.whenStable(function() { testCallback(); }); | ||
} | ||
@@ -680,3 +680,3 @@ } | ||
* @param {string} cssSelector The css selector to match. | ||
* @param {string} searchText The exact text to match. | ||
* @param {string} searchText The exact text to match or a serialized regex. | ||
* @param {Element} using The scope of the search. | ||
@@ -689,2 +689,6 @@ * | ||
if (searchText.indexOf('__REGEXP__') === 0) { | ||
var match = searchText.split('__REGEXP__')[1].match(/\/(.*)\/(.*)?/); | ||
searchText = new RegExp(match[1], match[2] || ''); | ||
} | ||
var elements = using.querySelectorAll(cssSelector); | ||
@@ -695,3 +699,7 @@ var matches = []; | ||
var elementText = element.textContent || element.innerText || ''; | ||
if (elementText.indexOf(searchText) > -1) { | ||
var elementMatches = searchText instanceof RegExp ? | ||
searchText.test(elementText) : | ||
elementText.indexOf(searchText) > -1; | ||
if (elementMatches) { | ||
matches.push(element); | ||
@@ -698,0 +706,0 @@ } |
@@ -66,3 +66,7 @@ var q = require('q'); | ||
require('jasminewd2').init(webdriver.promise.controlFlow(), webdriver); | ||
// Don't even require JasmineWD if the control | ||
// flow is turned off. | ||
if (webdriver.promise.USE_PROMISE_MANAGER) { | ||
require('jasminewd2').init(webdriver.promise.controlFlow(), webdriver); | ||
} | ||
@@ -69,0 +73,0 @@ var jasmineNodeOpts = runner.getConfig().jasmineNodeOpts; |
@@ -248,6 +248,6 @@ import { By, ByHash, promise as wdpromise, WebDriver, WebElement } from 'selenium-webdriver'; | ||
* @param {string} cssSelector css selector | ||
* @param {string} searchString text search | ||
* @param {string|RegExp} searchString text search | ||
* @returns {ProtractorLocator} location strategy | ||
*/ | ||
cssContainingText(cssSelector: string, searchText: string): ProtractorLocator; | ||
cssContainingText(cssSelector: string, searchText: string | RegExp): ProtractorLocator; | ||
/** | ||
@@ -254,0 +254,0 @@ * Find an element by ng-options expression. |
@@ -377,6 +377,7 @@ "use strict"; | ||
* @param {string} cssSelector css selector | ||
* @param {string} searchString text search | ||
* @param {string|RegExp} searchString text search | ||
* @returns {ProtractorLocator} location strategy | ||
*/ | ||
cssContainingText(cssSelector, searchText) { | ||
searchText = (searchText instanceof RegExp) ? '__REGEXP__' + searchText.toString() : searchText; | ||
return { | ||
@@ -383,0 +384,0 @@ findElementsOverride: (driver, using, rootSelector) => { |
@@ -1,18 +0,1 @@ | ||
`async`/`await` and the Web Driver Control Flow | ||
=============================================== | ||
The Web Driver Control Flow is used to synchronize your commands so they reach | ||
the browser in the correct order (see | ||
[/docs/control-flow.md](/docs/control-flow.md) for details). In the future, the | ||
control flow is being removed (see [SeleniumHQ's github issue]( | ||
https://github.com/SeleniumHQ/selenium/issues/2969) for details). Instead of the | ||
control flow, you can synchronize your commands with promise chaining or the | ||
upcoming ES7 feature `async`/`await`. | ||
However, you cannot use a mix of `async`/`await` and the control flow: | ||
`async`/`await` causes the control flow to become unreliable (see | ||
[github issue]( https://github.com/SeleniumHQ/selenium/issues/3037)). So if you | ||
`async`/`await` anywhere in a spec, you should use the | ||
`SELENIUM_PROMISE_MANAGER: false` [config option](/lib/config.js#L644). | ||
Compiling `async`/`await` syntax | ||
@@ -22,3 +5,3 @@ ================================ | ||
`async`/`await` syntax is currently accessible via typescript if you compile | ||
using `--target ES2015` or above. This example | ||
using `--target ES2015` or above. | ||
@@ -29,6 +12,6 @@ Debugging with `async`/`await` | ||
Disabling the promise manager will break Protractor's debugging and | ||
`browser.pause()`. However, because your tests won't be using the promise | ||
`browser.pause()`. However, because your tests won't be using the promise | ||
manager, you can debug them using standard Node debugging tools. For | ||
example, you can use the Chrome inspector to debug the test in this | ||
directory with `npm run debug`. You should see something like | ||
example, you can use the Chrome inspector to debug the test in this | ||
directory (protractor/exampleTypescript) with `npm run debug`. You should see something like | ||
@@ -43,6 +26,9 @@ ``` | ||
Open that URL in chrome, and you'll get an inspector that can be | ||
used to debug your test. Instead of browser.pause, you can add `debugger` | ||
to create a breakpoint. Note that sourcemaps don't work in the inspector | ||
used to debug your test. Instead of browser.pause, you can add `debugger` | ||
to create a breakpoint. Note that sourcemaps don't work in the inspector | ||
in Node v6, but do work in Node v7 (due to https://github.com/nodejs/node/issues/8369). | ||
More detail about how to use [chrome | ||
inspector](/docs/debugging.md#disabled-control-flow) | ||
More Examples | ||
@@ -49,0 +35,0 @@ ============= |
@@ -11,3 +11,3 @@ { | ||
"test": "protractor tmp/conf.js", | ||
"debug": "node --inspect --debug-brk ./node_modules/.bin/protractor asyncAwait/conf.js" | ||
"debug": "node --inspect-brk ./node_modules/.bin/protractor asyncAwait/conf.js" | ||
}, | ||
@@ -14,0 +14,0 @@ "dependencies": { |
@@ -18,3 +18,3 @@ { | ||
"@types/selenium-webdriver": "~2.53.39", | ||
"blocking-proxy": "0.0.5", | ||
"blocking-proxy": "^1.0.0", | ||
"chalk": "^1.1.3", | ||
@@ -85,3 +85,3 @@ "glob": "^7.0.3", | ||
}, | ||
"version": "5.2.0" | ||
"version": "5.2.1" | ||
} |
@@ -37,2 +37,2 @@ Protractor [![Build Status](https://travis-ci.org/angular/protractor.svg?branch=master)](https://travis-ci.org/angular/protractor) [![CircleCI Status](https://circleci.com/gh/angular/protractor.svg?style=shield)](https://circleci.com/gh/angular/protractor) [![Join the chat at https://gitter.im/angular/protractor](https://badges.gitter.im/angular/protractor.svg)](https://gitter.im/angular/protractor) | ||
---------------- | ||
See DEVELOPER.md | ||
See [DEVELOPER.md](https://github.com/angular/protractor/blob/master/DEVELOPER.md) |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
695740
13353
+ Addedblocking-proxy@1.0.1(transitive)
- Removedblocking-proxy@0.0.5(transitive)
Updatedblocking-proxy@^1.0.0