Skip to content

Commit 6baf3ba

Browse files
Jason Choialxhub
authored andcommitted
chore(playground): clang-format
1 parent 0d1f3c3 commit 6baf3ba

File tree

60 files changed

+3336
-3372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3336
-3372
lines changed

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const os = require('os');
1212

1313
const srcsToFmt =
1414
['tools/**/*.ts', 'modules/@angular/**/*.ts', '!tools/public_api_guard/**/*.d.ts',
15-
'modules/benchpress/**/*.ts'];
15+
'modules/benchpress/**/*.ts', 'modules/playground/**/*.ts'];
1616

1717
gulp.task('format:enforce', () => {
1818
const format = require('gulp-clang-format');

modules/playground/e2e_test/hash_routing/hash_location_spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ describe('hash routing example app', function() {
4343
element(by.css('#goodbye-link-blank')).click();
4444
expect(browser.driver.getCurrentUrl()).not.toContain('#/bye');
4545
browser.getAllWindowHandles().then(function(windows) {
46-
browser.switchTo()
47-
.window(windows[1])
48-
.then(function() { expect(browser.driver.getCurrentUrl()).toContain("#/bye"); });
46+
browser.switchTo().window(windows[1]).then(function() {
47+
expect(browser.driver.getCurrentUrl()).toContain('#/bye');
48+
});
4949
});
5050
});
5151
});

modules/playground/e2e_test/hello_world/hello_world_spec.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ describe('hello world', function() {
3232
});
3333

3434
function getComponentText(selector: any /** TODO #9100 */, innerSelector: any /** TODO #9100 */) {
35-
return browser.executeScript('return document.querySelector("' + selector + '").querySelector("' +
36-
innerSelector + '").textContent');
35+
return browser.executeScript(
36+
'return document.querySelector("' + selector + '").querySelector("' + innerSelector +
37+
'").textContent');
3738
}
3839

39-
function clickComponentButton(selector: any /** TODO #9100 */, innerSelector: any /** TODO #9100 */) {
40-
return browser.executeScript('return document.querySelector("' + selector + '").querySelector("' +
41-
innerSelector + '").click()');
40+
function clickComponentButton(
41+
selector: any /** TODO #9100 */, innerSelector: any /** TODO #9100 */) {
42+
return browser.executeScript(
43+
'return document.querySelector("' + selector + '").querySelector("' + innerSelector +
44+
'").click()');
4245
}

modules/playground/e2e_test/http/http_spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ describe('http', function() {
2323
});
2424

2525
function getComponentText(selector: any /** TODO #9100 */, innerSelector: any /** TODO #9100 */) {
26-
return browser.executeScript('return document.querySelector("' + selector + '").querySelector("' +
27-
innerSelector + '").textContent.trim()');
26+
return browser.executeScript(
27+
'return document.querySelector("' + selector + '").querySelector("' + innerSelector +
28+
'").textContent.trim()');
2829
}

modules/playground/e2e_test/jsonp/jsonp_spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ describe('jsonp', function() {
2323
});
2424

2525
function getComponentText(selector: any /** TODO #9100 */, innerSelector: any /** TODO #9100 */) {
26-
return browser.executeScript('return document.querySelector("' + selector + '").querySelector("' +
27-
innerSelector + '").textContent.trim()');
26+
return browser.executeScript(
27+
'return document.querySelector("' + selector + '").querySelector("' + innerSelector +
28+
'").textContent.trim()');
2829
}

modules/playground/e2e_test/routing_deprecated/routing_deprecated_spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ describe('deprecated routing inbox-app', () => {
7070
waitForElement('#item-10');
7171
element(by.css('#item-10')).click();
7272
waitForElement('#record-id');
73-
var recordId = element(by.css("#record-id"));
74-
browser.wait(protractor.until.elementTextIs(recordId, "ID: 10"), 5000);
73+
var recordId = element(by.css('#record-id'));
74+
browser.wait(protractor.until.elementTextIs(recordId, 'ID: 10'), 5000);
7575
expect(recordId.getText()).toEqual('ID: 10');
7676
});
7777

@@ -93,7 +93,7 @@ describe('deprecated routing inbox-app', () => {
9393
element(by.css('.sort-button')).click();
9494
expect(browser.getCurrentUrl()).toMatch(/\/#\?sort=date$/);
9595
waitForElement('.inbox-item-record');
96-
expect(element(by.css(".inbox-item-record > a")).getAttribute("id")).toEqual("item-137");
96+
expect(element(by.css('.inbox-item-record > a')).getAttribute('id')).toEqual('item-137');
9797
});
9898
})
9999
});

modules/playground/e2e_test/sourcemap/sourcemap_spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ describe('sourcemaps', function() {
3838

3939

4040
const content =
41-
fs.readFileSync('dist/all/playground/src/sourcemap/index.js').toString("utf8");
42-
const marker = "//# sourceMappingURL=data:application/json;base64,";
41+
fs.readFileSync('dist/all/playground/src/sourcemap/index.js').toString('utf8');
42+
const marker = '//# sourceMappingURL=data:application/json;base64,';
4343
const index = content.indexOf(marker);
4444
const sourceMapData =
45-
new Buffer(content.substring(index + marker.length), 'base64').toString("utf8");
45+
new Buffer(content.substring(index + marker.length), 'base64').toString('utf8');
4646

4747
var decoder = new sourceMap.SourceMapConsumer(JSON.parse(sourceMapData));
4848

4949
var originalPosition = decoder.originalPositionFor({line: errorLine, column: errorColumn});
5050

51-
var sourceCodeLines =
52-
fs.readFileSync('modules/playground/src/sourcemap/index.ts', {encoding: 'UTF-8'})
53-
.split('\n');
51+
var sourceCodeLines = fs.readFileSync('modules/playground/src/sourcemap/index.ts', {
52+
encoding: 'UTF-8'
53+
}).split('\n');
5454
expect(sourceCodeLines[originalPosition.line - 1])
5555
.toMatch(/throw new BaseException\(\'Sourcemap test\'\)/);
5656
});

modules/playground/e2e_test/upgrade/upgrade_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {verifyNoBrowserErrors} from "e2e_util/e2e_util";
9+
import {verifyNoBrowserErrors} from 'e2e_util/e2e_util';
1010

1111
// TODO(i): reenable once we are using a version of protractor containing the
1212
// change in https://github.com/angular/protractor/pull/3403

modules/playground/e2e_test/web_workers/input/input_spec.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,17 @@ describe('WebWorkers Input', function() {
5656
});
5757

5858
function waitForBootstrap() {
59-
browser
60-
.wait(protractor.until.elementLocated(by.css(selector + ' h2')), 5000)
61-
.then(_ => {
62-
let elem = element(by.css(selector + ' h2'));
63-
browser.wait(protractor.until.elementTextIs(elem, 'Input App'), 5000);
64-
}, _ => {
65-
// jasmine will timeout if this gets called too many times
66-
console.log('>> unexpected timeout -> browser.refresh()');
67-
browser.refresh();
68-
waitForBootstrap();
69-
});
59+
browser.wait(protractor.until.elementLocated(by.css(selector + ' h2')), 5000)
60+
.then(
61+
_ => {
62+
let elem = element(by.css(selector + ' h2'));
63+
browser.wait(protractor.until.elementTextIs(elem, 'Input App'), 5000);
64+
},
65+
_ => {
66+
// jasmine will timeout if this gets called too many times
67+
console.log('>> unexpected timeout -> browser.refresh()');
68+
browser.refresh();
69+
waitForBootstrap();
70+
});
7071
}
7172
});

modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('WebWorkers Kitchen Sink', function() {
1313
verifyNoBrowserErrors();
1414
browser.ignoreSynchronization = false;
1515
});
16-
var selector = "hello-app .greeting";
16+
var selector = 'hello-app .greeting';
1717
var URL = 'all/playground/src/web_workers/kitchen_sink/index.html';
1818

1919
it('should greet', () => {
@@ -24,7 +24,7 @@ describe('WebWorkers Kitchen Sink', function() {
2424
browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
2525
var elem = element(by.css(selector));
2626
browser.wait(protractor.until.elementTextIs(elem, 'hello world!'), 5000);
27-
expect(elem.getText()).toEqual("hello world!");
27+
expect(elem.getText()).toEqual('hello world!');
2828

2929
});
3030

@@ -37,21 +37,21 @@ describe('WebWorkers Kitchen Sink', function() {
3737
browser.wait(protractor.until.elementLocated(by.css(changeButtonSelector)), 15000);
3838
element(by.css(changeButtonSelector)).click();
3939
var elem = element(by.css(selector));
40-
browser.wait(protractor.until.elementTextIs(elem, "howdy world!"), 5000);
41-
expect(elem.getText()).toEqual("howdy world!");
40+
browser.wait(protractor.until.elementTextIs(elem, 'howdy world!'), 5000);
41+
expect(elem.getText()).toEqual('howdy world!');
4242
});
4343

44-
it("should display correct key names", () => {
44+
it('should display correct key names', () => {
4545
// This test can't wait for Angular 2 as Testability is not available when using WebWorker
4646
browser.ignoreSynchronization = true;
4747
browser.get(URL);
48-
browser.wait(protractor.until.elementLocated(by.css(".sample-area")), 15000);
48+
browser.wait(protractor.until.elementLocated(by.css('.sample-area')), 15000);
4949

50-
var area = element.all(by.css(".sample-area")).first();
50+
var area = element.all(by.css('.sample-area')).first();
5151
expect(area.getText()).toEqual('(none)');
5252

5353
area.sendKeys('u');
54-
browser.wait(protractor.until.elementTextIs(area, "U"), 5000);
55-
expect(area.getText()).toEqual("U");
54+
browser.wait(protractor.until.elementTextIs(area, 'U'), 5000);
55+
expect(area.getText()).toEqual('U');
5656
});
5757
});

modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@ import {verifyNoBrowserErrors} from 'e2e_util/e2e_util';
1010

1111
var URL = 'all/playground/src/web_workers/message_broker/index.html';
1212

13-
describe("MessageBroker", function() {
13+
describe('MessageBroker', function() {
1414

1515
afterEach(() => {
1616
verifyNoBrowserErrors();
1717
browser.ignoreSynchronization = false;
1818
});
1919

20-
it("should bootstrap", () => {
20+
it('should bootstrap', () => {
2121
// This test can't wait for Angular 2 as Testability is not available when using WebWorker
2222
browser.ignoreSynchronization = true;
2323
browser.get(URL);
2424
waitForBootstrap();
25-
expect(element(by.css("app h1")).getText()).toEqual("WebWorker MessageBroker Test");
25+
expect(element(by.css('app h1')).getText()).toEqual('WebWorker MessageBroker Test');
2626
});
2727

28-
it("should echo messages", () => {
29-
const VALUE = "Hi There";
28+
it('should echo messages', () => {
29+
const VALUE = 'Hi There';
3030
// This test can't wait for Angular 2 as Testability is not available when using WebWorker
3131
browser.ignoreSynchronization = true;
3232
browser.get(URL);
3333
waitForBootstrap();
3434

35-
var input = element.all(by.css("#echo_input")).first();
35+
var input = element.all(by.css('#echo_input')).first();
3636
input.sendKeys(VALUE);
37-
element(by.css("#send_echo")).click();
38-
var area = element(by.css("#echo_result"));
37+
element(by.css('#send_echo')).click();
38+
var area = element(by.css('#echo_result'));
3939
browser.wait(protractor.until.elementTextIs(area, VALUE), 5000);
4040
expect(area.getText()).toEqual(VALUE);
4141
});
4242
});
4343

4444
function waitForBootstrap(): void {
45-
browser.wait(protractor.until.elementLocated(by.css("app h1")), 15000);
45+
browser.wait(protractor.until.elementLocated(by.css('app h1')), 15000);
4646
}

modules/playground/e2e_test/web_workers/router/router_spec.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {verifyNoBrowserErrors} from 'e2e_util/e2e_util';
1010

11-
describe("WebWorker Router", () => {
11+
describe('WebWorker Router', () => {
1212
beforeEach(() => {
1313
// This test can't wait for Angular 2 as Testability is not available when using WebWorker
1414
browser.ignoreSynchronization = true;
@@ -20,43 +20,43 @@ describe("WebWorker Router", () => {
2020
browser.ignoreSynchronization = false;
2121
});
2222

23-
let contentSelector = "app main h1";
24-
let navSelector = "app nav ul";
23+
let contentSelector = 'app main h1';
24+
let navSelector = 'app nav ul';
2525
var baseUrl = 'all/playground/src/web_workers/router/index.html';
2626

27-
it("should route on click", () => {
27+
it('should route on click', () => {
2828
browser.get(baseUrl);
2929

3030
waitForElement(contentSelector);
3131
var content = element(by.css(contentSelector));
32-
expect(content.getText()).toEqual("Start");
32+
expect(content.getText()).toEqual('Start');
3333

34-
let aboutBtn = element(by.css(navSelector + " .about"));
34+
let aboutBtn = element(by.css(navSelector + ' .about'));
3535
aboutBtn.click();
3636
waitForUrl(/\/about/);
3737
waitForElement(contentSelector);
38-
waitForElementText(contentSelector, "About");
38+
waitForElementText(contentSelector, 'About');
3939
content = element(by.css(contentSelector));
40-
expect(content.getText()).toEqual("About");
40+
expect(content.getText()).toEqual('About');
4141
expect(browser.getCurrentUrl()).toMatch(/\/about/);
4242

43-
let contactBtn = element(by.css(navSelector + " .contact"));
43+
let contactBtn = element(by.css(navSelector + ' .contact'));
4444
contactBtn.click();
4545
waitForUrl(/\/contact/);
4646
waitForElement(contentSelector);
47-
waitForElementText(contentSelector, "Contact");
47+
waitForElementText(contentSelector, 'Contact');
4848
content = element(by.css(contentSelector));
49-
expect(content.getText()).toEqual("Contact");
49+
expect(content.getText()).toEqual('Contact');
5050
expect(browser.getCurrentUrl()).toMatch(/\/contact/);
5151
});
5252

53-
it("should load the correct route from the URL", () => {
54-
browser.get(baseUrl + "#/about");
53+
it('should load the correct route from the URL', () => {
54+
browser.get(baseUrl + '#/about');
5555

5656
waitForElement(contentSelector);
57-
waitForElementText(contentSelector, "About");
57+
waitForElementText(contentSelector, 'About');
5858
let content = element(by.css(contentSelector));
59-
expect(content.getText()).toEqual("About");
59+
expect(content.getText()).toEqual('About');
6060
});
6161

6262
function waitForElement(selector: string): void {

modules/playground/e2e_test/web_workers/todo/todo_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ describe('WebWorkers Todo', function() {
2222
browser.get(URL);
2323

2424
waitForBootstrap();
25-
expect(element(by.css("#todoapp header")).getText()).toEqual("todos");
25+
expect(element(by.css('#todoapp header')).getText()).toEqual('todos');
2626
});
2727

2828
});
2929

3030
function waitForBootstrap(): void {
31-
browser.wait(protractor.until.elementLocated(by.css("todo-app #todoapp")), 15000);
31+
browser.wait(protractor.until.elementLocated(by.css('todo-app #todoapp')), 15000);
3232
}

0 commit comments

Comments
 (0)