Fix failing js tests by creating new js deps

SeleniumHQ · Sep 23, 2019 · d0b5703 · d0b5703
1 parent 29eff7b
commit d0b5703
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 3 deletions.
diff --git a/javascript/webdriver/BUILD.bazel b/javascript/webdriver/BUILD.bazel
@@ -43,7 +43,6 @@ filegroup(
     srcs = glob(
         ["**/*"],
         exclude = [
-            "BUCK",
             "build.desc",
         ],
     ),
@@ -64,5 +63,6 @@ closure_test_suite(
         ":all_files",
         ":deps",
         "//javascript/atoms:deps",
+        "//javascript/webdriver/atoms/inject:deps",
     ],
 )
diff --git a/javascript/webdriver/atoms/inject/BUILD.bazel b/javascript/webdriver/atoms/inject/BUILD.bazel
@@ -4,9 +4,27 @@ package(
     ],
 )
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
 load("//javascript:defs.bzl", "closure_fragment")
 
+closure_js_deps(
+    name = "deps",
+    deps = [
+      ":action",
+      ":appcache",
+      ":dom",
+      ":execute-script",
+      ":find-element",
+      ":frame",
+      ":local-storage",
+      ":session-storage",
+      ":sql-database",
+    ],
+    visibility = [
+        "//javascript/webdriver:__pkg__",
+    ]
+)
+
 closure_js_library(
     name = "action",
     srcs = ["action.js"],
@@ -107,6 +125,18 @@ closure_js_library(
     ],
 )
 
+closure_js_library(
+    name = "sql-database",
+    srcs = ["sql_database.js"],
+    deps = [
+        ":execute-script",
+        "//javascript/atoms:errors",
+        "//javascript/atoms:html5",
+        "//javascript/atoms:inject",
+        "//javascript/webdriver/atoms:atoms-lib",
+    ],
+)
+
 closure_fragment(
     name = "active-element",
     function = "webdriver.atoms.inject.frame.activeElement",

diff --git a/javascript/webdriver/test/atoms/inject/dom_test.html b/javascript/webdriver/test/atoms/inject/dom_test.html
@@ -19,6 +19,7 @@
 <head>
   <title>dom_test.html</title>
   <script src="../../test_bootstrap.js"></script>
+  <script src="../../../atoms/inject/deps.js"></script>
   <script type="text/javascript">
     goog.require('goog.array');
     goog.require('goog.dom');
@@ -117,7 +118,7 @@
       var frameWindow = getValueFromJSONObject(frame);
       var element = webdriver.atoms.inject.locators.findElement(
           'id', 'submitForm', null, frameWindow);
-      assertEquals('Submit', 
+      assertEquals('Submit',
           getValueFromJSONObject(webdriver.atoms.inject.dom.getAttributeValue(
               getValueFromJSONObject(element), "value", frameWindow)));
     }

diff --git a/javascript/webdriver/test/atoms/inject/execute_script_test.html b/javascript/webdriver/test/atoms/inject/execute_script_test.html
@@ -19,6 +19,7 @@
 <head>
   <title>execute_script_test.html</title>
   <script src="../../test_bootstrap.js"></script>
+  <script src="../../../atoms/inject/deps.js"></script>
   <script type="text/javascript">
     goog.require('goog.userAgent');
     goog.require('goog.userAgent.product');

diff --git a/javascript/webdriver/test/atoms/inject/find_element_test.html b/javascript/webdriver/test/atoms/inject/find_element_test.html
@@ -19,6 +19,7 @@
 <head>
   <title>find_element_test.html</title>
   <script src="../../test_bootstrap.js"></script>
+  <script src="../../../atoms/inject/deps.js"></script>
   <script type="text/javascript">
     goog.require('bot.inject.cache');
     goog.require('bot.locators');

diff --git a/javascript/webdriver/test/atoms/inject/frame_test.html b/javascript/webdriver/test/atoms/inject/frame_test.html
@@ -19,6 +19,7 @@
 <head>
     <title>frame_test.html</title>
   <script src="../../test_bootstrap.js"></script>
+  <script src="../../../atoms/inject/deps.js"></script>
     <script type="text/javascript">
         goog.require('goog.json');
         goog.require('goog.testing.jsunit');

diff --git a/javascript/webdriver/test/atoms/inject/interactions_test.html b/javascript/webdriver/test/atoms/inject/interactions_test.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>interactions_test</title>
 <script src="../../test_bootstrap.js"></script>
+<script src="../../../atoms/inject/deps.js"></script>
 <script>
 goog.require('bot.Keyboard');
 goog.require('bot.Mouse');

diff --git a/javascript/webdriver/test/atoms/inject/sql_database_test.html b/javascript/webdriver/test/atoms/inject/sql_database_test.html
@@ -3,6 +3,7 @@
 <head>
   <title>Web SQL database</title>
   <script src="../../test_bootstrap.js"></script>
+  <script src="../../../atoms/inject/deps.js"></script>
   <script type='text/javascript'>
     goog.require('bot');
     goog.require('bot.html5');