Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit 96e689d

Browse files
committed
test: remove appveyor workarounds
1 parent db5469f commit 96e689d

File tree

3 files changed

+8
-35
lines changed

3 files changed

+8
-35
lines changed

packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ import { TestLogger, Timeout, browserTargetSpec, host, runTargetSpec } from '../
1212
import { lazyModuleFiles, lazyModuleImport } from './lazy-module_spec_large';
1313

1414

15-
// TODO: replace this with an "it()" macro that's reusable globally.
16-
let linuxOnlyIt: typeof it = it;
17-
if (process.platform.startsWith('win')) {
18-
linuxOnlyIt = xit;
19-
}
20-
21-
2215
describe('Browser Builder rebuilds', () => {
2316
const outputPath = normalize('dist');
2417

@@ -27,12 +20,6 @@ describe('Browser Builder rebuilds', () => {
2720

2821

2922
it('rebuilds on TS file changes', (done) => {
30-
if (process.env['APPVEYOR']) {
31-
// TODO: This test fails on Windows CI, figure out why.
32-
done();
33-
34-
return;
35-
}
3623
const goldenValueFiles: { [path: string]: string } = {
3724
'src/app/app.module.ts': `
3825
import { BrowserModule } from '@angular/platform-browser';
@@ -208,7 +195,7 @@ describe('Browser Builder rebuilds', () => {
208195
}, Timeout.Basic);
209196

210197

211-
linuxOnlyIt('rebuilds after errors in AOT', (done) => {
198+
it('rebuilds after errors in AOT', (done) => {
212199
// Save the original contents of `./src/app/app.component.ts`.
213200
const origContent = virtualFs.fileBufferToString(
214201
host.scopedSync().read(normalize('src/app/app.component.ts')));
@@ -270,7 +257,7 @@ describe('Browser Builder rebuilds', () => {
270257
}, Timeout.Complex);
271258

272259

273-
linuxOnlyIt('rebuilds AOT factories', (done) => {
260+
it('rebuilds AOT factories', (done) => {
274261

275262
host.writeMultipleFiles({
276263
'src/app/app.component.css': `

packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,25 @@ import { retry } from 'rxjs/operators';
1111
import { host, protractorTargetSpec, runTargetSpec } from '../utils';
1212

1313

14-
// TODO: replace this with an "it()" macro that's reusable globally.
15-
let linuxOnlyIt: typeof it = it;
16-
if (process.platform.startsWith('win')) {
17-
linuxOnlyIt = xit;
18-
}
19-
20-
2114
describe('Protractor Builder', () => {
2215
beforeEach(done => host.initialize().toPromise().then(done, done.fail));
2316
afterEach(done => host.restore().toPromise().then(done, done.fail));
2417

25-
linuxOnlyIt('works', (done) => {
18+
it('works', (done) => {
2619
runTargetSpec(host, protractorTargetSpec).pipe(
2720
retry(3),
2821
).toPromise().then(done, done.fail);
2922
}, 30000);
3023

31-
linuxOnlyIt('works with no devServerTarget', (done) => {
24+
it('works with no devServerTarget', (done) => {
3225
const overrides = { devServerTarget: undefined };
3326

3427
runTargetSpec(host, protractorTargetSpec, overrides).pipe(
3528
// This should fail because no server is available for connection.
3629
).subscribe(undefined, () => done(), done.fail);
3730
}, 30000);
3831

39-
linuxOnlyIt('overrides protractor specs', (done) => {
32+
it('overrides protractor specs', (done) => {
4033
host.scopedSync().rename(normalize('./e2e/app.e2e-spec.ts'),
4134
normalize('./e2e/renamed-app.e2e-spec.ts'));
4235

@@ -47,7 +40,7 @@ describe('Protractor Builder', () => {
4740
).toPromise().then(done, done.fail);
4841
}, 60000);
4942

50-
linuxOnlyIt('overrides protractor suites', (done) => {
43+
it('overrides protractor suites', (done) => {
5144
host.scopedSync().rename(normalize('./e2e/app.e2e-spec.ts'),
5245
normalize('./e2e/renamed-app.e2e-spec.ts'));
5346

packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
1212
import { concatMap, tap } from 'rxjs/operators';
1313

1414

15-
// TODO: replace this with an "it()" macro that's reusable globally.
16-
let linuxOnlyIt: typeof it = it;
17-
if (process.platform.startsWith('win')) {
18-
linuxOnlyIt = xit;
19-
}
20-
21-
2215
describe('NgPackagr Builder', () => {
2316
const workspaceFile = normalize('angular.json');
2417
const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
@@ -30,7 +23,7 @@ describe('NgPackagr Builder', () => {
3023
const host = new NodeJsSyncHost();
3124
const workspace = new experimental.workspace.Workspace(workspaceRoot, host);
3225

33-
linuxOnlyIt('works', (done) => {
26+
it('works', (done) => {
3427
const targetSpec: TargetSpecifier = { project: 'lib', target: 'build' };
3528

3629
return workspace.loadWorkspaceFromHost(workspaceFile).pipe(
@@ -40,7 +33,7 @@ describe('NgPackagr Builder', () => {
4033
).toPromise().then(done, done.fail);
4134
}, 30000);
4235

43-
linuxOnlyIt('tests works', (done) => {
36+
it('tests works', (done) => {
4437
const targetSpec: TargetSpecifier = { project: 'lib', target: 'test' };
4538

4639
return workspace.loadWorkspaceFromHost(workspaceFile).pipe(

0 commit comments

Comments
 (0)