Skip to content

Commit

Permalink
refactor: format and lint code
Browse files Browse the repository at this point in the history
  • Loading branch information
vicb committed Dec 12, 2016
1 parent 20bed46 commit 7295a5e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,22 @@
* found in the LICENSE file at https://angular.io/license
*/

import {verifyNoBrowserErrors} from '../../../../_common/e2e_util';
import {browser, by, element, protractor} from 'protractor';

import {verifyNoBrowserErrors} from '../../../../_common/e2e_util';


function waitForElement(selector: string) {
var EC = (<any>protractor).ExpectedConditions;
const EC = (<any>protractor).ExpectedConditions;
// Waits for the element with id 'abc' to be present on the dom.
browser.wait(EC.presenceOf($(selector)), 20000);
}

describe('Location', () => {
afterEach(verifyNoBrowserErrors);

var URL = '/common/location/ts/#/bar/baz';

it('should verify paths', () => {
browser.get(URL);
browser.get('/common/location/ts/#/bar/baz');
waitForElement('hash-location');
expect(element.all(by.css('path-location code')).get(0).getText())
.toEqual('/common/location/ts');
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
if (console.error) {
console.error(error);
} else {
// tslint:disable-next-line:no-console
console.log(error);
}
}
Expand Down
4 changes: 1 addition & 3 deletions protractor-examples-e2e.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ var BROWSER_OPTIONS = {
exports.config = {
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
allScriptsTimeout: 11000,
specs: [
'dist/examples/**/e2e_test/*_spec.js'
],
specs: ['dist/examples/**/e2e_test/*_spec.js'],
capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
directConnect: true,
baseUrl: 'http://localhost:8001/',
Expand Down

0 comments on commit 7295a5e

Please sign in to comment.