build: upgrade jasmine (and related typings) to latest version (angular#19904)

With these changes, the types are a little stricter now and also not
compatible with Protractor's jasmine-like syntax. So, we have to also
use `@types/jasminewd2` for e2e tests (but not for non-e2e tests).

I also had to "augment" `@types/jasminewd2`, because the latest
typings from [DefinitelyTyped][1] do not reflect the fact that the
`jasminewd2` version (v2.1.0) currently used by Protractor supports
passing a `done` callback to a spec.

[1]: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/566e0394859fdc1dc893658ccec6b06372d56a91/types/jasminewd2/index.d.ts#L9-L15

Fixes angular#23952
Closes angular#24733

PR Close angular#19904

Author: gkalpak

build.sh

@@ -409,6 +409,10 @@ if [[ ${BUILD_ALL} == true && ${TYPECHECK_ALL} == true ]]; then
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
     $TSC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
+  TSCONFIG="packages/examples/tsconfig.json"
+  travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
+    $TSC -p ${TSCONFIG}
+  travisFoldEnd "tsc -p ${TSCONFIG}"
   TSCONFIG="modules/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
     $TSC -p ${TSCONFIG}

integration/dynamic-compiler/e2e/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "compilerOptions": {
     "outDir": "../dist/e2e",
-    "types": ["jasmine"],
+    "types": [
+      "jasmine",
+      "jasminewd2"
+    ],
     "skipLibCheck": true
   }
 }

integration/dynamic-compiler/package.json

@@ -18,8 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/jasmine": "file:../../node_modules/@types/jasmine",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@types/jasmine": "file:../../node_modules/@types/jasmine",
+    "@types/jasminewd2": "file:../../node_modules/@types/jasminewd2",
     "concurrently": "3.4.0",
     "lite-server": "2.2.2",
     "protractor": "file:../../node_modules/protractor",

modules/types.d.ts

@@ -8,10 +8,11 @@
 
 // This file contains all ambient imports needed to compile the modules/ source code
 
-/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
 /// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
 /// <reference path="../node_modules/@types/jasmine/index.d.ts" />
+/// <reference path="../node_modules/@types/jasminewd2/index.d.ts" />
 /// <reference path="../node_modules/@types/node/index.d.ts" />
-/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
+/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference path="../tools/types-ext/jasminewd2.d.ts" />
 /// <reference path="./es6-subset.d.ts" />
 /// <reference path="./system.d.ts" />

package.json

@@ -47,7 +47,8 @@
     "@types/diff": "^3.2.2",
     "@types/fs-extra": "4.0.2",
     "@types/hammerjs": "2.0.35",
-    "@types/jasmine": "2.2.22-alpha",
+    "@types/jasmine": "^2.8.8",
+    "@types/jasminewd2": "^2.0.3",
     "@types/minimist": "^1.2.0",
     "@types/node": "6.0.88",
     "@types/selenium-webdriver": "3.0.7",
@@ -84,8 +85,8 @@
     "hammerjs": "2.0.8",
     "husky": "^0.14.3",
     "incremental-dom": "0.4.1",
-    "jasmine": "2.4.1",
-    "jasmine-core": "2.4.1",
+    "jasmine": "2.8",
+    "jasmine-core": "2.8",
     "jpm": "1.3.1",
     "karma": "0.13.20",
     "karma-browserstack-launcher": "0.1.9",

packages/bazel/test/ngc-wrapped/test_support.ts

@@ -30,7 +30,7 @@ export interface TestSupport {
   writeFiles(...mockDirs: {[fileName: string]: string}[]): void;
   shouldExist(fileName: string): void;
   shouldNotExist(fileName: string): void;
-  runOneBuild(): void;
+  runOneBuild(): boolean;
 }
 
 export function setup(

packages/benchpress/test/metric/user_metric_spec.ts

@@ -48,13 +48,11 @@ import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} fr
            const metric = createMetric(
                [[]], new PerfLogFeatures(),
                {userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
-           metric.beginMeasure()
-               .then((_) => metric.endMeasure(true))
-               .then((values: {[key: string]: string}) => {
-                 expect(values['loadTime']).toBe(25);
-                 expect(values['content']).toBe(250);
-                 async.done();
-               });
+           metric.beginMeasure().then(() => metric.endMeasure(true)).then(values => {
+             expect(values['loadTime']).toBe(25);
+             expect(values['content']).toBe(250);
+             async.done();
+           });
 
            wdAdapter.data['loadTime'] = 25;
            // Wait before setting 2nd property.

packages/common/test/directives/ng_component_outlet_spec.ts

@@ -166,12 +166,12 @@ import {expect} from '@angular/platform-browser/testing/src/matchers';
          fixture.componentInstance.currentComponent = Module2InjectedComponent;
          fixture.detectChanges();
 
-         const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'];
+         const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'] !;
          spyOn(moduleRef, 'destroy').and.callThrough();
 
-         expect(moduleRef !.destroy).not.toHaveBeenCalled();
+         expect(moduleRef.destroy).not.toHaveBeenCalled();
          fixture.destroy();
-         expect(moduleRef !.destroy).toHaveBeenCalled();
+         expect(moduleRef.destroy).toHaveBeenCalled();
        }));
 
     it('should not re-create moduleRef when it didn\'t actually change', async(() => {

packages/compiler-cli/integrationtest/ngtools_src/feature2/feature2.module.ts

@@ -16,10 +16,9 @@ export class FeatureComponent {
 @NgModule({
   declarations: [FeatureComponent],
   imports: [RouterModule.forChild([
-    {path: '', component: FeatureComponent}, {path: 'd', loadChildren: './default.module'} {
-      path: 'e',
-      loadChildren: 'feature/feature.module#FeatureModule'
-    }
+    {path: '', component: FeatureComponent},
+    {path: 'd', loadChildren: './default.module'},
+    {path: 'e', loadChildren: 'feature/feature.module#FeatureModule'},
   ])]
 })
 export class Feature2Module {

packages/compiler-cli/src/ngtools_api.ts

@@ -21,7 +21,7 @@
 
 import * as ts from 'typescript';
 
-import {CompilerHost, CompilerOptions, LazyRoute} from './transformers/api';
+import {CompilerOptions} from './transformers/api';
 import {getOriginalReferences} from './transformers/compiler_host';
 import {createProgram} from './transformers/entry_points';
 

packages/compiler-cli/test/diagnostics/expression_diagnostics_spec.ts

@@ -76,7 +76,7 @@ describe('expression diagnostics', () => {
     }
   }
 
-  function reject(template: string, expected: string | RegExp) {
+  function reject(template: string, expected: string) {
     const info = getDiagnosticTemplateInfo(context, type, 'app/app.component.html', template);
     if (info) {
       const diagnostics = getTemplateExpressionDiagnostics(info);
@@ -240,4 +240,4 @@ const FILES: Directory = {
       `
     }
   }
-};
+};

packages/compiler-cli/test/metadata/collector_spec.ts

@@ -9,7 +9,7 @@
 import * as ts from 'typescript';
 
 import {MetadataCollector} from '../../src/metadata/collector';
-import {ClassMetadata, ConstructorMetadata, METADATA_VERSION, MetadataEntry, ModuleMetadata, isClassMetadata, isMetadataGlobalReferenceExpression} from '../../src/metadata/schema';
+import {ClassMetadata, ConstructorMetadata, METADATA_VERSION, MetadataEntry, MetadataMap, MetadataSymbolicExpression, ModuleMetadata, isClassMetadata, isMetadataGlobalReferenceExpression} from '../../src/metadata/schema';
 
 import {Directory, Host, expectValidSources} from './typescript.mocks';
 
@@ -269,9 +269,11 @@ describe('Collector', () => {
   it('should provide any reference for an any ctor parameter type', () => {
     const casesAny = <ClassMetadata>casesMetadata.metadata['CaseAny'];
     expect(casesAny).toBeTruthy();
-    const ctorData = casesAny.members !['__ctor__'];
-    expect(ctorData).toEqual(
-        [{__symbolic: 'constructor', parameters: [{__symbolic: 'reference', name: 'any'}]}]);
+    const ctorData = casesAny.members !['__ctor__'] as ConstructorMetadata[];
+    expect(ctorData).toEqual([{
+      __symbolic: 'constructor',
+      parameters: [{__symbolic: 'reference', name: 'any'} as MetadataSymbolicExpression]
+    }]);
   });
 
   it('should record annotations on set and get declarations', () => {
@@ -285,7 +287,8 @@ describe('Collector', () => {
           arguments: ['firstName']
         }]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
+
     const caseGetProp = <ClassMetadata>casesMetadata.metadata['GetProp'];
     expect(caseGetProp.members).toEqual(propertyData(11));
     const caseSetProp = <ClassMetadata>casesMetadata.metadata['SetProp'];
@@ -297,8 +300,7 @@ describe('Collector', () => {
   it('should record references to parameterized types', () => {
     const casesForIn = <ClassMetadata>casesMetadata.metadata['NgFor'];
     expect(casesForIn).toEqual({
-      __symbolic: 'class',
-      decorators: [{
+      __symbolic: 'class', decorators: [{
         __symbolic: 'call',
         expression: {
           __symbolic: 'reference',
@@ -308,17 +310,17 @@ describe('Collector', () => {
           character: 7
         }
       }],
-      members: {
-        __ctor__: [{
-          __symbolic: 'constructor',
-          parameters: [{
-            __symbolic: 'reference',
-            name: 'ClassReference',
-            arguments: [{__symbolic: 'reference', name: 'NgForRow'}]
-          }]
-        }]
-      }
-    });
+          members: {
+            __ctor__: [{
+              __symbolic: 'constructor',
+              parameters: [{
+                __symbolic: 'reference',
+                name: 'ClassReference',
+                arguments: [{__symbolic: 'reference', name: 'NgForRow'}]
+              }]
+            }]
+          }
+    } as any as ClassMetadata);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should report errors for destructured imports', () => {
@@ -358,9 +360,9 @@ describe('Collector', () => {
     const someClass = <ClassMetadata>metadata.metadata['SomeClass'];
     const ctor = <ConstructorMetadata>someClass.members !['__ctor__'][0];
     const parameters = ctor.parameters;
-    expect(parameters).toEqual([
-      {__symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29}
-    ]);
+    expect(parameters).toEqual([{
+      __symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29
+    } as MetadataSymbolicExpression]);
   });
 
   it('should record all exported classes', () => {
@@ -443,9 +445,9 @@ describe('Collector', () => {
     const someClass = <ClassMetadata>metadata.metadata['SomeClass'];
     const ctor = <ConstructorMetadata>someClass.members !['__ctor__'][0];
     const parameters = ctor.parameters;
-    expect(parameters).toEqual([
-      {__symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29}
-    ]);
+    expect(parameters).toEqual([{
+      __symbolic: 'reference', module: 'angular2/common', name: 'NgFor', line: 6, character: 29
+    } as MetadataSymbolicExpression]);
   });
 
   it('should be able to collect the value of an enum', () => {
@@ -533,7 +535,7 @@ describe('Collector', () => {
           arguments: ['a']
         }
       }]
-    }]);
+    }] as any as MetadataSymbolicExpression[]);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should be able to collect a static field', () => {
@@ -576,7 +578,7 @@ describe('Collector', () => {
           }
         }]
       }]
-    }]);
+    }] as any as MetadataSymbolicExpression[]);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should be able to collect a method with a conditional expression', () => {
@@ -764,7 +766,7 @@ describe('Collector', () => {
         }]],
         parameters: [{__symbolic: 'reference', name: 'any'}]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
   });
 
   describe('with interpolations', () => {
@@ -868,7 +870,7 @@ describe('Collector', () => {
           {__symbolic: 'reference', module: './foo', name: 'Foo', line: 3, character: 24}
         ]
       }]
-    });
+    } as any as MetadataMap);  // TODO: Review use of `any` here (#19904)
   });
 
   it('should treat exported class expressions as a class', () => {

packages/compiler-cli/test/ngc_spec.ts

@@ -1747,7 +1747,7 @@ describe('ngc transformer command-line', () => {
       const exitCode =
           main(['-p', path.join(basePath, 'src/tsconfig.json')], message => messages.push(message));
       expect(exitCode).toBe(1, 'Compile was expected to fail');
-      expect(messages[0]).toContain(['Tagged template expressions are not supported in metadata']);
+      expect(messages[0]).toContain('Tagged template expressions are not supported in metadata');
     });
 
     // Regression: #20076

packages/compiler-cli/test/transformers/node_emitter_spec.ts

@@ -502,15 +502,15 @@ describe('TypeScriptNodeEmitter', () => {
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          name: null
+          name: null !  // TODO: Review use of `!` here (#19904)
         },
         {
           source: sourceUrl,
           generatedLine: 3,
           generatedColumn: 16,
           originalLine: 1,
           originalColumn: 26,
-          name: null
+          name: null !  // TODO: Review use of `!` here (#19904)
         }
       ]);
     });

packages/compiler-cli/test/transformers/program_spec.ts

@@ -373,8 +373,8 @@ describe('ng program', () => {
         {rootNames: [path.resolve(testSupport.basePath, 'src/main.ts')], options, host});
     program.loadNgStructureAsync().then(() => {
       program.emit();
-      const factory =
-          fs.readFileSync(path.resolve(testSupport.basePath, 'built/src/main.ngfactory.js'));
+      const ngFactoryPath = path.resolve(testSupport.basePath, 'built/src/main.ngfactory.js');
+      const factory = fs.readFileSync(ngFactoryPath, 'utf8');
       expect(factory).toContain('Hello world!');
       done();
     });
@@ -677,8 +677,9 @@ describe('ng program', () => {
       program.listLazyRoutes();
       program.emit();
 
-      const lazyNgFactory =
-          fs.readFileSync(path.resolve(testSupport.basePath, 'built/src/lazy/lazy.ngfactory.js'));
+      const ngFactoryPath = path.resolve(testSupport.basePath, 'built/src/lazy/lazy.ngfactory.js');
+      const lazyNgFactory = fs.readFileSync(ngFactoryPath, 'utf8');
+
       expect(lazyNgFactory).toContain('import * as i1 from "./lazy";');
     });
 
@@ -735,8 +736,10 @@ describe('ng program', () => {
       expect(normalizeRoutes(program.listLazyRoutes('src/main#MainModule'))).toEqual([
         {
           module: {name: 'MainModule', filePath: path.resolve(testSupport.basePath, 'src/main.ts')},
-          referencedModule:
-              {name: undefined, filePath: path.resolve(testSupport.basePath, 'src/child.ts')},
+          referencedModule: {
+            name: undefined as any as string,  // TODO: Review use of `any` here (#19904)
+            filePath: path.resolve(testSupport.basePath, 'src/child.ts')
+          },
           route: './child'
         },
       ]);