test: separate big specs

filipesilva · hansl · commit 4cb5e350511a · 2018-06-05T17:55:16.000-07:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,7 +13,8 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm run test
+  - npm test
+  - npm test -- --big
 
 build: off
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,6 +41,17 @@ jobs:
       - run: npm install --no-save
       - run: npm run test -- --code-coverage --full
 
+  test-big:
+    <<: *defaults
+    steps:
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: angular_devkit-{{ checksum "package-lock.json" }}
+
+      - run: npm install --no-save
+      - run: npm run test -- --code-coverage --full --big
+
   integration:
     <<: *defaults
     steps:
@@ -131,6 +142,9 @@ workflows:
       - test:
           requires:
             - build
+      - test-big:
+          requires:
+            - build
       - integration:
           requires:
             - build
diff --git a/lib/istanbul-local.js b/lib/istanbul-local.js
@@ -18,7 +18,7 @@ exports.codeMap = codeMap;
 
 exports.istanbulRequireHook = function(code, filename) {
   // Skip spec files.
-  if (filename.match(/_spec\.ts$/)) {
+  if (filename.match(/_spec(_big)?\.ts$/)) {
     return code;
   }
   const codeFile = codeMap.get(filename);
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
@@ -23,6 +23,7 @@ ts_library(
             "src/purify/**",
             "src/index.ts",
             "**/*_spec.ts",
+            "**/*_spec_big.ts",
         ],
     ),
     tsconfig = "//:tsconfig.json",
diff --git a/packages/angular_devkit/build_webpack/src/browser/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/browser/index_spec_big.ts
diff --git a/packages/angular_devkit/build_webpack/src/dev-server/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/dev-server/index_spec_big.ts
@@ -14,7 +14,7 @@ import { relative, resolve } from 'path';
 import * as _request from 'request';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { getWorkspace as getBrowserWorkspace } from '../browser/index_spec';
+import { getWorkspace as getBrowserWorkspace } from '../browser/index_spec_big';
 
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
diff --git a/packages/angular_devkit/build_webpack/src/extract-i18n/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/extract-i18n/index_spec_big.ts
@@ -12,7 +12,7 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync, unlinkSync } from 'fs';
 import { relative, resolve } from 'path';
 import { concatMap, tap, toArray } from 'rxjs/operators';
-import { getWorkspace as getBrowserWorkspace } from '../browser/index_spec';
+import { getWorkspace as getBrowserWorkspace } from '../browser/index_spec_big';
 
 
 describe('Extract i18n Target', () => {
diff --git a/packages/angular_devkit/build_webpack/src/karma/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/karma/index_spec_big.ts
diff --git a/packages/angular_devkit/build_webpack/src/protractor/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/protractor/index_spec_big.ts
@@ -11,7 +11,7 @@ import { normalize } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { relative, resolve } from 'path';
 import { concatMap, take } from 'rxjs/operators';
-import { getWorkspace as getDevServerWorkspace } from '../dev-server/index_spec';
+import { getWorkspace as getDevServerWorkspace } from '../dev-server/index_spec_big';
 
 
 describe('Protractor Target', () => {
diff --git a/packages/angular_devkit/build_webpack/src/tslint/index_spec_big.ts b/packages/angular_devkit/build_webpack/src/tslint/index_spec_big.ts
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
@@ -14,6 +14,7 @@ ts_library(
         include = ["src/**/*.ts"],
         exclude = [
             "src/**/*_spec.ts",
+            "src/**/*_spec_big.ts",
             "src/**/*_benchmark.ts",
         ],
     ),
@@ -30,6 +31,7 @@ ts_library(
         include = ["node/**/*.ts"],
         exclude = [
             "node/**/*_spec.ts",
+            "node/**/*_spec_big.ts",
             "tools/**/*_benchmark.ts",
         ],
     ),
@@ -44,7 +46,10 @@ ts_library(
 ts_library(
     name = "spec",
     srcs = glob(
-        include = ["**/*_spec.ts"],
+        include = [
+            "**/*_spec.ts",
+            "**/*_spec_big.ts",
+        ],
     ),
     deps = [
         ":core",
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
@@ -14,6 +14,7 @@ ts_library(
         include = ["bin/**/*.ts"],
         exclude = [
             "bin/**/*_spec.ts",
+            "bin/**/*_spec_big.ts",
             "bin/**/*_benchmark.ts",
         ],
     ),
diff --git a/rules/noGlobalTslintDisableRule.ts b/rules/noGlobalTslintDisableRule.ts
@@ -44,7 +44,7 @@ class Walker extends Lint.RuleWalker {
     super.walk(sourceFile);
 
     // Ignore spec files.
-    if (sourceFile.fileName.match(/_spec.ts$/)) {
+    if (sourceFile.fileName.match(/_spec(_big)?.ts$/)) {
       return;
     }
     // Ignore benchmark files.
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -243,7 +243,7 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
   for (const packageName of sortedPackages) {
     specLogger.info(packageName);
     const pkg = packages[packageName];
-    const files = glob.sync(path.join(pkg.dist, '**/*_spec.@(js|d.ts)'));
+    const files = glob.sync(path.join(pkg.dist, '**/*_spec?(_big).@(js|d.ts)'));
     specLogger.info(`  ${files.length} spec files found...`);
     files.forEach(fileName => _rm(fileName));
   }
diff --git a/scripts/test.ts b/scripts/test.ts
@@ -152,10 +152,9 @@ glob.sync('packages/**/*.spec.ts')
   });
 
 export default function (args: ParsedArgs, logger: logging.Logger) {
-  let regex = 'packages/**/*_spec.ts';
-  if (args.glob) {
-    regex = `packages/**/${args.glob}/**/*_spec.ts`;
-  }
+  const packageGlob = args.glob ? `**/${args.glob}/**` : '**';
+  const specGlob = args.big ? '*_spec_big.ts' : '*_spec.ts';
+  const regex = `packages/${packageGlob}/${specGlob}`;
 
   if (args['code-coverage']) {
     runner.env.addReporter(new IstanbulReporter());

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ exports.codeMap = codeMap;`
`18`	`18`
`19`	`19`	`exports.istanbulRequireHook = function(code, filename) {`
`20`	`20`	`// Skip spec files.`
`21`		`- if (filename.match(/_spec\.ts$/)) {`
	`21`	`+ if (filename.match(/_spec(_big)?\.ts$/)) {`
`22`	`22`	`return code;`
`23`	`23`	`}`
`24`	`24`	`const codeFile = codeMap.get(filename);`