move utils in e2e/ to src/e2e-app/

Author: mmalerba

e2e/BUILD.bazel

@@ -3,41 +3,31 @@ package(default_visibility=["//visibility:public"])
 load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
 load("//tools:defaults.bzl", "ts_library")
 
-ts_library(
-  name = "e2e_utils_lib",
-  srcs = glob(["util/**/*.ts"]),
-  tsconfig = ":tsconfig.json",
-  deps = [
-    "@npm//@types/jasmine",
-    "@npm//protractor"
-  ]
-)
-
 # For each spec file in the "components/" folder, we declare a Bazel target
 # that builds the JavaScript outputs for the e2e spec file.
 [ts_library(
    name = "%s_specs_lib" % spec_file,
    srcs = [spec_file],
-   tsconfig = ":tsconfig.json",
+   tsconfig = "//src/e2e-app:tsconfig-e2e.json",
    deps = [
      "@npm//@types/jasmine",
      "@npm//@types/selenium-webdriver",
      "@npm//protractor",
-     ":e2e_utils_lib",
+     "//src/e2e-app:e2e_utils_lib",
    ]
  ) for spec_file in glob(["components/**/*.spec.ts"])]
 
 # For each spec file in the "components/" folder, we declare a Protractor web test
 # suite target that runs the given e2e spec against the e2e-app devserver.
 [protractor_web_test_suite(
   name = "%s_e2e" % spec_file,
-  configuration = ":protractor.conf.js",
-  on_prepare = ":start-devserver.js",
+  configuration = "//src/e2e-app:protractor.conf.js",
+  on_prepare = "//src/e2e-app:start-devserver.js",
   server = "//src/e2e-app:devserver",
   deps = [
     "@npm//protractor",
     ":%s_specs_lib" % spec_file,
-    ":e2e_utils_lib",
+    "//src/e2e-app:e2e_utils_lib",
   ],
   data = [
     "@npm//@angular/bazel",

e2e/components/block-scroll-strategy-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser, Key, element, by} from 'protractor';
-import {getScrollPosition} from '../util/index';
+import {getScrollPosition} from '../../src/e2e-app/test-util/index';
 
 
 describe('scroll blocking', () => {

e2e/components/dialog-e2e.spec.ts

@@ -5,7 +5,7 @@ import {
   pressKeys,
   clickElementAtPoint,
   waitForElement,
-} from '../util/index';
+} from '../../src/e2e-app/test-util/index';
 
 describe('dialog', () => {
   beforeEach(async () => await browser.get('/dialog'));

e2e/components/grid-list-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../util/index';
+import {expectToExist} from '../../src/e2e-app/test-util/index';
 
 describe('grid-list', () => {
   beforeEach(async () => await browser.get('/grid-list'));

e2e/components/list-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../util/index';
+import {expectToExist} from '../../src/e2e-app/test-util/index';
 
 describe('list', () => {
   beforeEach(async () => await browser.get('/list'));

e2e/components/mdc-menu-e2e.spec.ts

@@ -5,7 +5,7 @@ import {
   expectLocation,
   expectToExist,
   pressKeys,
-} from '../util/index';
+} from '../../src/e2e-app/test-util/index';
 
 const presenceOf = ExpectedConditions.presenceOf;
 const not = ExpectedConditions.not;

e2e/components/mdc-slide-toggle-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser, element, by, Key} from 'protractor';
-import {expectToExist} from '../util/index';
+import {expectToExist} from '../../src/e2e-app/test-util/index';
 
 
 describe('slide-toggle', () => {

e2e/components/menu-e2e.spec.ts

@@ -5,7 +5,7 @@ import {
   expectLocation,
   expectToExist,
   pressKeys,
-} from '../util/index';
+} from '../../src/e2e-app/test-util/index';
 
 const presenceOf = ExpectedConditions.presenceOf;
 const not = ExpectedConditions.not;

e2e/components/progress-bar-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../util/index';
+import {expectToExist} from '../../src/e2e-app/test-util/index';
 
 describe('progress-bar', () => {
   beforeEach(async () => await browser.get('/progress-bar'));

e2e/components/slide-toggle-e2e.spec.ts

@@ -1,5 +1,5 @@
 import {browser, element, by, Key} from 'protractor';
-import {expectToExist} from '../util/index';
+import {expectToExist} from '../../src/e2e-app/test-util/index';
 
 
 describe('slide-toggle', () => {

e2e/components/stepper-e2e.spec.ts

@@ -1,7 +1,7 @@
 import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor';
 import {Key} from 'selenium-webdriver';
-import {pressKeys} from '../util/actions';
-import {expectFocusOn, expectToExist} from '../util/asserts';
+import {pressKeys} from '../../src/e2e-app/test-util/actions';
+import {expectFocusOn, expectToExist} from '../../src/e2e-app/test-util/asserts';
 
 describe('stepper', () => {
   beforeEach(async () => await browser.get('/stepper'));

e2e/components/tabs-e2e.spec.ts

@@ -6,7 +6,7 @@ import {
   Key,
   ExpectedConditions
 } from 'protractor';
-import {pressKeys} from '../util/index';
+import {pressKeys} from '../../src/e2e-app/test-util/index';
 
 describe('tabs', () => {
   describe('basic behavior', () => {

e2e/index-e2e.spec.ts

@@ -1,13 +1,25 @@
 package(default_visibility=["//visibility:public"])
 
 load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
 load("//tools:defaults.bzl", "ng_module")
 load("//:packages.bzl", "ANGULAR_LIBRARY_UMDS")
 
+exports_files(["protractor.conf.js", "start-devserver.js", "tsconfig-e2e.json"])
+
+ts_library(
+  name = "e2e_utils_lib",
+  srcs = glob(["test-util/**/*.ts"]),
+  tsconfig = ":tsconfig-e2e.json",
+  deps = [
+    "@npm//@types/jasmine",
+    "@npm//protractor"
+  ]
+)
+
 ng_module(
   name = "e2e-app",
-  srcs = glob(["**/*.ts"]),
+  srcs = glob(["**/*.ts"], exclude = ["test-util/**"]),
   assets = glob(["**/*.html", "**/*.css"], exclude = ["index.html"]),
   deps = [
     "@npm//@angular/core",