From 65820181a2b38d97b273920405ff6225da9aef2b Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Tue, 28 Jun 2022 10:46:34 -0700
Subject: [PATCH] test(core): rename r2-based hello_world and todo bundling
 tests (#46559)

In the previous commit, the r3-based hello_world and todo tests were deleted
in favor of the r2 versions. This commit renames the r2 versions to drop the
r2 suffix.

PR Close #46559
---
 .../test/bundling/{hello_world_r2 => hello_world}/BUILD.bazel   | 0
 .../test/bundling/{hello_world_r2 => hello_world}/index.html    | 0
 .../core/test/bundling/{hello_world_r2 => hello_world}/index.ts | 0
 .../{hello_world_r2 => hello_world}/treeshaking_spec.ts         | 2 +-
 packages/core/test/bundling/{todo_r2 => todo}/BUILD.bazel       | 2 +-
 packages/core/test/bundling/{todo_r2 => todo}/base.css          | 0
 packages/core/test/bundling/{todo_r2 => todo}/index.html        | 0
 packages/core/test/bundling/{todo_r2 => todo}/index.ts          | 0
 packages/core/test/bundling/{todo_r2 => todo}/todo.css          | 0
 packages/core/test/bundling/{todo_r2 => todo}/todo_e2e_spec.ts  | 2 +-
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/core/test/bundling/{hello_world_r2 => hello_world}/BUILD.bazel (100%)
 rename packages/core/test/bundling/{hello_world_r2 => hello_world}/index.html (100%)
 rename packages/core/test/bundling/{hello_world_r2 => hello_world}/index.ts (100%)
 rename packages/core/test/bundling/{hello_world_r2 => hello_world}/treeshaking_spec.ts (99%)
 rename packages/core/test/bundling/{todo_r2 => todo}/BUILD.bazel (97%)
 rename packages/core/test/bundling/{todo_r2 => todo}/base.css (100%)
 rename packages/core/test/bundling/{todo_r2 => todo}/index.html (100%)
 rename packages/core/test/bundling/{todo_r2 => todo}/index.ts (100%)
 rename packages/core/test/bundling/{todo_r2 => todo}/todo.css (100%)
 rename packages/core/test/bundling/{todo_r2 => todo}/todo_e2e_spec.ts (96%)

diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/BUILD.bazel
rename to packages/core/test/bundling/hello_world/BUILD.bazel
diff --git a/packages/core/test/bundling/hello_world_r2/index.html b/packages/core/test/bundling/hello_world/index.html
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/index.html
rename to packages/core/test/bundling/hello_world/index.html
diff --git a/packages/core/test/bundling/hello_world_r2/index.ts b/packages/core/test/bundling/hello_world/index.ts
similarity index 100%
rename from packages/core/test/bundling/hello_world_r2/index.ts
rename to packages/core/test/bundling/hello_world/index.ts
diff --git a/packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
similarity index 99%
rename from packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts
rename to packages/core/test/bundling/hello_world/treeshaking_spec.ts
index f8e4fed3097..793c88482e5 100644
--- a/packages/core/test/bundling/hello_world_r2/treeshaking_spec.ts
+++ b/packages/core/test/bundling/hello_world/treeshaking_spec.ts
@@ -11,7 +11,7 @@ import '@angular/compiler';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const PACKAGE = 'angular/packages/core/test/bundling/hello_world_r2';
+const PACKAGE = 'angular/packages/core/test/bundling/hello_world';
 
 describe('treeshaking with uglify', () => {
   let content: string;
diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
similarity index 97%
rename from packages/core/test/bundling/todo_r2/BUILD.bazel
rename to packages/core/test/bundling/todo/BUILD.bazel
index 990cac234f7..7f3d35537d2 100644
--- a/packages/core/test/bundling/todo_r2/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -68,7 +68,7 @@ genrule(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "@angular/core/test/bundling/todo_r2",
+    entry_module = "@angular/core/test/bundling/todo",
     scripts = [
         "//tools/rxjs:rxjs_umd_modules",
     ],
diff --git a/packages/core/test/bundling/todo_r2/base.css b/packages/core/test/bundling/todo/base.css
similarity index 100%
rename from packages/core/test/bundling/todo_r2/base.css
rename to packages/core/test/bundling/todo/base.css
diff --git a/packages/core/test/bundling/todo_r2/index.html b/packages/core/test/bundling/todo/index.html
similarity index 100%
rename from packages/core/test/bundling/todo_r2/index.html
rename to packages/core/test/bundling/todo/index.html
diff --git a/packages/core/test/bundling/todo_r2/index.ts b/packages/core/test/bundling/todo/index.ts
similarity index 100%
rename from packages/core/test/bundling/todo_r2/index.ts
rename to packages/core/test/bundling/todo/index.ts
diff --git a/packages/core/test/bundling/todo_r2/todo.css b/packages/core/test/bundling/todo/todo.css
similarity index 100%
rename from packages/core/test/bundling/todo_r2/todo.css
rename to packages/core/test/bundling/todo/todo.css
diff --git a/packages/core/test/bundling/todo_r2/todo_e2e_spec.ts b/packages/core/test/bundling/todo/todo_e2e_spec.ts
similarity index 96%
rename from packages/core/test/bundling/todo_r2/todo_e2e_spec.ts
rename to packages/core/test/bundling/todo/todo_e2e_spec.ts
index fde580becb2..bba954e5c02 100644
--- a/packages/core/test/bundling/todo_r2/todo_e2e_spec.ts
+++ b/packages/core/test/bundling/todo/todo_e2e_spec.ts
@@ -11,7 +11,7 @@ import '@angular/compiler';
 import {withBody} from '@angular/private/testing';
 import * as path from 'path';
 
-const PACKAGE = 'angular/packages/core/test/bundling/todo_r2';
+const PACKAGE = 'angular/packages/core/test/bundling/todo';
 const BUNDLES = ['bundle.js', 'bundle.debug.min.js', 'bundle.min.js'];
 
 describe('functional test for todo', () => {