From 2d6931c56e86c5b65902383384af9191bf4079ab Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 26 Aug 2019 20:10:14 -0700 Subject: [PATCH] refactor: green up tests --- e2e/karma/BUILD.bazel | 1 + e2e/karma/WORKSPACE | 5 ++++- e2e/karma_stack_trace/BUILD.bazel | 5 ++++- e2e/karma_stack_trace/WORKSPACE | 5 ++++- e2e/karma_stack_trace/test_sourcemap.sh | 3 ++- e2e/karma_typescript/BUILD.bazel | 1 + e2e/karma_typescript/WORKSPACE | 5 ++++- examples/protocol_buffers/BUILD.bazel | 1 + examples/protocol_buffers/WORKSPACE | 5 ++++- examples/web_testing/BUILD.bazel | 6 ++++++ packages/karma/src/karma_web_test.bzl | 7 ++++++- packages/karma/src/ts_web_test.bzl | 7 ++++++- packages/protractor/src/protractor_web_test.bzl | 7 ++++++- packages/protractor/test/protractor-2/BUILD.bazel | 2 -- packages/protractor/test/protractor/BUILD.bazel | 1 - 15 files changed, 49 insertions(+), 12 deletions(-) diff --git a/e2e/karma/BUILD.bazel b/e2e/karma/BUILD.bazel index 197c6b0d27..ac41abb062 100644 --- a/e2e/karma/BUILD.bazel +++ b/e2e/karma/BUILD.bazel @@ -35,6 +35,7 @@ ts_web_test_suite( # in "tslib" transitively. "init-test.js", ], + tags = ["native"], deps = [ "init-test.js", "requirejs-config.js", diff --git a/e2e/karma/WORKSPACE b/e2e/karma/WORKSPACE index 4292935b3b..f49cb1a1af 100644 --- a/e2e/karma/WORKSPACE +++ b/e2e/karma/WORKSPACE @@ -47,4 +47,7 @@ web_test_repositories() load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories") -browser_repositories(chromium = True) +browser_repositories( + chromium = True, + firefox = True, +) diff --git a/e2e/karma_stack_trace/BUILD.bazel b/e2e/karma_stack_trace/BUILD.bazel index 7fcbbc9b0d..a796859d4d 100644 --- a/e2e/karma_stack_trace/BUILD.bazel +++ b/e2e/karma_stack_trace/BUILD.bazel @@ -37,7 +37,10 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers:chromium-local", "@io_bazel_rules_webtesting//browsers:firefox-local", ], - tags = ["manual"], # not run by CI + tags = [ + "manual", # not run by CI + "native", + ], deps = [ ":test_lib", "//test_folder:test_lib", diff --git a/e2e/karma_stack_trace/WORKSPACE b/e2e/karma_stack_trace/WORKSPACE index ff4942565f..47eeff3064 100644 --- a/e2e/karma_stack_trace/WORKSPACE +++ b/e2e/karma_stack_trace/WORKSPACE @@ -47,7 +47,10 @@ web_test_repositories() load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories") -browser_repositories(chromium = True) +browser_repositories( + chromium = True, + firefox = True, +) load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") diff --git a/e2e/karma_stack_trace/test_sourcemap.sh b/e2e/karma_stack_trace/test_sourcemap.sh index 8898eaca01..2edf451a12 100755 --- a/e2e/karma_stack_trace/test_sourcemap.sh +++ b/e2e/karma_stack_trace/test_sourcemap.sh @@ -1,10 +1,11 @@ # Execute first test. -OUTPUT=$(${RUNFILES_DIR}/e2e_karma_stack_trace/karma_test_chromium-local) +OUTPUT=$(${RUNFILES_DIR}/e2e_karma_stack_trace/karma_test_chromium-local.sh) # Test whether the package relative TS path is printed in stack trace. echo ${OUTPUT} | grep -q "(failing.spec.ts:7:17" if [[ "$?" != "0" ]]; then echo "Did not find 'failing.spec.ts:7:17' in Karma stack trace" + echo $OUTPUT exit 1 fi diff --git a/e2e/karma_typescript/BUILD.bazel b/e2e/karma_typescript/BUILD.bazel index 11fbc7f2b8..e0024d9984 100644 --- a/e2e/karma_typescript/BUILD.bazel +++ b/e2e/karma_typescript/BUILD.bazel @@ -52,6 +52,7 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers:chromium-local", "@io_bazel_rules_webtesting//browsers:firefox-local", ], + tags = ["native"], runtime_deps = [ # typescript targets only in runtime_deps, must be TS module ":hello_world", diff --git a/e2e/karma_typescript/WORKSPACE b/e2e/karma_typescript/WORKSPACE index 19f67b689c..40f49a4307 100644 --- a/e2e/karma_typescript/WORKSPACE +++ b/e2e/karma_typescript/WORKSPACE @@ -47,7 +47,10 @@ web_test_repositories() load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories") -browser_repositories(chromium = True) +browser_repositories( + chromium = True, + firefox = True, +) load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") diff --git a/examples/protocol_buffers/BUILD.bazel b/examples/protocol_buffers/BUILD.bazel index edf73bda24..cdb55889e3 100644 --- a/examples/protocol_buffers/BUILD.bazel +++ b/examples/protocol_buffers/BUILD.bazel @@ -49,6 +49,7 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers:chromium-local", "@io_bazel_rules_webtesting//browsers:firefox-local", ], + tags = ["native"], deps = ["test_lib"], ) diff --git a/examples/protocol_buffers/WORKSPACE b/examples/protocol_buffers/WORKSPACE index c867797f2b..142bcd2363 100644 --- a/examples/protocol_buffers/WORKSPACE +++ b/examples/protocol_buffers/WORKSPACE @@ -58,7 +58,10 @@ web_test_repositories() load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories") -browser_repositories(chromium = True) +browser_repositories( + chromium = True, + firefox = True, +) load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace") diff --git a/examples/web_testing/BUILD.bazel b/examples/web_testing/BUILD.bazel index b289472a80..051b33a7e6 100644 --- a/examples/web_testing/BUILD.bazel +++ b/examples/web_testing/BUILD.bazel @@ -45,6 +45,7 @@ karma_web_test_suite( static_files = [ "static_script.js", ], + tags = ["native"], runtime_deps = [ ":tests_setup", ], @@ -60,7 +61,9 @@ karma_web_test_suite( "@io_bazel_rules_webtesting//browsers/sauce:chrome-win10", ], tags = [ + "exclusive", "sauce", + "native", # TODO(alexeagle): enable on CI once we have set the SAUCE env variables "manual", ], @@ -78,6 +81,7 @@ ts_web_test_suite( static_files = [ "static_script.js", ], + tags = ["native"], runtime_deps = [ ":tests_setup", ], @@ -92,6 +96,8 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers/sauce:chrome-win10", ], tags = [ + "exclusive", + "native", "sauce", # TODO(alexeagle): enable on CI once we have set the SAUCE env variables "manual", diff --git a/packages/karma/src/karma_web_test.bzl b/packages/karma/src/karma_web_test.bzl index 77beed4f7e..4229d1ec9b 100644 --- a/packages/karma/src/karma_web_test.bzl +++ b/packages/karma/src/karma_web_test.bzl @@ -366,7 +366,7 @@ def karma_web_test( def karma_web_test_suite( name, - browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"], + browsers = None, args = None, browser_overrides = None, config = None, @@ -419,6 +419,11 @@ def karma_web_test_suite( if wrapped_test_tags == None: wrapped_test_tags = DEFAULT_WRAPPED_TEST_TAGS + if browsers == None: + browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"] + if not "native" in tags: + tags = tags + ["native"] + size = size or "large" wrapped_test_name = name + "_wrapped_test" diff --git a/packages/karma/src/ts_web_test.bzl b/packages/karma/src/ts_web_test.bzl index 28f796bf51..f118310476 100644 --- a/packages/karma/src/ts_web_test.bzl +++ b/packages/karma/src/ts_web_test.bzl @@ -112,7 +112,7 @@ def ts_web_test( def ts_web_test_suite( name, - browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"], + browsers = None, args = None, browser_overrides = None, config = None, @@ -161,6 +161,11 @@ def ts_web_test_suite( if wrapped_test_tags == None: wrapped_test_tags = DEFAULT_WRAPPED_TEST_TAGS + if browsers == None: + browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"] + if not "native" in tags: + tags = tags + ["native"] + size = size or "large" wrapped_test_name = name + "_wrapped_test" diff --git a/packages/protractor/src/protractor_web_test.bzl b/packages/protractor/src/protractor_web_test.bzl index 62f4ee1449..9ab113cdee 100644 --- a/packages/protractor/src/protractor_web_test.bzl +++ b/packages/protractor/src/protractor_web_test.bzl @@ -255,7 +255,7 @@ def protractor_web_test_suite( deps = [], data = [], server = None, - browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"], + browsers = None, args = None, browser_overrides = None, config = None, @@ -314,6 +314,11 @@ def protractor_web_test_suite( if wrapped_test_tags == None: wrapped_test_tags = DEFAULT_WRAPPED_TEST_TAGS + if browsers == None: + browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"] + if not "native" in tags: + tags = tags + ["native"] + size = size or "large" wrapped_test_name = name + "_wrapped_test" diff --git a/packages/protractor/test/protractor-2/BUILD.bazel b/packages/protractor/test/protractor-2/BUILD.bazel index 37b16751ab..f37194dc1f 100644 --- a/packages/protractor/test/protractor-2/BUILD.bazel +++ b/packages/protractor/test/protractor-2/BUILD.bazel @@ -57,7 +57,6 @@ protractor_web_test_suite( tags = [ "fix-bazelci-ubuntu", # ubuntu docker images on buildkite missing chrome dependencies & apt-get install not possible "fix-windows", # http_server (and history_server) do not work on Windows - "native", ], deps = [ ":ts_spec", @@ -71,7 +70,6 @@ protractor_web_test_suite( server = ":devserver", tags = [ "fix-bazelci-ubuntu", # ubuntu docker images on buildkite missing chrome dependencies & apt-get install not possible - "native", ], deps = [ ":ts_spec", diff --git a/packages/protractor/test/protractor/BUILD.bazel b/packages/protractor/test/protractor/BUILD.bazel index 8bd2dfabe7..10cb016a8a 100644 --- a/packages/protractor/test/protractor/BUILD.bazel +++ b/packages/protractor/test/protractor/BUILD.bazel @@ -29,7 +29,6 @@ protractor_web_test_suite( configuration = ":ts_conf", tags = [ "fix-bazelci-ubuntu", # ubuntu docker images on buildkite missing chrome dependencies & apt-get install not possible - "native", ], deps = [ ":ts_spec",