fixup! test(button-harness): add performance tests for buttons using the protractor harness env

Author: wagnermaciel

test/benchmarks/material/button-harness/BUILD.bazel

@@ -1,5 +1,4 @@
 load("@npm_angular_dev_infra_private//benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
-<<<<<<< HEAD
 load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -39,29 +38,14 @@ component_benchmark(
     driver_deps = [
         ":constants",
         ":protractor-benchmark-utilities",
-=======
-load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_test_library", "ng_web_test_suite", "ts_library")
-
-# TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
-# stylesUrls inside the components once `component_benchmark` supports asset injection.
-
-component_benchmark(
-    name = "benchmark",
-    driver = ":protractor.perf-spec.ts",
-    driver_deps = [
-        "@npm//@angular/dev-infra-private",
->>>>>>> e2db57750 (test(button-harness): add performance tests for buttons using the protractor harness env)
         "@npm//protractor",
         "@npm//@types/jasmine",
         "//src/cdk/testing",
         "//src/material/button/testing",
         "//src/cdk/testing/protractor",
     ],
     ng_deps = [
-<<<<<<< HEAD
         ":constants",
-=======
->>>>>>> e2db57750 (test(button-harness): add performance tests for buttons using the protractor harness env)
         "@npm//@angular/core",
         "@npm//@angular/platform-browser",
         "//src/material/button",
@@ -70,7 +54,6 @@ component_benchmark(
     prefix = "",
     styles = ["//src/material/prebuilt-themes:indigo-pink"],
 )
-<<<<<<< HEAD
 
 # TestbedHarnessEnvironment
 
@@ -92,5 +75,3 @@ ng_web_test_suite(
     name = "unit_benchmark_tests",
     deps = [":unit_tests_lib"],
 )
-=======
->>>>>>> e2db57750 (test(button-harness): add performance tests for buttons using the protractor harness env)

test/benchmarks/material/button-harness/app.module.ts

@@ -10,6 +10,7 @@ import {Component, NgModule, ViewEncapsulation} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {MatButtonModule} from '@angular/material/button';
 <<<<<<< HEAD
+<<<<<<< HEAD
 import {NUM_BUTTONS} from './constants';
 
 /** component: mat-button-harness-test */
@@ -25,20 +26,27 @@ import {NUM_BUTTONS} from './constants';
 export class ButtonHarnessTest {
   vals = Array.from({ length: NUM_BUTTONS }, (_, i) => i);
 =======
+=======
+import {NUM_BUTTONS} from './constants';
+>>>>>>> 72a4ae020 (fixup! test(button-harness): add performance tests for buttons using the protractor harness env)
 
 /** component: mat-raised-button-harness-test */
 
 @Component({
-	selector: 'app-root',
+  selector: 'app-root',
   template: `
     <button *ngFor="let val of vals" mat-button> {{ val }} </button>
-	`,
-	encapsulation: ViewEncapsulation.None,
+  `,
+  encapsulation: ViewEncapsulation.None,
   styleUrls: ['//src/material/core/theming/prebuilt/indigo-pink.css'],
 })
 export class ButtonHarnessTest {
+<<<<<<< HEAD
 	vals = Array.from({ length: 100 }, (_, i) => i);
 >>>>>>> e2db57750 (test(button-harness): add performance tests for buttons using the protractor harness env)
+=======
+  vals = Array.from({ length: NUM_BUTTONS }, (_, i) => i);
+>>>>>>> 72a4ae020 (fixup! test(button-harness): add performance tests for buttons using the protractor harness env)
 }
 
 @NgModule({

test/benchmarks/material/button-harness/protractor.perf-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {HarnessLoader} from '@angular/cdk/testing';
+import {HarnessLoader, HarnessPredicate} from '@angular/cdk/testing';
 import {MatButtonHarness} from '@angular/material/button/testing/button-harness';
 import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor';
 import {$$, element, by, browser} from 'protractor';