test: page tests, part 3 (microsoft#50)

pavelfeldman · web-flow · commit a0e1cd17ebb1 · 2020-07-12T17:37:19.000-07:00
diff --git a/playwright/element_handle.py b/playwright/element_handle.py
@@ -231,6 +231,8 @@ async def evalOnSelectorAll(
 
 
 def convertSelectOptionValues(arg: ValuesToSelect) -> Any:
+    if arg is None:
+        return []
     if isinstance(arg, ElementHandle):
         return arg._channel
     if isinstance(arg, list) and len(arg) and isinstance(arg[0], ElementHandle):
diff --git a/playwright/frame.py b/playwright/frame.py
@@ -206,7 +206,7 @@ def isDetached(self) -> bool:
         return self._detached
 
     async def addScriptTag(
-        self, url: str = None, path: str = None, content: str = None
+        self, url: str = None, path: str = None, content: str = None, type: str = None,
     ) -> ElementHandle:
         return from_channel(
             await self._channel.send("addScriptTag", locals_to_params(locals()))
@@ -282,7 +282,7 @@ async def selectOption(
         timeout: int = None,
         noWaitAfter: bool = None,
     ) -> None:
-        await self._channel.send(
+        return await self._channel.send(
             "selectOption",
             dict(
                 selector=selector,
diff --git a/playwright/page.py b/playwright/page.py
@@ -580,7 +580,10 @@ async def selectOption(
         timeout: int = None,
         noWaitAfter: bool = None,
     ) -> None:
-        return await self._main_frame.selectOption(**locals_to_params(locals()))
+        params = locals_to_params(locals())
+        if "values" not in params:
+            params["values"] = None
+        return await self._main_frame.selectOption(**params)
 
     async def setInputFiles(
         self,
diff --git a/tests/assets/csp.html b/tests/assets/csp.html
@@ -0,0 +1 @@
+<meta http-equiv="Content-Security-Policy" content="default-src 'self'">
diff --git a/tests/assets/es6/.eslintrc b/tests/assets/es6/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "parserOptions": {
+        "sourceType": "module"
+    }
+}
diff --git a/tests/assets/es6/es6import.js b/tests/assets/es6/es6import.js
@@ -0,0 +1,2 @@
+import num from './es6module.js';
+window.__es6injected = num;
diff --git a/tests/assets/es6/es6module.js b/tests/assets/es6/es6module.js
@@ -0,0 +1 @@
+export default 42;
diff --git a/tests/assets/es6/es6pathimport.js b/tests/assets/es6/es6pathimport.js
@@ -0,0 +1,2 @@
+import num from './es6/es6module.js';
+window.__es6injected = num;
diff --git a/tests/assets/injectedstyle.css b/tests/assets/injectedstyle.css
@@ -0,0 +1,3 @@
+body {
+  background-color: red;
+}
diff --git a/tests/server.py b/tests/server.py
@@ -38,6 +38,12 @@ def __init__(self):
         self.EMPTY_PAGE = f"http://localhost:{self.PORT}/empty.html"
         self.PREFIX = f"http://localhost:{self.PORT}"
         self.CROSS_PROCESS_PREFIX = f"http://127.0.0.1:{self.PORT}"
+        # On Windows, this list can be empty, reporting text/plain for scripts.
+        mimetypes.add_type("text/html", ".html")
+        mimetypes.add_type("text/css", ".css")
+        mimetypes.add_type("application/javascript", ".js")
+        mimetypes.add_type("image/png", ".png")
+        mimetypes.add_type("font/woff2", ".woff2")
 
     def __repr__(self) -> str:
         return self.PREFIX
diff --git a/tests/test_page.py b/tests/test_page.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<meta http-equiv="Content-Security-Policy" content="default-src 'self'">`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "parserOptions": {
 +        "sourceType": "module"
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import num from './es6module.js';`
	`2`	`+window.__es6injected = num;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import num from './es6/es6module.js';`
	`2`	`+window.__es6injected = num;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+body {`
	`2`	`+ background-color: red;`
	`3`	`+}`