Test presubmit2

.bazelci/presubmit.yml

@@ -1,26 +1,28 @@
 ---
-platforms:
-  ubuntu2204:
-    build_targets:
-    - "//..."
+tasks:
+  web_testing_python_ubuntu2004:
+    name: "rules_web_testing_python in ubuntu"
+    platform: ubuntu2004
+    shell_commands:
+    - "sudo apt -y update && sudo apt -y install libxcb1"
     test_flags:
-    - "--test_tag_filters=-noci,-external,-native,-sauce"
-    test_targets:
-    - "//..."
-  macos:
-    build_targets:
-    - "//..."
+    - "--test_tag_filters=-noci,-sauce"
+    build_targets: [ "..." ]
+    test_targets: [ "..." ]
+    working_directory: web_testing_python
+  web_testing_python_macos:
+    name: "rules_web_testing_python in macos"
+    platform: macos
     test_flags:
-    - "--test_tag_filters=-noci,-sauce,-external,-native"
-    test_targets:
-    - "//..."
-  windows:
-    build_flags:
-    - "--enable_runfiles"
-    build_targets:
-    - "//..."
+    - "--test_tag_filters=-noci,-sauce"
+    build_targets: [ "..." ]
+    test_targets: [ "..." ]
+    working_directory: web_testing_python
+  web_testing_python_windows:
+    name: "rules_web_testing_python in windows"
+    platform: windows
     test_flags:
-    - "--test_tag_filters=-noci,-sauce,-external,-native"
-    - "--enable_runfiles"
-    test_targets:
-    - "//..."
+    - "--test_tag_filters=-noci,-sauce"
+    build_targets: [ "..." ]
+    test_targets: [ "..." ]
+    working_directory: web_testing_python

.bazelignore

@@ -0,0 +1,4 @@
+web_testing_go
+web_testing_java
+web_testing_python
+web_testing_scala

BUILD.bazel

@@ -15,7 +15,6 @@
 ################################################################################
 #
 load("@bazel_gazelle//:def.bzl", "gazelle")
-load("@python_versions//3.11:defs.bzl", "compile_pip_requirements")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -25,11 +24,3 @@ gazelle(
     name = "gazelle",
     prefix = "github.com/bazelbuild/rules_webtesting",
 )
-
-compile_pip_requirements(
-    name = "requirements",
-    requirements_in = "requirements.in",
-    requirements_txt = "requirements_lock.txt",
-    requirements_windows = "requirements_lock_windows.txt",
-)
-

MODULE.bazel

@@ -4,80 +4,26 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+
 bazel_dep(name = "platforms", version = "0.0.10")
 
 ##### Go dependencies #####
 bazel_dep(name = "rules_go", version = "0.51.0-rc1", repo_name = "io_bazel_rules_go")
+
 bazel_dep(name = "gazelle", version = "0.40.0", repo_name = "bazel_gazelle")
 
 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
+
 go_deps.from_file(go_mod = "//:go.mod")
 
 # All *direct* Go dependencies of the module have to be listed explicitly.
-use_repo(
-    go_deps,
-    "com_github_gorilla_mux",
-    "com_github_tebeka_selenium",
-)
-
-##### Java dependencies #####
-bazel_dep(name = "rules_jvm_external", version = "6.6")
-
-maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-maven.install(
-    artifacts = [
-        "com.google.guava:guava:33.2.1-jre",
-        "org.seleniumhq.selenium:selenium-remote-driver:4.27.0",
-        "org.seleniumhq.selenium:selenium-api:4.27.0",
-        "junit:junit:4.13.2",
-    ],
-)
-use_repo(maven, "maven")
-
-##### Python dependencies #####
-bazel_dep(name = "rules_python", version = "1.0.0")
-
-python = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python.toolchain(
-    is_default = True,
-    python_version = "3.11",
-)
-use_repo(python, "python_3_11", "python_versions")
-
-pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
-pip.parse(
-    hub_name = "rules_webtesting_py_deps",
-    python_version = "3.11",
-    requirements_lock = "//:requirements_lock.txt",
-    requirements_windows = "requirements_lock_windows.txt",
-)
-use_repo(pip, "rules_webtesting_py_deps")
-
-##### Scala dependencies #####
-bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala")
-
-# TODO: Switch to a release version once it's available in BCR.
-# Otherwise, the root module has to declare the same override.
-git_override(
-    module_name = "rules_scala",
-    commit = "219e63983e8e483e66ebf70372969ba227382001",
-    remote = "https://github.com/mbland/rules_scala",
-)
-
-scala_deps = use_extension(
-    "@io_bazel_rules_scala//scala/extensions:deps.bzl",
-    "scala_deps",
-)
-scala_deps.settings(
-    fetch_sources = True,
-)
-scala_deps.toolchains(
-    scalatest = True,
-)
+use_repo(go_deps, "com_github_gorilla_mux", "com_github_tebeka_selenium")
 
 ##### Browsers dependencies #####
 browser_repositories = use_extension("//web:extension.bzl", "browser_repositories_extension")
+
 browser_repositories.install(version = "0.3.4")
+
 use_repo(
     browser_repositories,
     "com_saucelabs_sauce_connect_linux_x64",

README.md

@@ -7,10 +7,14 @@ WebDriver.
 
 ## Configure your Bazel project
 
-For all languages, you need to add the following to your MODULE.bazel file:
+For each language , you need to add the following to your MODULE.bazel file:
 
 ```bzl
-bazel_dep(name = "rules_webtesting", version = "0.4.0")
+bazel_dep(name = "rules_webtesting_${language}", version = "0.4.0")
+```
+For example for Java:
+```bzl
+bazel_dep(name = "rules_webtesting_java", version = "0.4.0")
 ```
 
 ## Write your tests
@@ -77,7 +81,7 @@ import (
     "testing"
 
     "github.com/tebeka/selenium"
-    "github.com/bazelbuild/rules_webtesting/go/webtest"
+    "github.com/bazelbuild/rules_web_testing_go/webtest"
 )
 
 func TestWebApp(t *testing.T) {
@@ -100,7 +104,7 @@ In your BUILD files, load the correct language specific build rule and create a
 test target using it:
 
 ```bzl
-load("@rules_webtesting//web:py.bzl", "py_web_test_suite")
+load("@rules_web_testing_python//web:py.bzl", "py_web_test_suite")
 
 py_web_test_suite(
     name = "browser_test",

browsers/BUILD.bazel

@@ -50,9 +50,6 @@ browser(
 browser(
     name = "chromium-local",
     metadata = "chromium-local.json",
-    required_tags = [
-        "native",
-    ],
     deps = [
         "//go/wsl",
         "//third_party/chromedriver",

go/bazel/BUILD.bazel

@@ -22,6 +22,6 @@ go_library(
     name = "go_default_library",
     srcs = ["bazel.go"],
     importpath = "github.com/bazelbuild/rules_webtesting/go/bazel",
-    visibility = ["//go:__subpackages__"],
+    visibility = ["//visibility:public"],
     deps = ["//go/cmdhelper:go_default_library"],
 )

go/metadata/BUILD.bazel

@@ -25,7 +25,7 @@ go_library(
         "web_test_files.go",
     ],
     importpath = "github.com/bazelbuild/rules_webtesting/go/metadata",
-    visibility = ["//go:__subpackages__"],
+    visibility = ["//visibility:public"],
     deps = [
         "//go/bazel:go_default_library",
         "//go/httphelper:go_default_library",
@@ -39,7 +39,7 @@ go_test(
         "extension_test.go",
         "metadata_test.go",
     ],
-    data = ["//testdata"],
+    data = ["@rules_webtesting//testdata"],
     embed = [":go_default_library"],
-    deps = ["//go/bazel:go_default_library"],
+    deps = ["@rules_webtesting//go/bazel:go_default_library"],
 )

go/web/BUILD.bazel

@@ -0,0 +1,32 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+#
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@rules_webtesting//web:web.bzl", "web_test_config")
+
+package(
+    default_testonly = True,
+    default_visibility = ["//go:__subpackages__"],
+)
+
+bzl_library(
+    name = "go",
+    srcs = ["go.bzl"],
+    deps = [
+        "@rules_webtesting//web/internal:wrap_web_test_suite",
+        # should depend on @io_bazel_rules_go//go:def.bzl
+    ],
+)

web/go.bzl → go/web/go.bzl

@@ -13,9 +13,9 @@
 # limitations under the License.
 """Web Test rules for Go."""
 
-load("//web/internal:constants.bzl", "DEFAULT_WRAPPED_TEST_TAGS")
-load("//web/internal:wrap_web_test_suite.bzl", "wrap_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
+load("@rules_webtesting//web/internal:constants.bzl", "DEFAULT_WRAPPED_TEST_TAGS")
+load("@rules_webtesting//web/internal:wrap_web_test_suite.bzl", "wrap_web_test_suite")
 
 def go_web_test_suite(name, go_test_tags = DEFAULT_WRAPPED_TEST_TAGS, **kwargs):
     """Defines a test_suite of web_test targets that wrap a go_test target.

go/webdriver/BUILD.bazel

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-load("//web:go.bzl", "go_web_test_suite")
+load("//go/web:go.bzl", "go_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])  # Apache 2.0

go/webtest/BUILD.bazel

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-load("//web:go.bzl", "go_web_test_suite")
+load("//go/web:go.bzl", "go_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])  # Apache 2.0

go/wtl/proxy/BUILD.bazel

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-load("//web:go.bzl", "go_web_test_suite")
+load("//go/web:go.bzl", "go_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])  # Apache 2.0

go/wtl/proxy/driverhub/quithandler/BUILD.bazel

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-load("//web:go.bzl", "go_web_test_suite")
+load("//go/web:go.bzl", "go_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])  # Apache 2.0

go/wtl/proxy/driverhub/scripttimeout/BUILD.bazel

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-load("//web:go.bzl", "go_web_test_suite")
+load("//go/web:go.bzl", "go_web_test_suite")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 licenses(["notice"])  # Apache 2.0

testdata/BUILD.bazel

@@ -23,7 +23,7 @@ licenses(["notice"])  # Apache 2.0
 filegroup(
     name = "testdata",
     srcs = glob(["*"]),
-    visibility = ["//:__subpackages__"],
+    visibility = ["//visibility:public"],
 )
 
 web_test_files(

web/BUILD.bazel

@@ -29,45 +29,15 @@ web_test_config(
     visibility = ["//visibility:public"],
 )
 
-bzl_library(
-    name = "go",
-    srcs = ["go.bzl"],
-    deps = [
-        "//web/internal:wrap_web_test_suite",
-        # should depend on @io_bazel_rules_go//go:def.bzl
-    ],
-)
-
-bzl_library(
-    name = "java",
-    srcs = ["java.bzl"],
-    deps = ["//web/internal:wrap_web_test_suite"],
-)
-
-bzl_library(
-    name = "py",
-    srcs = ["py.bzl"],
-    deps = ["//web/internal:wrap_web_test_suite"],
-)
-
-bzl_library(
-    name = "scala",
-    srcs = ["scala.bzl"],
-    deps = [
-        "//web/internal:wrap_web_test_suite",
-        # should depend on @io_bazel_rules_scala//scala:scala.bzl
-    ],
-)
-
 bzl_library(
     name = "web",
     srcs = ["web.bzl"],
     deps = [
         "//web/internal:browser",
         "//web/internal:constants",
-        "//web/internal:platform_metadata",
-        "//web/internal:platform_archive",
         "//web/internal:custom_browser",
+        "//web/internal:platform_archive",
+        "//web/internal:platform_metadata",
         "//web/internal:web_test",
         "//web/internal:web_test_config",
         "//web/internal:web_test_files",

web/internal/BUILD.bazel

@@ -18,7 +18,7 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 package(
     default_testonly = True,
-    default_visibility = ["//web:__subpackages__"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0