Fix some tests.

tinfoil · Jun 16, 2013 · e2d1d7a · e2d1d7a
1 parent 1a5c1fe
commit e2d1d7a
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 5 deletions.
diff --git a/javascript/chrome-driver/test/atoms_test.html b/javascript/chrome-driver/test/atoms_test.html
@@ -18,7 +18,7 @@
 <html>
 <head>
   <title>atoms_test.html</title>
-  <script type="text/javascript" src="../../webdriver-bootstrap.js">
+  <script type="text/javascript" src="test_bootstrap.js">
   </script>
   <script type="text/javascript">
     goog.require('goog.math.Coordinate');
@@ -97,8 +97,8 @@
       var elem = frames[0].document.getElementById('elem');
       var coord = webdriver.chrome.getLocationInView(
           elem, false, new goog.math.Rect(0,0,4,4));
-      assertEquals(281, coord.x);
-      assertEquals(281, coord.y);
+      assertEquals(296, coord.x);
+      assertEquals(296, coord.y);
       assertEquals(408, frames[0].document.body.scrollLeft);
       assertEquals(408, frames[0].document.body.scrollTop);
     }
@@ -157,7 +157,7 @@
   <div style='width:1px'>
     <span id='span'>a b</span>
   </div>
-  <iframe width=300 height=300 src='location_in_view.html'>
+  <iframe width=300 height=300 src='location_in_view.html'></iframe>
 </body>
 </html>
 
diff --git a/javascript/chrome-driver/test/is_element_clickable_test.html b/javascript/chrome-driver/test/is_element_clickable_test.html
@@ -18,7 +18,7 @@
 <html>
 <head>
   <title>is_element_clickable_test.html</title>
-  <script type="text/javascript" src="../../webdriver-bootstrap.js">
+  <script type="text/javascript" src="test_bootstrap.js">
   </script>
   <script type="text/javascript">
     goog.require('goog.math.Coordinate');

diff --git a/javascript/chrome-driver/test/test_bootstrap.js b/javascript/chrome-driver/test/test_bootstrap.js
@@ -0,0 +1,64 @@
+// Copyright 2011 Software Freedom Conservancy. All Rights Reserved.
+//
+// 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.
+
+/**
+ * @fileoverview Bootstrap file that loads all of the WebDriver scripts in the
+ * correct order. Once loaded, pages can use {@code goog.require} statements
+ * from Google Closure to load additional files as needed.
+ *
+ * Example Usage:
+ *
+ * <html>
+ *   <head>
+ *     <script src="test_bootstrap.js"></script>
+ *     <script>
+ *       goog.require('goog.debug.Logger');
+ *     </script>
+ *     <script>
+ *       window.onload = function() {
+ *         goog.debug.Logger.getLogger('').info(
+ *             'The page has finished loading');
+ *       };
+ *     </script>
+ *   </head>
+ *   <body></body>
+ * </html>
+ */
+
+(function() {
+  var scripts = document.getElementsByTagName('script');
+  var directoryPath = './';
+  var thisFile = 'test_bootstrap.js';
+
+  for (var i = 0; i < scripts.length; i++) {
+    var src = scripts[i].src;
+    var len = src.length;
+    if (src.substr(len - thisFile.length) == thisFile) {
+      directoryPath = src.substr(0, len - thisFile.length);
+      break;
+    }
+  }
+
+  // All of the files to load. Files are specified in the order they must be
+  // loaded, NOT alphabetical order.
+  var files = [
+    '../../../third_party/closure/goog/base.js',
+    '../../deps.js'
+  ];
+
+  for (var j = 0; j < files.length; j++) {
+    document.write('<script type="text/javascript" src="' +
+        directoryPath + files[j] + '"></script>');
+  }
+})();