Skip to content

Commit f936eb6

Browse files
filipesilvaclydin
filipesilva
authored and
clydin
committed
test: remove appveyor checks
1 parent 83d1b0c commit f936eb6

Some content is hidden

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

42 files changed

+13
-248
lines changed

‎tests/e2e/tests/basic/styles-array.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {
22
writeMultipleFiles,
33
expectFileToMatch
4-
} from '../../../utils/fs';
5-
import { ng } from '../../../utils/process';
6-
import { updateJsonFile } from '../../../utils/project';
4+
} from '../../utils/fs';
5+
import { ng } from '../../utils/process';
6+
import { updateJsonFile } from '../../utils/project';
77
import { oneLineTrim } from 'common-tags';
88

99
export default function () {

‎tests/e2e/tests/build/base-href.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import {ng} from '../../utils/process';
22
import {expectFileToMatch} from '../../utils/fs';
3-
import {getGlobalVariable} from '../../utils/env';
43
import {updateJsonFile} from '../../utils/project';
54

65

76
export default function() {
8-
// Skip this in Appveyor tests.
9-
if (getGlobalVariable('argv').appveyor) {
10-
return Promise.resolve();
11-
}
12-
137
return ng('build', '--base-href', '/myUrl')
148
.then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/))
159
.then(() => updateJsonFile('.angular-cli.json', configJson => {

‎tests/e2e/tests/build/chunk-hash.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as fs from 'fs';
22

33
import {ng} from '../../utils/process';
44
import {writeFile, prependToFile, replaceInFile} from '../../utils/fs';
5-
import {getGlobalVariable} from '../../utils/env';
65

76
const OUTPUT_RE = /(main|polyfills|vendor|inline|styles|\d+)\.[a-z0-9]+\.(chunk|bundle)\.(js|css)$/;
87

@@ -43,12 +42,6 @@ function validateHashes(
4342
}
4443

4544
export default function() {
46-
// Skip this in Appveyor tests.
47-
if (getGlobalVariable('argv').appveyor) {
48-
return Promise.resolve();
49-
}
50-
51-
5245
let oldHashes: Map<string, string>;
5346
let newHashes: Map<string, string>;
5447
// First, collect the hashes.

‎tests/e2e/tests/build/css-urls.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
} from '../../utils/fs';
88
import { copyProjectAsset } from '../../utils/assets';
99
import { expectToFail } from '../../utils/utils';
10-
import { getGlobalVariable } from '../../utils/env';
1110

1211
const imgSvg = `
1312
<svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
@@ -16,11 +15,6 @@ const imgSvg = `
1615
`;
1716

1817
export default function () {
19-
// Skip this in Appveyor tests.
20-
if (getGlobalVariable('argv').appveyor) {
21-
return Promise.resolve();
22-
}
23-
2418
return Promise.resolve()
2519
// Verify absolute/relative paths in global/component css.
2620
.then(() => writeMultipleFiles({

‎tests/e2e/tests/build/delete-output-path.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ import {deleteFile, expectFileToExist} from '../../utils/fs';
44
import {getGlobalVariable} from '../../utils/env';
55

66
export default function() {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
127
// Skip this in ejected tests.
138
if (getGlobalVariable('argv').eject) {
149
return Promise.resolve();

‎tests/e2e/tests/build/deploy-url.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@ import { ng } from '../../utils/process';
22
import { copyProjectAsset } from '../../utils/assets';
33
import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
44
import { updateJsonFile } from '../../utils/project';
5-
import { getGlobalVariable } from '../../utils/env';
65

76

87
export default function () {
9-
// Skip this in Appveyor tests.
10-
if (getGlobalVariable('argv').appveyor) {
11-
return Promise.resolve();
12-
}
13-
14-
158
return Promise.resolve()
169
.then(() => writeMultipleFiles({
1710
'src/styles.css': 'div { background: url("./assets/more.png"); }',

‎tests/e2e/tests/build/filename.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@ import {ng} from '../../utils/process';
22
import {expectFileToExist} from '../../utils/fs';
33
import {updateJsonFile} from '../../utils/project';
44
import {copyFile} from '../../utils/fs';
5-
import {getGlobalVariable} from '../../utils/env';
65

76

87
export default function() {
9-
// Skip this in Appveyor tests.
10-
if (getGlobalVariable('argv').appveyor) {
11-
return Promise.resolve();
12-
}
13-
148
return Promise.resolve()
159
.then(() => copyFile('src/index.html', 'src/config-index.html'))
1610
.then(() => updateJsonFile('.angular-cli.json', configJson => {

‎tests/e2e/tests/build/json.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ import {getGlobalVariable} from '../../utils/env';
55

66

77
export default function() {
8-
// Skip this in Appveyor tests.
9-
if (getGlobalVariable('argv').appveyor) {
10-
return Promise.resolve();
11-
}
12-
138
// Skip this in ejected tests.
149
if (getGlobalVariable('argv').eject) {
1510
return Promise.resolve();

‎tests/e2e/tests/build/module-id.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import { ng } from '../../utils/process';
22
import { replaceInFile } from '../../utils/fs';
3-
import { getGlobalVariable } from '../../utils/env';
43

54

65
export default function() {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
return Promise.resolve()
137
.then(() => replaceInFile('src/app/app.component.ts',
148
'@Component({',

‎tests/e2e/tests/build/no-angular-router.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import {ng} from '../../utils/process';
22
import {expectFileToExist, moveFile} from '../../utils/fs';
3-
import {updateJsonFile} from '../../utils/project';
43
import {getGlobalVariable} from '../../utils/env';
54
import * as path from 'path';
65

76

87
export default function() {
9-
// Skip this in Appveyor tests.
10-
if (getGlobalVariable('argv').appveyor) {
11-
return Promise.resolve();
12-
}
13-
148
const tmp = getGlobalVariable('tmp-root');
159

1610
return Promise.resolve()

‎tests/e2e/tests/build/no-implicit-any.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import {updateTsConfig} from '../../utils/project';
22
import {ng} from '../../utils/process';
3-
import {getGlobalVariable} from '../../utils/env';
43

54

65
export default function() {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
return updateTsConfig(json => {
137
json['compilerOptions']['noImplicitAny'] = true;
148
})

‎tests/e2e/tests/build/output-hashing.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
import {ng} from '../../utils/process';
22
import { copyProjectAsset } from '../../utils/assets';
33
import { writeMultipleFiles, expectFileToMatch, expectFileMatchToExist } from '../../utils/fs';
4-
import { getGlobalVariable } from '../../utils/env';
4+
55

66
function verifyMedia(css: RegExp, content: RegExp) {
77
return expectFileMatchToExist('./dist', css)
88
.then(fileName => expectFileToMatch(`dist/${fileName}`, content));
99
}
1010

1111
export default function() {
12-
// Skip this in Appveyor tests.
13-
if (getGlobalVariable('argv').appveyor) {
14-
return Promise.resolve();
15-
}
16-
1712
return Promise.resolve()
1813
.then(() => writeMultipleFiles({
1914
'src/styles.css': 'body { background-image: url("./assets/image.png"); }'

‎tests/e2e/tests/build/platform-server.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ import { readNgVersion } from '../../utils/version';
1414
import { expectToFail } from '../../utils/utils';
1515

1616
export default function () {
17-
// Skip this in Appveyor tests.
18-
if (getGlobalVariable('argv').appveyor) {
19-
return Promise.resolve();
20-
}
21-
2217
// Skip this for ejected tests.
2318
if (getGlobalVariable('argv').eject) {
2419
return Promise.resolve();

‎tests/e2e/tests/build/polyfills.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import { expectFileToMatch } from '../../utils/fs';
22
import { ng } from '../../utils/process';
3-
import { getGlobalVariable } from '../../utils/env';
43
import { oneLineTrim } from 'common-tags';
54

65
export default function () {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
return Promise.resolve()
137
.then(() => ng('build'))
148
// files were created successfully

‎tests/e2e/tests/build/sourcemap.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import {ng} from '../../utils/process';
22
import {expectFileToExist} from '../../utils/fs';
33
import {expectToFail} from '../../utils/utils';
4-
import {getGlobalVariable} from '../../utils/env';
54

65

76
export default function() {
8-
// Skip this in Appveyor tests.
9-
if (getGlobalVariable('argv').appveyor) {
10-
return Promise.resolve();
11-
}
12-
137
return ng('build', '--sourcemaps')
148
.then(() => expectFileToExist('dist/main.bundle.js.map'))
159

‎tests/e2e/tests/build/styles/extract-css.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,9 @@ import {
66
import { ng } from '../../../utils/process';
77
import { updateJsonFile } from '../../../utils/project';
88
import { expectToFail } from '../../../utils/utils';
9-
import { getGlobalVariable } from '../../../utils/env';
109
import { oneLineTrim } from 'common-tags';
1110

1211
export default function () {
13-
// Skip this in Appveyor tests.
14-
if (getGlobalVariable('argv').appveyor) {
15-
return Promise.resolve();
16-
}
17-
1812
return Promise.resolve()
1913
.then(() => writeMultipleFiles({
2014
'src/string-style.css': '.string-style { color: red }',

‎tests/e2e/tests/build/styles/postcss.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import * as glob from 'glob';
22
import { writeFile, expectFileToMatch } from '../../../utils/fs';
33
import { ng } from '../../../utils/process';
4-
import { getGlobalVariable } from '../../../utils/env';
54
import { stripIndents } from 'common-tags';
65

76
export default function () {
8-
// Skip this in Appveyor tests.
9-
if (getGlobalVariable('argv').appveyor) {
10-
return Promise.resolve();
11-
}
12-
137
return writeFile('src/styles.css', stripIndents`
148
/* normal-comment */
159
/*! important-comment */

‎tests/e2e/tests/commands/new/new-routing.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import {ng} from '../../../utils/process';
22
import {createProject} from '../../../utils/project';
3-
import { getGlobalVariable } from '../../../utils/env';
43

54

65
export default function() {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
return Promise.resolve()
137
.then(() => createProject('routing-project', '--routing'))
148

‎tests/e2e/tests/commands/new/new-skip-commit.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@ import {ng} from '../../../utils/process';
22
import {createProject} from '../../../utils/project';
33
import {expectToFail} from '../../../utils/utils';
44
import {expectGitToBeClean} from '../../../utils/git';
5-
import {getGlobalVariable} from '../../../utils/env';
65

76

87
export default function() {
9-
// Skip this in Appveyor tests.
10-
if (getGlobalVariable('argv').appveyor) {
11-
return Promise.resolve();
12-
}
13-
148
return Promise.resolve()
159
.then(() => createProject('new-project', '--skip-commit'))
1610
.then(() => expectToFail(() => expectGitToBeClean()))

‎tests/e2e/tests/commands/new/new-skip-tests.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import {createProject} from '../../../utils/project';
22
import {expectFileNotToExist} from '../../../utils/fs';
3-
import {getGlobalVariable} from '../../../utils/env';
43

54

65
export default function() {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
return Promise.resolve()
137
.then(() => createProject('new-project-skip-tests', '--skip-tests'))
148
.then(() => expectFileNotToExist('src/app/app.component.spec.ts'));

‎tests/e2e/tests/lint/lint-no-config-section.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import { ng } from '../../utils/process';
2-
import { getGlobalVariable } from '../../utils/env';
32
import { oneLine } from 'common-tags';
43

54
export default function () {
6-
// Skip this in Appveyor tests.
7-
if (getGlobalVariable('argv').appveyor) {
8-
return Promise.resolve();
9-
}
10-
115
return Promise.resolve()
126
.then(() => ng('set', 'lint', '[]'))
137
.then(() => ng('lint'))

‎tests/e2e/tests/lint/lint-no-project.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import { ng } from '../../utils/process';
22
import { writeFile } from '../../utils/fs';
33
import { expectToFail } from '../../utils/utils';
4-
import { getGlobalVariable } from '../../utils/env';
54
import { oneLine } from 'common-tags';
65

76
export default function () {
8-
// Skip this in Appveyor tests.
9-
if (getGlobalVariable('argv').appveyor) {
10-
return Promise.resolve();
11-
}
12-
137
return Promise.resolve()
148
.then(() => ng('set', 'lint.0.project', ''))
159
.then(() => ng('lint', '--type-check'))

‎tests/e2e/tests/lint/lint-with-exclude.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import { ng } from '../../utils/process';
22
import { writeFile } from '../../utils/fs';
3-
import { getGlobalVariable } from '../../utils/env';
43
import { oneLine } from 'common-tags';
54

65
export default function () {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
const fileName = 'src/app/foo.ts';
137

148
return Promise.resolve()

‎tests/e2e/tests/lint/lint-with-force.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import { ng } from '../../utils/process';
22
import { writeFile } from '../../utils/fs';
3-
import { getGlobalVariable } from '../../utils/env';
43
import { oneLine } from 'common-tags';
54

65
export default function () {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
const fileName = 'src/app/foo.ts';
137

148
return Promise.resolve()

‎tests/e2e/tests/lint/lint-with-format-by-aliases.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import { ng } from '../../utils/process';
22
import { writeFile } from '../../utils/fs';
3-
import { getGlobalVariable } from '../../utils/env';
43
import { oneLine } from 'common-tags';
54

65
export default function () {
7-
// Skip this in Appveyor tests.
8-
if (getGlobalVariable('argv').appveyor) {
9-
return Promise.resolve();
10-
}
11-
126
const fileName = 'src/app/foo.ts';
137

148
return Promise.resolve()

0 commit comments

Comments
 (0)