From c6b206ee4b5520f828884838a57e7b4836a04038 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 16 Apr 2018 00:15:12 -0600
Subject: [PATCH] feat(compiler): support `// ...` and `// TODO` in mock
 compiler expectations (#23441)

PR Close #23441
---
 .../compiler/test/render3/mock_compile.ts     |  4 ++
 .../test/render3/mock_compiler_spec.ts        | 38 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/packages/compiler/test/render3/mock_compile.ts b/packages/compiler/test/render3/mock_compile.ts
index 1a4203a412..4326d66d3d 100644
--- a/packages/compiler/test/render3/mock_compile.ts
+++ b/packages/compiler/test/render3/mock_compile.ts
@@ -69,6 +69,10 @@ function tokenize(text: string): Piece[] {
 export function expectEmit(
     source: string, expected: string, description: string,
     assertIdentifiers?: {[name: string]: RegExp}) {
+  // turns `// ...` into `…`
+  // remove `// TODO` comment lines
+  expected = expected.replace(/\/\/\s*\.\.\./g, ELLIPSIS).replace(/\/\/\s*TODO.*?\n/g, '');
+
   const pieces = tokenize(expected);
   const {regexp, groups} = buildMatcher(pieces);
   const matches = source.match(regexp);
diff --git a/packages/compiler/test/render3/mock_compiler_spec.ts b/packages/compiler/test/render3/mock_compiler_spec.ts
index e3bb9bea14..3b7ceffa87 100644
--- a/packages/compiler/test/render3/mock_compiler_spec.ts
+++ b/packages/compiler/test/render3/mock_compiler_spec.ts
@@ -87,7 +87,7 @@ describe('mock_compiler', () => {
     });
   });
 
-  it('should be able to skip untested regions', () => {
+  it('should be able to skip untested regions (… and // ...)', () => {
     const files = {
       app: {
         'hello.component.ts': `
@@ -113,10 +113,43 @@ describe('mock_compiler', () => {
     // The special character … means anything can be generated between the two sections allowing
     // skipping sections of the output that are not under test. The ellipsis unicode char (…) is
     // used instead of '...' because '...' is legal JavaScript (the spread operator) and might
-    // need to be tested.
+    // need to be tested. `// ...` could also be used in place of `…`.
     expectEmit(result.source, 'ctx.name … ctx.name.length', 'could not find correct length access');
+    expectEmit(
+        result.source, 'ctx.name // ... ctx.name.length', 'could not find correct length access');
   });
 
+  it('should be able to skip TODO comments (// TODO)', () => {
+    const files = {
+      app: {
+        'hello.component.ts': `
+          import {Component, Input} from '@angular/core';
+
+          @Component({template: 'Hello!'})
+          export class HelloComponent { }
+        `,
+        'hello.module.ts': `
+          import {NgModule} from '@angular/core';
+          import {HelloComponent} from './hello.component';
+
+          @NgModule({declarations: [HelloComponent]})
+          export class HelloModule {}
+        `
+      }
+    };
+
+    const result = compile(files, angularFiles);
+
+    expectEmit(
+        result.source, `
+    // TODO: this comment should not be taken into account
+    $r3$.ɵT(0, 'Hello!');
+    // TODO: this comment should not be taken into account
+    `,
+        'todo comments should be ignored');
+  });
+
+
   it('should be able to enforce consistent identifiers', () => {
     const files = {
       app: {
@@ -184,5 +217,4 @@ describe('mock_compiler', () => {
           result.source, '$ctx$.$n$ … $ctx$.$n$.length', 'Match names', {'$n$': /(not)_(\1)/});
     }).toThrowError(/"\$n\$" is "name" which doesn't match \/\(not\)_\(\\1\)\//);
   });
-
 });
\ No newline at end of file