2 files changed, 60 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/navigation/get_from_http_test.py b/tests/wpt/web-platform-tests/webdriver/navigation/get_from_http_test.py
new file mode 100644
index 00000000000..714e65f2b4d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/navigation/get_from_http_test.py
@@ -0,0 +1,60 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+
+class GetFromHttpTest(base_test.WebDriverBaseTest):
+    def testGetUrlWithNoRedirectionOverHttp(self):
+        page = self.webserver.where_is('navigation/res/empty.html')
+        self.driver.get(page)
+        url = self.driver.get_current_url()
+        self.assertEquals(page, url)
+
+
+    def testGetWillFollowTheLocationHeader(self):
+        page = self.webserver.where_is('navigation/redirect')
+        self.driver.get(page)
+        expected = self.webserver.where_is('navigation/res/empty.html')
+        url = self.driver.get_current_url()
+        self.assertEquals(expected, url)
+
+
+    def testGetWillFollowMetaRefreshThatRefreshesInstantly(self):
+        page = self.webserver.where_is('navigation/res/instant-meta-redirect.html')
+        self.driver.get(page)
+        expected = self.webserver.where_is('navigation/res/empty.html')
+        url = self.driver.get_current_url()
+        self.assertEquals(expected, url)
+
+
+    def testGetWillFollowMetaRefreshThatRefreshesAfterOneSecond(self):
+        page = self.webserver.where_is('navigation/res/1s-meta-redirect.html')
+        self.driver.get(page)
+        expected = self.webserver.where_is('navigation/res/empty.html')
+        url = self.driver.get_current_url()
+        self.assertEquals(expected, url)
+
+
+    def testGetWillNotFollowMetaRefreshThatRefreshesAfterMoreThanOneSecond(self):
+        page = self.webserver.where_is('navigation/res/60s-meta-redirect.html')
+        self.driver.get(page)
+        url = self.driver.get_current_url()
+        self.assertEquals(page, url)
+
+
+    def testGetFragmentInCurrentDocumentDoesNotReloadPage(self):
+        page = self.webserver.where_is("navigation/res/fragment.html")
+        fragment_page = "%s#%s" % (page, "fragment")
+
+        self.driver.get(page)
+        self.driver.execute_script("state = true")
+
+        self.driver.get(fragment_page)
+        self.assertEquals(True, self.driver.execute_script("return state"))
+
+
+if __name__ == '__main__':
+    unittest.main()