Skip to content

Commit 821d01a

Browse files
committed
refactor(benchpress): export webdriver adapters in benchpress/benchpress
Also adds default bindings for protractor. Also removes sync web driver adapter for Dart as we don’t have tests for it yet.
1 parent f783841 commit 821d01a

19 files changed

+25
-60
lines changed

modules/benchpress/benchpress.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export './common.dart';
2+
export './src/webdriver/async_webdriver_adapter.dart' show AsyncWebDriverAdapter;

modules/benchpress/benchpress.es6

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './common';
2+
export { SeleniumWebDriverAdapter } from './src/webdriver/selenium_webdriver_adapter';
File renamed without changes.

modules/benchpress/src/webdriver/async_webdriver_adapter.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class AsyncWebDriverAdapter extends WebDriverAdapter {
1616
return _driver.execute(script, const[]);
1717
}
1818

19-
Map capabilities() {
20-
return _driver.capabilities;
19+
Future<Map> capabilities() {
20+
return new Future.value(_driver.capabilities);
2121
}
2222

2323
Future<List<Map>> logs(String type) {

modules/benchpress/src/webdriver/selenium_webdriver_adapter.es6

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import webdriver from 'selenium-webdriver';
88
* Adapter for the selenium-webdriver.
99
*/
1010
export class SeleniumWebDriverAdapter extends WebDriverAdapter {
11+
// TODO(tbosch): use static values when our transpiler supports them
12+
static get PROTRACTOR_BINDINGS() { return _PROTRACTOR_BINDINGS; }
13+
1114
_driver:any;
1215

1316
constructor(driver) {
@@ -59,3 +62,7 @@ function convertToLocalProcess(data) {
5962
}
6063
return JSON.parse(serialized);
6164
}
65+
66+
var _PROTRACTOR_BINDINGS = [
67+
bind(WebDriverAdapter).toFactory( () => new SeleniumWebDriverAdapter(global.browser), [])
68+
];

modules/benchpress/src/webdriver/sync_webdriver_adapter.dart

Lines changed: 0 additions & 41 deletions
This file was deleted.

modules/benchpress/test/metric/multi_metric_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
33
import { List, ListWrapper, StringMap } from 'angular2/src/facade/collection';
44
import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
55

6-
import { Metric, MultiMetric, bind, Injector } from 'benchpress/benchpress';
6+
import { Metric, MultiMetric, bind, Injector } from 'benchpress/common';
77

88
export function main() {
99
function createMetric(ids) {

modules/benchpress/test/metric/perflog_metric_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from '
33
import { List, ListWrapper } from 'angular2/src/facade/collection';
44
import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
55

6-
import { Metric, PerflogMetric, WebDriverExtension, bind, Injector } from 'benchpress/benchpress';
6+
import { Metric, PerflogMetric, WebDriverExtension, bind, Injector } from 'benchpress/common';
77

88
import { TraceEventFactory } from '../trace_event_factory';
99

modules/benchpress/test/reporter/console_reporter_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { List, ListWrapper } from 'angular2/src/facade/collection';
66
import {
77
SampleState, Reporter, bind, Injector,
88
ConsoleReporter, SampleDescription, MeasureValues
9-
} from 'benchpress/benchpress';
9+
} from 'benchpress/common';
1010

1111
export function main() {
1212
describe('console reporter', () => {

modules/benchpress/test/reporter/multi_reporter_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { List, ListWrapper, StringMap } from 'angular2/src/facade/collection';
44
import { PromiseWrapper, Promise } from 'angular2/src/facade/async';
55
import { DateWrapper } from 'angular2/src/facade/lang';
66

7-
import { Reporter, MultiReporter, bind, Injector, MeasureValues } from 'benchpress/benchpress';
7+
import { Reporter, MultiReporter, bind, Injector, MeasureValues } from 'benchpress/common';
88

99
export function main() {
1010
function createReporters(ids) {

0 commit comments

Comments
 (0)