From 36284713b21edae9b40b64848fdd254bbd661cbc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 28 Jan 2019 14:54:34 +0000
Subject: [PATCH] build: rename cli-hello-world-ivy test to
 cli-hello-world-ivy-compat (#28372)

There are two ways to bootstrap an Ivy app: with `platformBrowserDynamic().bootstrapModule` and `renderComponent`.

To distinguish between these two approaches we call the `platformBrowserDynamic().bootstrapModule` way `ivy-compat` and the `renderComponent` way just `ivy`.

PR Close #28372
---
 integration/_payload-limits.json              |   2 +-
 .../.editorconfig                             |   0
 .../README.md                                 |   0
 .../angular.json                              |  22 +++++++++---------
 .../debug-test.sh                             |   0
 .../e2e/protractor.conf.js                    |   0
 .../e2e/src/app.e2e-spec.ts                   |   2 +-
 .../e2e/src/app.po.ts                         |   0
 .../e2e/tsconfig.e2e.json                     |   0
 .../package.json                              |   2 +-
 .../src/app/app.component.css                 |   0
 .../src/app/app.component.html                |   0
 .../src/app/app.component.spec.ts             |   6 ++---
 .../src/app/app.component.ts                  |   2 +-
 .../src/app/app.module.ts                     |   0
 .../src/assets/.gitkeep                       |   0
 .../src/browserslist                          |   0
 .../src/environments/environment.prod.ts      |   0
 .../src/environments/environment.ts           |   0
 .../src/favicon.ico                           | Bin
 .../src/index.html                            |   2 +-
 .../src/karma.conf.js                         |   0
 .../src/main.ts                               |   0
 .../src/polyfills.ts                          |   0
 .../src/styles.css                            |   0
 .../src/test.ts                               |   0
 .../src/tsconfig.app.json                     |   0
 .../src/tsconfig.spec.json                    |   0
 .../src/tslint.json                           |   0
 .../tsconfig.json                             |   0
 .../tslint.json                               |   0
 .../yarn.lock                                 |   0
 integration/run_tests.sh                      |   6 ++---
 33 files changed, 22 insertions(+), 22 deletions(-)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/.editorconfig (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/README.md (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/angular.json (84%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/debug-test.sh (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/e2e/protractor.conf.js (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/e2e/src/app.e2e-spec.ts (94%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/e2e/src/app.po.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/e2e/tsconfig.e2e.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/package.json (98%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/app/app.component.css (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/app/app.component.html (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/app/app.component.spec.ts (83%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/app/app.component.ts (82%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/app/app.module.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/assets/.gitkeep (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/browserslist (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/environments/environment.prod.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/environments/environment.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/favicon.ico (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/index.html (87%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/karma.conf.js (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/main.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/polyfills.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/styles.css (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/test.ts (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/tsconfig.app.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/tsconfig.spec.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/src/tslint.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/tsconfig.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/tslint.json (100%)
 rename integration/{cli-hello-world-ivy => cli-hello-world-ivy-compat}/yarn.lock (100%)

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index 08eb2c74b1..d64203168f 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -8,7 +8,7 @@
       }
     }
   },
-  "cli-hello-world-ivy": {
+  "cli-hello-world-ivy-compat": {
     "master": {
       "uncompressed": {
         "runtime": 1440,
diff --git a/integration/cli-hello-world-ivy/.editorconfig b/integration/cli-hello-world-ivy-compat/.editorconfig
similarity index 100%
rename from integration/cli-hello-world-ivy/.editorconfig
rename to integration/cli-hello-world-ivy-compat/.editorconfig
diff --git a/integration/cli-hello-world-ivy/README.md b/integration/cli-hello-world-ivy-compat/README.md
similarity index 100%
rename from integration/cli-hello-world-ivy/README.md
rename to integration/cli-hello-world-ivy-compat/README.md
diff --git a/integration/cli-hello-world-ivy/angular.json b/integration/cli-hello-world-ivy-compat/angular.json
similarity index 84%
rename from integration/cli-hello-world-ivy/angular.json
rename to integration/cli-hello-world-ivy-compat/angular.json
index 4dc78d4c92..d86da96275 100644
--- a/integration/cli-hello-world-ivy/angular.json
+++ b/integration/cli-hello-world-ivy-compat/angular.json
@@ -6,7 +6,7 @@
   },
   "newProjectRoot": "projects",
   "projects": {
-    "cli-hello-world-ivy": {
+    "cli-hello-world-ivy-compat": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
@@ -60,17 +60,17 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "cli-hello-world-ivy:build"
+            "browserTarget": "cli-hello-world-ivy-compat:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "cli-hello-world-ivy:build:production"
+              "browserTarget": "cli-hello-world-ivy-compat:build:production"
             },
             "ci": {
               "progress": false
             },
             "ci-production": {
-              "browserTarget": "cli-hello-world-ivy:build:production",
+              "browserTarget": "cli-hello-world-ivy-compat:build:production",
               "progress": false
             }
           }
@@ -78,7 +78,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "cli-hello-world-ivy:build"
+            "browserTarget": "cli-hello-world-ivy-compat:build"
           }
         },
         "test": {
@@ -112,7 +112,7 @@
         }
       }
     },
-    "cli-hello-world-ivy-e2e": {
+    "cli-hello-world-ivy-compat-e2e": {
       "root": "e2e/",
       "projectType": "application",
       "prefix": "",
@@ -121,17 +121,17 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "cli-hello-world-ivy:serve"
+            "devServerTarget": "cli-hello-world-ivy-compat:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "cli-hello-world-ivy:serve:production"
+              "devServerTarget": "cli-hello-world-ivy-compat:serve:production"
             },
             "ci": {
-              "devServerTarget": "cli-hello-world-ivy:serve:ci"
+              "devServerTarget": "cli-hello-world-ivy-compat:serve:ci"
             },
             "ci-production": {
-              "devServerTarget": "cli-hello-world-ivy:serve:ci-production"
+              "devServerTarget": "cli-hello-world-ivy-compat:serve:ci-production"
             }
           }
         },
@@ -147,5 +147,5 @@
       }
     }
   },
-  "defaultProject": "cli-hello-world-ivy"
+  "defaultProject": "cli-hello-world-ivy-compat"
 }
diff --git a/integration/cli-hello-world-ivy/debug-test.sh b/integration/cli-hello-world-ivy-compat/debug-test.sh
similarity index 100%
rename from integration/cli-hello-world-ivy/debug-test.sh
rename to integration/cli-hello-world-ivy-compat/debug-test.sh
diff --git a/integration/cli-hello-world-ivy/e2e/protractor.conf.js b/integration/cli-hello-world-ivy-compat/e2e/protractor.conf.js
similarity index 100%
rename from integration/cli-hello-world-ivy/e2e/protractor.conf.js
rename to integration/cli-hello-world-ivy-compat/e2e/protractor.conf.js
diff --git a/integration/cli-hello-world-ivy/e2e/src/app.e2e-spec.ts b/integration/cli-hello-world-ivy-compat/e2e/src/app.e2e-spec.ts
similarity index 94%
rename from integration/cli-hello-world-ivy/e2e/src/app.e2e-spec.ts
rename to integration/cli-hello-world-ivy-compat/e2e/src/app.e2e-spec.ts
index c60c6459d8..29e27e6edb 100644
--- a/integration/cli-hello-world-ivy/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-hello-world-ivy-compat/e2e/src/app.e2e-spec.ts
@@ -9,7 +9,7 @@ describe('cli-hello-world-ivy App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to cli-hello-world-ivy!');
+    expect(page.getParagraphText()).toEqual('Welcome to cli-hello-world-ivy-compat!');
   });
 
   it('the percent pipe should work', () => {
diff --git a/integration/cli-hello-world-ivy/e2e/src/app.po.ts b/integration/cli-hello-world-ivy-compat/e2e/src/app.po.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/e2e/src/app.po.ts
rename to integration/cli-hello-world-ivy-compat/e2e/src/app.po.ts
diff --git a/integration/cli-hello-world-ivy/e2e/tsconfig.e2e.json b/integration/cli-hello-world-ivy-compat/e2e/tsconfig.e2e.json
similarity index 100%
rename from integration/cli-hello-world-ivy/e2e/tsconfig.e2e.json
rename to integration/cli-hello-world-ivy-compat/e2e/tsconfig.e2e.json
diff --git a/integration/cli-hello-world-ivy/package.json b/integration/cli-hello-world-ivy-compat/package.json
similarity index 98%
rename from integration/cli-hello-world-ivy/package.json
rename to integration/cli-hello-world-ivy-compat/package.json
index 3f89b21884..692291a4a2 100644
--- a/integration/cli-hello-world-ivy/package.json
+++ b/integration/cli-hello-world-ivy-compat/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "cli-hello-world-ivy",
+  "name": "cli-hello-world-ivy-compat",
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
diff --git a/integration/cli-hello-world-ivy/src/app/app.component.css b/integration/cli-hello-world-ivy-compat/src/app/app.component.css
similarity index 100%
rename from integration/cli-hello-world-ivy/src/app/app.component.css
rename to integration/cli-hello-world-ivy-compat/src/app/app.component.css
diff --git a/integration/cli-hello-world-ivy/src/app/app.component.html b/integration/cli-hello-world-ivy-compat/src/app/app.component.html
similarity index 100%
rename from integration/cli-hello-world-ivy/src/app/app.component.html
rename to integration/cli-hello-world-ivy-compat/src/app/app.component.html
diff --git a/integration/cli-hello-world-ivy/src/app/app.component.spec.ts b/integration/cli-hello-world-ivy-compat/src/app/app.component.spec.ts
similarity index 83%
rename from integration/cli-hello-world-ivy/src/app/app.component.spec.ts
rename to integration/cli-hello-world-ivy-compat/src/app/app.component.spec.ts
index e4c777c873..9d618f8944 100644
--- a/integration/cli-hello-world-ivy/src/app/app.component.spec.ts
+++ b/integration/cli-hello-world-ivy-compat/src/app/app.component.spec.ts
@@ -16,16 +16,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'cli-hello-world-ivy'`, () => {
+  it(`should have as title 'cli-hello-world-ivy-compat'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('cli-hello-world-ivy');
+    expect(app.title).toEqual('cli-hello-world-ivy-compat');
   });
 
   it('should render title in a h1 tag', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to cli-hello-world-ivy!');
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to cli-hello-world-ivy-compat!');
   });
 });
diff --git a/integration/cli-hello-world-ivy/src/app/app.component.ts b/integration/cli-hello-world-ivy-compat/src/app/app.component.ts
similarity index 82%
rename from integration/cli-hello-world-ivy/src/app/app.component.ts
rename to integration/cli-hello-world-ivy-compat/src/app/app.component.ts
index dd8a6cc124..c29d68ec2f 100644
--- a/integration/cli-hello-world-ivy/src/app/app.component.ts
+++ b/integration/cli-hello-world-ivy-compat/src/app/app.component.ts
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'cli-hello-world-ivy';
+  title = 'cli-hello-world-ivy-compat';
 }
diff --git a/integration/cli-hello-world-ivy/src/app/app.module.ts b/integration/cli-hello-world-ivy-compat/src/app/app.module.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/app/app.module.ts
rename to integration/cli-hello-world-ivy-compat/src/app/app.module.ts
diff --git a/integration/cli-hello-world-ivy/src/assets/.gitkeep b/integration/cli-hello-world-ivy-compat/src/assets/.gitkeep
similarity index 100%
rename from integration/cli-hello-world-ivy/src/assets/.gitkeep
rename to integration/cli-hello-world-ivy-compat/src/assets/.gitkeep
diff --git a/integration/cli-hello-world-ivy/src/browserslist b/integration/cli-hello-world-ivy-compat/src/browserslist
similarity index 100%
rename from integration/cli-hello-world-ivy/src/browserslist
rename to integration/cli-hello-world-ivy-compat/src/browserslist
diff --git a/integration/cli-hello-world-ivy/src/environments/environment.prod.ts b/integration/cli-hello-world-ivy-compat/src/environments/environment.prod.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/environments/environment.prod.ts
rename to integration/cli-hello-world-ivy-compat/src/environments/environment.prod.ts
diff --git a/integration/cli-hello-world-ivy/src/environments/environment.ts b/integration/cli-hello-world-ivy-compat/src/environments/environment.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/environments/environment.ts
rename to integration/cli-hello-world-ivy-compat/src/environments/environment.ts
diff --git a/integration/cli-hello-world-ivy/src/favicon.ico b/integration/cli-hello-world-ivy-compat/src/favicon.ico
similarity index 100%
rename from integration/cli-hello-world-ivy/src/favicon.ico
rename to integration/cli-hello-world-ivy-compat/src/favicon.ico
diff --git a/integration/cli-hello-world-ivy/src/index.html b/integration/cli-hello-world-ivy-compat/src/index.html
similarity index 87%
rename from integration/cli-hello-world-ivy/src/index.html
rename to integration/cli-hello-world-ivy-compat/src/index.html
index cc2452ebd5..14112704fa 100644
--- a/integration/cli-hello-world-ivy/src/index.html
+++ b/integration/cli-hello-world-ivy-compat/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>CliHelloWorldIvy</title>
+  <title>CliHelloWorldIvyCompat</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/integration/cli-hello-world-ivy/src/karma.conf.js b/integration/cli-hello-world-ivy-compat/src/karma.conf.js
similarity index 100%
rename from integration/cli-hello-world-ivy/src/karma.conf.js
rename to integration/cli-hello-world-ivy-compat/src/karma.conf.js
diff --git a/integration/cli-hello-world-ivy/src/main.ts b/integration/cli-hello-world-ivy-compat/src/main.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/main.ts
rename to integration/cli-hello-world-ivy-compat/src/main.ts
diff --git a/integration/cli-hello-world-ivy/src/polyfills.ts b/integration/cli-hello-world-ivy-compat/src/polyfills.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/polyfills.ts
rename to integration/cli-hello-world-ivy-compat/src/polyfills.ts
diff --git a/integration/cli-hello-world-ivy/src/styles.css b/integration/cli-hello-world-ivy-compat/src/styles.css
similarity index 100%
rename from integration/cli-hello-world-ivy/src/styles.css
rename to integration/cli-hello-world-ivy-compat/src/styles.css
diff --git a/integration/cli-hello-world-ivy/src/test.ts b/integration/cli-hello-world-ivy-compat/src/test.ts
similarity index 100%
rename from integration/cli-hello-world-ivy/src/test.ts
rename to integration/cli-hello-world-ivy-compat/src/test.ts
diff --git a/integration/cli-hello-world-ivy/src/tsconfig.app.json b/integration/cli-hello-world-ivy-compat/src/tsconfig.app.json
similarity index 100%
rename from integration/cli-hello-world-ivy/src/tsconfig.app.json
rename to integration/cli-hello-world-ivy-compat/src/tsconfig.app.json
diff --git a/integration/cli-hello-world-ivy/src/tsconfig.spec.json b/integration/cli-hello-world-ivy-compat/src/tsconfig.spec.json
similarity index 100%
rename from integration/cli-hello-world-ivy/src/tsconfig.spec.json
rename to integration/cli-hello-world-ivy-compat/src/tsconfig.spec.json
diff --git a/integration/cli-hello-world-ivy/src/tslint.json b/integration/cli-hello-world-ivy-compat/src/tslint.json
similarity index 100%
rename from integration/cli-hello-world-ivy/src/tslint.json
rename to integration/cli-hello-world-ivy-compat/src/tslint.json
diff --git a/integration/cli-hello-world-ivy/tsconfig.json b/integration/cli-hello-world-ivy-compat/tsconfig.json
similarity index 100%
rename from integration/cli-hello-world-ivy/tsconfig.json
rename to integration/cli-hello-world-ivy-compat/tsconfig.json
diff --git a/integration/cli-hello-world-ivy/tslint.json b/integration/cli-hello-world-ivy-compat/tslint.json
similarity index 100%
rename from integration/cli-hello-world-ivy/tslint.json
rename to integration/cli-hello-world-ivy-compat/tslint.json
diff --git a/integration/cli-hello-world-ivy/yarn.lock b/integration/cli-hello-world-ivy-compat/yarn.lock
similarity index 100%
rename from integration/cli-hello-world-ivy/yarn.lock
rename to integration/cli-hello-world-ivy-compat/yarn.lock
diff --git a/integration/run_tests.sh b/integration/run_tests.sh
index f327287300..fa8e594b54 100755
--- a/integration/run_tests.sh
+++ b/integration/run_tests.sh
@@ -61,9 +61,9 @@ for testDir in ${TEST_DIRS}; do
     yarn install --cache-folder ../$cache
     yarn test || exit 1
 
-    # Track payload size for cli-hello-world, cli-hello-world-ivy and hello_world__closure
-    if $CI && ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy ]] || [[ $testDir == hello_world__closure ]]); then
-      if ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy ]]); then
+    # Track payload size for cli-hello-world, cli-hello-world-ivy-compat and hello_world__closure
+    if $CI && ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-compat ]] || [[ $testDir == hello_world__closure ]]); then
+      if ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-compat ]]); then
         yarn build
       fi