2 files changed, 64 insertions, 0 deletions
diff --git a/tests/wpt/web-platform-tests b/tests/wpt/web-platform-tests
deleted file mode 160000
-Subproject 29dfb8944e535d439ca94cf7d1b1d9138a8ad11
diff --git a/tests/wpt/web-platform-tests/webdriver/timeouts/implicit_waits_tests.py b/tests/wpt/web-platform-tests/webdriver/timeouts/implicit_waits_tests.py
new file mode 100644
index 00000000000..e39723c50c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/timeouts/implicit_waits_tests.py
@@ -0,0 +1,64 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+from webdriver import exceptions
+
+
+class ImplicitWaitsTests(base_test.WebDriverBaseTest):
+    def setUp(self):
+        self.driver.get(self.webserver.where_is('timeouts/res/implicit_waits_tests.html'))
+
+    def test_find_element_by_id(self):
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(3)
+        add.click()
+        self.driver.find_element_by_css("#box0")  # All is well if this doesn't throw.
+
+    def test_should_still_fail_to_find_an_element_when_implicit_waits_are_enabled(self):
+        self.driver.set_implicit_timeout(0.5)
+        try:
+            self.driver.find_element_by_css("#box0")
+            self.fail("Expected NoSuchElementException to have been thrown")
+        except exceptions.NoSuchElementException as e:
+            pass
+        except Exception as e:
+            self.fail("Expected NoSuchElementException but got " + str(e))
+
+    def test_should_return_after_first_attempt_to_find_one_after_disabling_implicit_waits(self):
+        self.driver.set_implicit_timeout(3)
+        self.driver.set_implicit_timeout(0)
+        try:
+            self.driver.find_element_by_css("#box0")
+            self.fail("Expected NoSuchElementException to have been thrown")
+        except exceptions.NoSuchElementException as e:
+            pass
+        except Exception as e:
+            self.fail("Expected NoSuchElementException but got " + str(e))
+
+    def test_should_implicitly_wait_until_at_least_one_element_is_found_when_searching_for_many(self):
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(2)
+        add.click()
+        add.click()
+        elements = self.driver.find_elements_by_css(".redbox")
+        self.assertTrue(len(elements) >= 1)
+
+    def test_should_still_fail_to_find_an_element_by_class_when_implicit_waits_are_enabled(self):
+        self.driver.set_implicit_timeout(0.5)
+        elements = self.driver.find_elements_by_css(".redbox")
+        self.assertEqual(0, len(elements))
+
+    def test_should_return_after_first_attempt_to_find_many_after_disabling_implicit_waits(self):
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(1.1)
+        self.driver.set_implicit_timeout(0)
+        add.click()
+        elements = self.driver.find_elements_by_css(".redbox")
+        self.assertEqual(0, len(elements))
+
+
+if __name__ == "__main__":
+    unittest.main()