From 528e7d787c0d389147b0be218fd6c8a9bdae6e3a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 12 Apr 2021 11:22:24 +0200
Subject: [PATCH] test: update CLI integration tests to run only for Ivy
 (#41434)

In Angular CLI 12, application can only be compiled using Ivy, therefore we shouldn't run these tests when Bazel runs with View Engine context.

PR Close #41434
---
 .../size-tracking/integration-payloads.json   | 14 ++++----
 integration/BUILD.bazel                       | 33 ++++++++++++-------
 integration/ng_elements_schematics/test.ts    |  2 +-
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/goldens/size-tracking/integration-payloads.json b/goldens/size-tracking/integration-payloads.json
index 83365217d6..eec8a92b59 100644
--- a/goldens/size-tracking/integration-payloads.json
+++ b/goldens/size-tracking/integration-payloads.json
@@ -11,7 +11,7 @@
   "cli-hello-world-ivy-minimal": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 1170,
+        "runtime-es2015": 1190,
         "main-es2015": 17597,
         "polyfills-es2015": 36709
       }
@@ -20,7 +20,7 @@
   "cli-hello-world-ivy-compat": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 1170,
+        "runtime-es2015": 1190,
         "main-es2015": 144579,
         "polyfills-es2015": 36964
       }
@@ -29,7 +29,7 @@
   "cli-hello-world-ivy-i18n": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 1170,
+        "runtime-es2015": 1190,
         "main-es2015": 136546,
         "polyfills-es2015": 37641
       }
@@ -38,17 +38,17 @@
   "cli-hello-world-lazy": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 2285,
-        "main-es2015": 241389,
+        "runtime-es2015": 3354,
+        "main-es2015": 295076,
         "polyfills-es2015": 36975,
-        "5-es2015": 753
+        "434-es2015": 796
       }
     }
   },
   "forms": {
     "master": {
       "uncompressed": {
-        "runtime-es2015": 1170,
+        "runtime-es2015": 1150,
         "main-es2015": 162346,
         "polyfills-es2015": 36975
       }
diff --git a/integration/BUILD.bazel b/integration/BUILD.bazel
index edc6ad7587..5897f8e039 100644
--- a/integration/BUILD.bazel
+++ b/integration/BUILD.bazel
@@ -33,24 +33,33 @@ INTEGRATION_TESTS = {
             "no-ivy-aot",
         ],
     },
-    "cli-elements-universal": {},
-    "cli-hello-world": {"commands": "payload_size_tracking"},
-    "cli-hello-world-ivy-compat": {"commands": "payload_size_tracking"},
+    "cli-elements-universal": {
+        "tags": ["ivy-only"],
+    },
+    "cli-hello-world": {
+        "commands": "payload_size_tracking",
+        "tags": ["ivy-only"],
+    },
+    "cli-hello-world-ivy-compat": {
+        "commands": "payload_size_tracking",
+        "tags": ["ivy-only"],
+    },
     "cli-hello-world-ivy-i18n": {
         "commands": "payload_size_tracking",
-        # TODO: (FW-2165) cli-hello-world-ivy-i18n fails on a bundle size check with Ivy bundles
-        "tags": ["fixme-ivy-aot"],
+        "tags": ["ivy-only"],
+    },
+    "cli-hello-world-ivy-minimal": {
+        "commands": "payload_size_tracking",
+        "tags": ["ivy-only"],
     },
-    "cli-hello-world-ivy-minimal": {"commands": "payload_size_tracking"},
     "cli-hello-world-lazy": {
         "commands": "payload_size_tracking",
-        # TODO: (FW-2165) cli-hello-world-lazy fails on a bundle size check with Ivy bundles
-        "tags": ["fixme-ivy-aot"],
+        "tags": ["ivy-only"],
     },
     "dynamic-compiler": {"tags": ["no-ivy-aot"]},
     "forms": {
         "commands": "payload_size_tracking",
-        "tags": ["no-ivy-aot"],
+        "tags": ["ivy-only"],
     },
     "hello_world__closure": {
         # TODO: Re-enable the payload_size_tracking command:
@@ -68,11 +77,11 @@ INTEGRATION_TESTS = {
     },
     "i18n": {"tags": ["no-ivy-aot"]},
     "injectable-def": {"tags": ["no-ivy-aot"]},
-    "ivy-i18n": {"tags": ["no-ivy-aot"]},
-    "trusted-types": {},
+    "ivy-i18n": {"tags": ["ivy-only"]},
+    "trusted-types": {"tags": ["ivy-only"]},
     "language_service_plugin": {},
     "ng_elements": {"tags": ["no-ivy-aot"]},
-    "ng_elements_schematics": {"tags": ["no-ivy-aot"]},
+    "ng_elements_schematics": {"tags": ["ivy-only"]},
     "ng_update": {},
     "ng_update_migrations": {"tags": ["no-ivy-aot"]},
     "ngcc": {"tags": ["no-ivy-aot"]},
diff --git a/integration/ng_elements_schematics/test.ts b/integration/ng_elements_schematics/test.ts
index 1a26c6455f..e7a372ae1e 100644
--- a/integration/ng_elements_schematics/test.ts
+++ b/integration/ng_elements_schematics/test.ts
@@ -46,7 +46,7 @@ for (let p of nodePackages) {
 }
 
 // TODO(alan-agius4): remove once the main repo dependency on `@angular-devkut/build-angular` is `0.1200.0-next.9` or greater.
-packages['@angular-devkit/build-angular'] = 'file:../../../node_modules/@angular-devkit/build-angular';
+packages['@angular-devkit/build-angular'] = 'github:angular/angular-devkit-build-angular-builds#e0c1374b12cfc892844030431bc19f631c0086a5';
 
 // Clean up previously run test
 cd(__dirname);