From 0cb206ef4b426bd3cdf37438f9568450bb12e4ee Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 5 Nov 2024 15:42:57 +0100 Subject: [PATCH] test: get rid of separate TestServer package --- .../Playwright.Tests.TestServer.csproj | 25 ---------------- .../Properties/launchSettings.json | 27 ------------------ .../Assertions/APIResponseAssertionsTests.cs | 2 -- src/Playwright.Tests/BaseTests/HttpService.cs | 2 +- .../BrowserContextBasicTests.cs | 1 - .../BrowserContextEventsTests.cs | 2 -- .../BrowserContextFetchTests.cs | 1 - .../BrowserTypeConnectTests.cs | 1 - src/Playwright.Tests/CapabilitiesTests.cs | 1 - .../ClientCertficatesTests.cs | 3 -- .../DefaultBrowserContext1Tests.cs | 1 - src/Playwright.Tests/DownloadTests.cs | 2 -- src/Playwright.Tests/DownloadsPathTests.cs | 2 -- src/Playwright.Tests/FrameGoToTests.cs | 1 - src/Playwright.Tests/GlobalFetchTests.cs | 1 - .../IgnoreHttpsErrorsTests.cs | 1 - .../PageAutoWaitingBasicTests.cs | 2 -- src/Playwright.Tests/PageClockTests.cs | 1 - src/Playwright.Tests/PageGotoTests.cs | 1 - src/Playwright.Tests/PageNavigationTests.cs | 2 -- src/Playwright.Tests/PageNetworkIdleTests.cs | 1 - .../PageNetworkRequestTest.cs | 1 - .../PageNetworkResponseTests.cs | 1 - .../PageRequestFulfillTests.cs | 1 - .../PageRequestInterceptTests.cs | 1 - src/Playwright.Tests/PageRouteTests.cs | 1 - .../PageWaitForLoadStateTests.cs | 2 -- src/Playwright.Tests/PageWaitForUrlTests.cs | 1 - src/Playwright.Tests/Playwright.Tests.csproj | 9 ++++-- src/Playwright.Tests/ProxyTests.cs | 1 - src/Playwright.Tests/ResourceTimingTests.cs | 2 -- .../TestServer}/SimpleServer.cs | 12 +------- .../TestServer}/WebSocketWithEvents.cs | 4 --- .../TestServer}/key.pfx | Bin src/Playwright.Tests/TestUtils.cs | 2 +- .../assets/background-color.html | 0 .../assets/beforeunload.html | 0 .../assets/button-overlay-oopif.html | 0 .../assets/cached/one-style.css | 0 .../assets/cached/one-style.html | 0 .../assets/callback.js | 0 .../assets/checkerboard.html | 0 .../assets/chromium-linux.zip | Bin .../assets/client-certificates/README.md | 0 .../client/trusted/cert.pem | 0 .../client/trusted/csr.pem | 0 .../client/trusted/key.pem | 0 .../server/server_cert.pem | 0 .../client-certificates/server/server_key.pem | 0 .../assets/consolelog.html | 0 .../assets/csp.html | 0 .../assets/csscoverage/Dosis-Regular.ttf | Bin .../assets/csscoverage/OFL.txt | 0 .../assets/csscoverage/involved.html | 0 .../assets/csscoverage/media.html | 0 .../assets/csscoverage/multiple.html | 0 .../assets/csscoverage/simple.html | 0 .../assets/csscoverage/sourceurl.html | 0 .../assets/csscoverage/stylesheet1.css | 0 .../assets/csscoverage/stylesheet2.css | 0 .../assets/csscoverage/unused.html | 0 .../assets/deep-shadow.html | 0 .../assets/detect-touch.html | 0 .../assets/digits/0.png | Bin .../assets/digits/1.png | Bin .../assets/digits/2.png | Bin .../assets/digits/3.png | Bin .../assets/digits/4.png | Bin .../assets/digits/5.png | Bin .../assets/digits/6.png | Bin .../assets/digits/7.png | Bin .../assets/digits/8.png | Bin .../assets/digits/9.png | Bin .../assets/dom.html | 0 .../assets/download-blob.html | 0 .../assets/drag-n-drop.html | 0 .../assets/dummy_bad_browser_executable.js | 0 .../assets/dynamic-oopif.html | 0 .../assets/empty.html | 0 .../assets/empty.pdf | Bin .../assets/error.html | 0 .../assets/es6/.eslintrc | 0 .../assets/es6/es6import.js | 0 .../assets/es6/es6module.js | 0 .../assets/es6/es6pathimport.js | 0 .../assets/file-to-upload-2.txt | 0 .../assets/file-to-upload.txt | 0 .../assets/formatted-number.html | 0 .../assets/frames/child-redirect.html | 0 .../assets/frames/frame.html | 0 .../assets/frames/frameset.html | 0 .../assets/frames/lazy-frame.html | 0 .../assets/frames/nested-frames.html | 0 .../assets/frames/one-frame.html | 0 .../assets/frames/redirect-my-parent.html | 0 .../assets/frames/script.js | 0 .../assets/frames/style.css | 0 .../assets/frames/two-frames.html | 0 .../assets/geolocation.html | 0 .../assets/global-var.html | 0 .../assets/grid-iframe-in-shadow.html | 0 .../assets/grid.html | 0 .../assets/har-fulfill.har | 0 .../assets/har-redirect.har | 0 .../assets/har-sha1-main-response.txt | 0 .../assets/har-sha1.har | 0 .../assets/har.html | 0 .../assets/headings.html | 0 .../assets/highdpi.html | 0 .../assets/historyapi.html | 0 .../assets/injectedfile.js | 0 .../assets/injectedstyle.css | 0 .../assets/input/animating-button.html | 0 .../assets/input/button.html | 0 .../assets/input/checkbox.html | 0 .../assets/input/fileupload-multi.html | 0 .../assets/input/fileupload.html | 0 .../assets/input/folderupload.html | 0 .../assets/input/handle-locator.html | 0 .../assets/input/keyboard.html | 0 .../assets/input/mouse-helper.js | 0 .../assets/input/rotatedButton.html | 0 .../assets/input/scrollable.html | 0 .../assets/input/scrollable2.html | 0 .../assets/input/select.html | 0 .../assets/input/textarea.html | 0 .../assets/input/touches.html | 0 .../assets/jscoverage/eval.html | 0 .../assets/jscoverage/involved.html | 0 .../assets/jscoverage/multiple.html | 0 .../assets/jscoverage/ranges.html | 0 .../assets/jscoverage/script1.js | 0 .../assets/jscoverage/script2.js | 0 .../assets/jscoverage/simple.html | 0 .../assets/jscoverage/sourceurl.html | 0 .../assets/jscoverage/unused.html | 0 .../assets/load-event/load-event.html | 0 .../assets/load-event/module.js | 0 .../media-query-prefers-color-scheme.svg | 0 .../assets/mobile.html | 0 .../assets/modernizr.html | 0 .../assets/modernizr.js | 0 .../assets/modernizr/mobile-safari-14-1.json | 0 .../assets/modernizr/safari-14-1.json | 0 .../assets/movie.mp4 | Bin .../assets/movie.ogv | Bin .../assets/mui.html | 0 .../assets/networkidle-frame.html | 0 .../assets/networkidle.html | 0 .../assets/networkidle.js | 0 .../assets/offscreenbuttons.html | 0 .../assets/one-style.css | 0 .../assets/one-style.html | 0 .../assets/overflow-large.html | 0 .../assets/overflow.html | 0 .../assets/player.html | 0 .../assets/playground.html | 0 .../assets/popup/popup.html | 0 .../assets/popup/window-open.html | 0 .../assets/pptr.png | Bin .../assets/react.html | 0 .../react/material-ui@5.2.2.production.min.js | 0 .../react/react-dom@16.13.1.production.min.js | 0 .../react/react-dom@17.0.2.production.min.js | 0 .../react/react@16.13.1.production.min.js | 0 .../react/react@17.0.2.production.min.js | 0 .../assets/reading-list/react-dom_15.7.0.js | 0 .../assets/reading-list/react-dom_16.14.0.js | 0 .../assets/reading-list/react-dom_17.0.2.js | 0 .../assets/reading-list/react15.html | 0 .../assets/reading-list/react16.html | 0 .../assets/reading-list/react17.html | 0 .../assets/reading-list/react_15.7.0.js | 0 .../assets/reading-list/react_16.14.0.js | 0 .../assets/reading-list/react_17.0.2.js | 0 .../assets/reading-list/style.css | 0 .../assets/reading-list/vue2.html | 0 .../assets/reading-list/vue3.html | 0 .../assets/reading-list/vue_2.6.14.js | 0 .../assets/reading-list/vue_3.1.5.js | 0 .../assets/redirectloop1.html | 0 .../assets/redirectloop2.html | 0 .../assets/resetcss.html | 0 .../assets/rotate-z.html | 0 .../assets/screenshots/canvas.html | 0 .../assets/screenshots/controls.html | 0 .../assets/screenshots/translateZ.html | 0 .../assets/screenshots/webgl.html | 0 .../assets/sectionselectorengine.js | 0 .../assets/self-request.html | 0 .../assets/serviceworkers/empty/sw.html | 0 .../assets/serviceworkers/empty/sw.js | 0 .../assets/serviceworkers/fetch/style.css | 0 .../assets/serviceworkers/fetch/sw.html | 0 .../assets/serviceworkers/fetch/sw.js | 0 .../assets/serviceworkers/fetchdummy/sw.html | 0 .../assets/serviceworkers/fetchdummy/sw.js | 0 .../assets/shadow-dom-link.html | 0 .../assets/shadow.html | 0 .../assets/simple-extension/content-script.js | 0 .../assets/simple-extension/index.js | 0 .../assets/simple-extension/manifest.json | 0 .../assets/simple.json | 0 .../assets/simplezip.json | 0 .../assets/tamperable.html | 0 .../assets/title.html | 0 .../assets/video.html | 0 .../assets/video_mp4.html | 0 .../assets/wasm/table2.html | 0 .../assets/wasm/table2.wasm | Bin .../assets/window-stop.html | 0 .../assets/worker/import-me.js | 0 .../assets/worker/worker-http-import.html | 0 .../assets/worker/worker-http-import.js | 0 .../assets/worker/worker.html | 0 .../assets/worker/worker.js | 0 .../assets/wrappedlink.html | 0 src/Playwright.sln | 25 ++++++---------- 218 files changed, 18 insertions(+), 125 deletions(-) delete mode 100644 src/Playwright.Tests.TestServer/Playwright.Tests.TestServer.csproj delete mode 100644 src/Playwright.Tests.TestServer/Properties/launchSettings.json rename src/{Playwright.Tests.TestServer => Playwright.Tests/TestServer}/SimpleServer.cs (97%) rename src/{Playwright.Tests.TestServer => Playwright.Tests/TestServer}/WebSocketWithEvents.cs (97%) rename src/{Playwright.Tests.TestServer => Playwright.Tests/TestServer}/key.pfx (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/background-color.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/beforeunload.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/button-overlay-oopif.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/cached/one-style.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/cached/one-style.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/callback.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/checkerboard.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/chromium-linux.zip (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/README.md (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/client/trusted/cert.pem (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/client/trusted/csr.pem (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/client/trusted/key.pem (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/server/server_cert.pem (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/client-certificates/server/server_key.pem (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/consolelog.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csp.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/Dosis-Regular.ttf (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/OFL.txt (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/involved.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/media.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/multiple.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/simple.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/sourceurl.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/stylesheet1.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/stylesheet2.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/csscoverage/unused.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/deep-shadow.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/detect-touch.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/0.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/1.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/2.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/3.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/4.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/5.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/6.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/7.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/8.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/digits/9.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/dom.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/download-blob.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/drag-n-drop.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/dummy_bad_browser_executable.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/dynamic-oopif.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/empty.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/empty.pdf (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/error.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/es6/.eslintrc (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/es6/es6import.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/es6/es6module.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/es6/es6pathimport.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/file-to-upload-2.txt (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/file-to-upload.txt (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/formatted-number.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/child-redirect.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/frame.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/frameset.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/lazy-frame.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/nested-frames.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/one-frame.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/redirect-my-parent.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/script.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/style.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/frames/two-frames.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/geolocation.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/global-var.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/grid-iframe-in-shadow.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/grid.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/har-fulfill.har (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/har-redirect.har (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/har-sha1-main-response.txt (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/har-sha1.har (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/har.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/headings.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/highdpi.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/historyapi.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/injectedfile.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/injectedstyle.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/animating-button.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/button.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/checkbox.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/fileupload-multi.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/fileupload.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/folderupload.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/handle-locator.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/keyboard.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/mouse-helper.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/rotatedButton.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/scrollable.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/scrollable2.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/select.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/textarea.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/input/touches.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/eval.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/involved.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/multiple.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/ranges.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/script1.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/script2.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/simple.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/sourceurl.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/jscoverage/unused.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/load-event/load-event.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/load-event/module.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/media-query-prefers-color-scheme.svg (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/mobile.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/modernizr.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/modernizr.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/modernizr/mobile-safari-14-1.json (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/modernizr/safari-14-1.json (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/movie.mp4 (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/movie.ogv (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/mui.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/networkidle-frame.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/networkidle.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/networkidle.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/offscreenbuttons.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/one-style.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/one-style.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/overflow-large.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/overflow.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/player.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/playground.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/popup/popup.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/popup/window-open.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/pptr.png (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react/material-ui@5.2.2.production.min.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react/react-dom@16.13.1.production.min.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react/react-dom@17.0.2.production.min.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react/react@16.13.1.production.min.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/react/react@17.0.2.production.min.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react-dom_15.7.0.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react-dom_16.14.0.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react-dom_17.0.2.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react15.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react16.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react17.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react_15.7.0.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react_16.14.0.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/react_17.0.2.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/style.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/vue2.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/vue3.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/vue_2.6.14.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/reading-list/vue_3.1.5.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/redirectloop1.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/redirectloop2.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/resetcss.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/rotate-z.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/screenshots/canvas.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/screenshots/controls.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/screenshots/translateZ.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/screenshots/webgl.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/sectionselectorengine.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/self-request.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/empty/sw.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/empty/sw.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/fetch/style.css (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/fetch/sw.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/fetch/sw.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/fetchdummy/sw.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/serviceworkers/fetchdummy/sw.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/shadow-dom-link.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/shadow.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/simple-extension/content-script.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/simple-extension/index.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/simple-extension/manifest.json (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/simple.json (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/simplezip.json (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/tamperable.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/title.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/video.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/video_mp4.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/wasm/table2.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/wasm/table2.wasm (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/window-stop.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/worker/import-me.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/worker/worker-http-import.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/worker/worker-http-import.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/worker/worker.html (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/worker/worker.js (100%) rename src/{Playwright.Tests.TestServer => Playwright.Tests}/assets/wrappedlink.html (100%) diff --git a/src/Playwright.Tests.TestServer/Playwright.Tests.TestServer.csproj b/src/Playwright.Tests.TestServer/Playwright.Tests.TestServer.csproj deleted file mode 100644 index 3a7c14e7bb..0000000000 --- a/src/Playwright.Tests.TestServer/Playwright.Tests.TestServer.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - net8.0 - Library - 0.0.0 - Microsoft.Playwright.Tests.TestServer - Microsoft.Playwright.Tests.TestServer - - - - - Always - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Playwright.Tests.TestServer/Properties/launchSettings.json b/src/Playwright.Tests.TestServer/Properties/launchSettings.json deleted file mode 100644 index fea2effc11..0000000000 --- a/src/Playwright.Tests.TestServer/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:7460/", - "sslPort": 44399 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Microsoft.Playwright.Tests.TestServer": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Playwright.Tests/Assertions/APIResponseAssertionsTests.cs b/src/Playwright.Tests/Assertions/APIResponseAssertionsTests.cs index 356657e538..1e6b8ebc64 100644 --- a/src/Playwright.Tests/Assertions/APIResponseAssertionsTests.cs +++ b/src/Playwright.Tests/Assertions/APIResponseAssertionsTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests.Assertions; public class APIResponseAssertionsTests : PageTestEx diff --git a/src/Playwright.Tests/BaseTests/HttpService.cs b/src/Playwright.Tests/BaseTests/HttpService.cs index 32113b847c..7daf328edb 100644 --- a/src/Playwright.Tests/BaseTests/HttpService.cs +++ b/src/Playwright.Tests/BaseTests/HttpService.cs @@ -36,7 +36,7 @@ public static Task Register(WorkerAwareTest test) var workerIndex = test.WorkerIndex; return test.RegisterService("Http", async () => { - var assetDir = Path.Combine(TestUtils.FindParentDirectory("Playwright.Tests.TestServer"), "assets"); + var assetDir = Path.Combine(TestUtils.FindParentDirectory("Playwright.Tests"), "assets"); var http = new HttpService { Server = SimpleServer.Create(8907 + workerIndex * 2, assetDir), diff --git a/src/Playwright.Tests/BrowserContextBasicTests.cs b/src/Playwright.Tests/BrowserContextBasicTests.cs index 584dd1ffba..6db8a28b47 100644 --- a/src/Playwright.Tests/BrowserContextBasicTests.cs +++ b/src/Playwright.Tests/BrowserContextBasicTests.cs @@ -24,7 +24,6 @@ */ using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/BrowserContextEventsTests.cs b/src/Playwright.Tests/BrowserContextEventsTests.cs index 35bd1e297a..87e4f44092 100644 --- a/src/Playwright.Tests/BrowserContextEventsTests.cs +++ b/src/Playwright.Tests/BrowserContextEventsTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; public class BrowserContextEventsTests : PageTestEx diff --git a/src/Playwright.Tests/BrowserContextFetchTests.cs b/src/Playwright.Tests/BrowserContextFetchTests.cs index 770c4e891b..cde263449f 100644 --- a/src/Playwright.Tests/BrowserContextFetchTests.cs +++ b/src/Playwright.Tests/BrowserContextFetchTests.cs @@ -24,7 +24,6 @@ using System.Text.Json; using System.Text.Json.Serialization; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/BrowserTypeConnectTests.cs b/src/Playwright.Tests/BrowserTypeConnectTests.cs index e57376eaee..7a5809fbfb 100644 --- a/src/Playwright.Tests/BrowserTypeConnectTests.cs +++ b/src/Playwright.Tests/BrowserTypeConnectTests.cs @@ -25,7 +25,6 @@ using System.Diagnostics; using System.IO.Compression; using System.Text; -using Microsoft.AspNetCore.Http; using Microsoft.Playwright.Helpers; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/CapabilitiesTests.cs b/src/Playwright.Tests/CapabilitiesTests.cs index 6bf693ed14..2a7c3a04bf 100644 --- a/src/Playwright.Tests/CapabilitiesTests.cs +++ b/src/Playwright.Tests/CapabilitiesTests.cs @@ -23,7 +23,6 @@ */ using System.Globalization; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/ClientCertficatesTests.cs b/src/Playwright.Tests/ClientCertficatesTests.cs index ddc43c853a..a55dd04eca 100644 --- a/src/Playwright.Tests/ClientCertficatesTests.cs +++ b/src/Playwright.Tests/ClientCertficatesTests.cs @@ -24,9 +24,6 @@ using System.Net; using System.Security.Cryptography.X509Certificates; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Https; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/DefaultBrowserContext1Tests.cs b/src/Playwright.Tests/DefaultBrowserContext1Tests.cs index 3ae3558c29..61c930a20c 100644 --- a/src/Playwright.Tests/DefaultBrowserContext1Tests.cs +++ b/src/Playwright.Tests/DefaultBrowserContext1Tests.cs @@ -23,7 +23,6 @@ */ using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/DownloadTests.cs b/src/Playwright.Tests/DownloadTests.cs index 7c7b48e01e..a5ace0bc81 100644 --- a/src/Playwright.Tests/DownloadTests.cs +++ b/src/Playwright.Tests/DownloadTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; ///download.spec.ts diff --git a/src/Playwright.Tests/DownloadsPathTests.cs b/src/Playwright.Tests/DownloadsPathTests.cs index abd328e1b1..5e33a92f2d 100644 --- a/src/Playwright.Tests/DownloadsPathTests.cs +++ b/src/Playwright.Tests/DownloadsPathTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; public class DownloadsPathTests : PlaywrightTestEx diff --git a/src/Playwright.Tests/FrameGoToTests.cs b/src/Playwright.Tests/FrameGoToTests.cs index d207ffd200..bcfd1a5d4b 100644 --- a/src/Playwright.Tests/FrameGoToTests.cs +++ b/src/Playwright.Tests/FrameGoToTests.cs @@ -24,7 +24,6 @@ */ using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/GlobalFetchTests.cs b/src/Playwright.Tests/GlobalFetchTests.cs index cdf163d047..fb8fb16c44 100644 --- a/src/Playwright.Tests/GlobalFetchTests.cs +++ b/src/Playwright.Tests/GlobalFetchTests.cs @@ -25,7 +25,6 @@ using System.Globalization; using System.Text; using System.Text.Json; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/IgnoreHttpsErrorsTests.cs b/src/Playwright.Tests/IgnoreHttpsErrorsTests.cs index 777c9c4c49..292118387a 100644 --- a/src/Playwright.Tests/IgnoreHttpsErrorsTests.cs +++ b/src/Playwright.Tests/IgnoreHttpsErrorsTests.cs @@ -24,7 +24,6 @@ */ using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageAutoWaitingBasicTests.cs b/src/Playwright.Tests/PageAutoWaitingBasicTests.cs index 0da9fc7101..c1d6195665 100644 --- a/src/Playwright.Tests/PageAutoWaitingBasicTests.cs +++ b/src/Playwright.Tests/PageAutoWaitingBasicTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; public class PageAutoWaitingBasicTests : PageTestEx diff --git a/src/Playwright.Tests/PageClockTests.cs b/src/Playwright.Tests/PageClockTests.cs index 8213555cd3..53dbf2ad02 100644 --- a/src/Playwright.Tests/PageClockTests.cs +++ b/src/Playwright.Tests/PageClockTests.cs @@ -23,7 +23,6 @@ */ using System.Text.Json; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageGotoTests.cs b/src/Playwright.Tests/PageGotoTests.cs index 1be8807b3c..bc1bfc6196 100644 --- a/src/Playwright.Tests/PageGotoTests.cs +++ b/src/Playwright.Tests/PageGotoTests.cs @@ -25,7 +25,6 @@ using System.Globalization; using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageNavigationTests.cs b/src/Playwright.Tests/PageNavigationTests.cs index 33e0f0cdb5..390929f045 100644 --- a/src/Playwright.Tests/PageNavigationTests.cs +++ b/src/Playwright.Tests/PageNavigationTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; public class PageNavigationTests : PageTestEx diff --git a/src/Playwright.Tests/PageNetworkIdleTests.cs b/src/Playwright.Tests/PageNetworkIdleTests.cs index 06dc0968e8..a4c2936441 100644 --- a/src/Playwright.Tests/PageNetworkIdleTests.cs +++ b/src/Playwright.Tests/PageNetworkIdleTests.cs @@ -26,7 +26,6 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageNetworkRequestTest.cs b/src/Playwright.Tests/PageNetworkRequestTest.cs index 51eb435ce1..07538c9ed9 100644 --- a/src/Playwright.Tests/PageNetworkRequestTest.cs +++ b/src/Playwright.Tests/PageNetworkRequestTest.cs @@ -23,7 +23,6 @@ */ using System.Text.Json; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageNetworkResponseTests.cs b/src/Playwright.Tests/PageNetworkResponseTests.cs index ed911089fd..77aee066ee 100644 --- a/src/Playwright.Tests/PageNetworkResponseTests.cs +++ b/src/Playwright.Tests/PageNetworkResponseTests.cs @@ -25,7 +25,6 @@ using System.Net; using System.Text.Json.Serialization; using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageRequestFulfillTests.cs b/src/Playwright.Tests/PageRequestFulfillTests.cs index 0499556cc4..57340b5424 100644 --- a/src/Playwright.Tests/PageRequestFulfillTests.cs +++ b/src/Playwright.Tests/PageRequestFulfillTests.cs @@ -23,7 +23,6 @@ */ using System.Net; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageRequestInterceptTests.cs b/src/Playwright.Tests/PageRequestInterceptTests.cs index 4e70c583e5..20d9e9166d 100644 --- a/src/Playwright.Tests/PageRequestInterceptTests.cs +++ b/src/Playwright.Tests/PageRequestInterceptTests.cs @@ -23,7 +23,6 @@ */ using System.Text.Json; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageRouteTests.cs b/src/Playwright.Tests/PageRouteTests.cs index fc48fcfe42..e39ebe462d 100644 --- a/src/Playwright.Tests/PageRouteTests.cs +++ b/src/Playwright.Tests/PageRouteTests.cs @@ -25,7 +25,6 @@ using System.Globalization; using System.Net; using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/PageWaitForLoadStateTests.cs b/src/Playwright.Tests/PageWaitForLoadStateTests.cs index 0dddfb6aa5..4b6d8cd404 100644 --- a/src/Playwright.Tests/PageWaitForLoadStateTests.cs +++ b/src/Playwright.Tests/PageWaitForLoadStateTests.cs @@ -23,8 +23,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; ///page-wait-for-load-state.ts diff --git a/src/Playwright.Tests/PageWaitForUrlTests.cs b/src/Playwright.Tests/PageWaitForUrlTests.cs index 0539e9717f..9782e51802 100644 --- a/src/Playwright.Tests/PageWaitForUrlTests.cs +++ b/src/Playwright.Tests/PageWaitForUrlTests.cs @@ -23,7 +23,6 @@ */ using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/Playwright.Tests.csproj b/src/Playwright.Tests/Playwright.Tests.csproj index 5fc53db67e..5b46c2ac6b 100644 --- a/src/Playwright.Tests/Playwright.Tests.csproj +++ b/src/Playwright.Tests/Playwright.Tests.csproj @@ -1,5 +1,5 @@ - + net8.0 12 @@ -11,6 +11,12 @@ enable + + + Always + + + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -27,7 +33,6 @@ - diff --git a/src/Playwright.Tests/ProxyTests.cs b/src/Playwright.Tests/ProxyTests.cs index c55580a328..9fab6251c4 100644 --- a/src/Playwright.Tests/ProxyTests.cs +++ b/src/Playwright.Tests/ProxyTests.cs @@ -23,7 +23,6 @@ */ using System.Text; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests; diff --git a/src/Playwright.Tests/ResourceTimingTests.cs b/src/Playwright.Tests/ResourceTimingTests.cs index 5ad9247af3..c0f8219fa1 100644 --- a/src/Playwright.Tests/ResourceTimingTests.cs +++ b/src/Playwright.Tests/ResourceTimingTests.cs @@ -22,8 +22,6 @@ * SOFTWARE. */ -using Microsoft.AspNetCore.Http; - namespace Microsoft.Playwright.Tests; ///resource-timing.spec.ts diff --git a/src/Playwright.Tests.TestServer/SimpleServer.cs b/src/Playwright.Tests/TestServer/SimpleServer.cs similarity index 97% rename from src/Playwright.Tests.TestServer/SimpleServer.cs rename to src/Playwright.Tests/TestServer/SimpleServer.cs index f9239b65db..28b60a0b9a 100644 --- a/src/Playwright.Tests.TestServer/SimpleServer.cs +++ b/src/Playwright.Tests/TestServer/SimpleServer.cs @@ -23,10 +23,7 @@ * SOFTWARE. */ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.IO; using System.IO.Compression; using System.Net; using System.Net.WebSockets; @@ -34,15 +31,8 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.StaticFiles; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using NUnit.Framework.Internal; namespace Microsoft.Playwright.Tests.TestServer; @@ -155,7 +145,7 @@ public SimpleServer(int port, string contentRoot, bool isHttps) { if (isHttps) { - var cert = new X509Certificate2("key.pfx", "aaaa"); + var cert = new X509Certificate2("TestServer/key.pfx", "aaaa"); options.Listen(IPAddress.Loopback, port, listenOptions => listenOptions.UseHttps(cert)); } else diff --git a/src/Playwright.Tests.TestServer/WebSocketWithEvents.cs b/src/Playwright.Tests/TestServer/WebSocketWithEvents.cs similarity index 97% rename from src/Playwright.Tests.TestServer/WebSocketWithEvents.cs rename to src/Playwright.Tests/TestServer/WebSocketWithEvents.cs index 0e98505d7e..1dda196a1d 100644 --- a/src/Playwright.Tests.TestServer/WebSocketWithEvents.cs +++ b/src/Playwright.Tests/TestServer/WebSocketWithEvents.cs @@ -22,12 +22,8 @@ * SOFTWARE. */ -using System; using System.Net.WebSockets; using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; namespace Microsoft.Playwright.Tests.TestServer; diff --git a/src/Playwright.Tests.TestServer/key.pfx b/src/Playwright.Tests/TestServer/key.pfx similarity index 100% rename from src/Playwright.Tests.TestServer/key.pfx rename to src/Playwright.Tests/TestServer/key.pfx diff --git a/src/Playwright.Tests/TestUtils.cs b/src/Playwright.Tests/TestUtils.cs index e6a337b6f1..31238997cf 100644 --- a/src/Playwright.Tests/TestUtils.cs +++ b/src/Playwright.Tests/TestUtils.cs @@ -113,7 +113,7 @@ internal static async Task RegisterEngineWithPathAsync(IPlaywright playwright, s } } - internal static string GetAsset(string path) => Path.Combine(FindParentDirectory("Playwright.Tests.TestServer"), "assets", path); + internal static string GetAsset(string path) => Path.Combine(FindParentDirectory("Playwright.Tests"), "assets", path); internal static async Task VerifyViewportAsync(IPage page, int width, int height) { diff --git a/src/Playwright.Tests.TestServer/assets/background-color.html b/src/Playwright.Tests/assets/background-color.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/background-color.html rename to src/Playwright.Tests/assets/background-color.html diff --git a/src/Playwright.Tests.TestServer/assets/beforeunload.html b/src/Playwright.Tests/assets/beforeunload.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/beforeunload.html rename to src/Playwright.Tests/assets/beforeunload.html diff --git a/src/Playwright.Tests.TestServer/assets/button-overlay-oopif.html b/src/Playwright.Tests/assets/button-overlay-oopif.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/button-overlay-oopif.html rename to src/Playwright.Tests/assets/button-overlay-oopif.html diff --git a/src/Playwright.Tests.TestServer/assets/cached/one-style.css b/src/Playwright.Tests/assets/cached/one-style.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/cached/one-style.css rename to src/Playwright.Tests/assets/cached/one-style.css diff --git a/src/Playwright.Tests.TestServer/assets/cached/one-style.html b/src/Playwright.Tests/assets/cached/one-style.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/cached/one-style.html rename to src/Playwright.Tests/assets/cached/one-style.html diff --git a/src/Playwright.Tests.TestServer/assets/callback.js b/src/Playwright.Tests/assets/callback.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/callback.js rename to src/Playwright.Tests/assets/callback.js diff --git a/src/Playwright.Tests.TestServer/assets/checkerboard.html b/src/Playwright.Tests/assets/checkerboard.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/checkerboard.html rename to src/Playwright.Tests/assets/checkerboard.html diff --git a/src/Playwright.Tests.TestServer/assets/chromium-linux.zip b/src/Playwright.Tests/assets/chromium-linux.zip similarity index 100% rename from src/Playwright.Tests.TestServer/assets/chromium-linux.zip rename to src/Playwright.Tests/assets/chromium-linux.zip diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/README.md b/src/Playwright.Tests/assets/client-certificates/README.md similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/README.md rename to src/Playwright.Tests/assets/client-certificates/README.md diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/cert.pem b/src/Playwright.Tests/assets/client-certificates/client/trusted/cert.pem similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/cert.pem rename to src/Playwright.Tests/assets/client-certificates/client/trusted/cert.pem diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/csr.pem b/src/Playwright.Tests/assets/client-certificates/client/trusted/csr.pem similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/csr.pem rename to src/Playwright.Tests/assets/client-certificates/client/trusted/csr.pem diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/key.pem b/src/Playwright.Tests/assets/client-certificates/client/trusted/key.pem similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/client/trusted/key.pem rename to src/Playwright.Tests/assets/client-certificates/client/trusted/key.pem diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/server/server_cert.pem b/src/Playwright.Tests/assets/client-certificates/server/server_cert.pem similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/server/server_cert.pem rename to src/Playwright.Tests/assets/client-certificates/server/server_cert.pem diff --git a/src/Playwright.Tests.TestServer/assets/client-certificates/server/server_key.pem b/src/Playwright.Tests/assets/client-certificates/server/server_key.pem similarity index 100% rename from src/Playwright.Tests.TestServer/assets/client-certificates/server/server_key.pem rename to src/Playwright.Tests/assets/client-certificates/server/server_key.pem diff --git a/src/Playwright.Tests.TestServer/assets/consolelog.html b/src/Playwright.Tests/assets/consolelog.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/consolelog.html rename to src/Playwright.Tests/assets/consolelog.html diff --git a/src/Playwright.Tests.TestServer/assets/csp.html b/src/Playwright.Tests/assets/csp.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csp.html rename to src/Playwright.Tests/assets/csp.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/Dosis-Regular.ttf b/src/Playwright.Tests/assets/csscoverage/Dosis-Regular.ttf similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/Dosis-Regular.ttf rename to src/Playwright.Tests/assets/csscoverage/Dosis-Regular.ttf diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/OFL.txt b/src/Playwright.Tests/assets/csscoverage/OFL.txt similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/OFL.txt rename to src/Playwright.Tests/assets/csscoverage/OFL.txt diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/involved.html b/src/Playwright.Tests/assets/csscoverage/involved.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/involved.html rename to src/Playwright.Tests/assets/csscoverage/involved.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/media.html b/src/Playwright.Tests/assets/csscoverage/media.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/media.html rename to src/Playwright.Tests/assets/csscoverage/media.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/multiple.html b/src/Playwright.Tests/assets/csscoverage/multiple.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/multiple.html rename to src/Playwright.Tests/assets/csscoverage/multiple.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/simple.html b/src/Playwright.Tests/assets/csscoverage/simple.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/simple.html rename to src/Playwright.Tests/assets/csscoverage/simple.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/sourceurl.html b/src/Playwright.Tests/assets/csscoverage/sourceurl.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/sourceurl.html rename to src/Playwright.Tests/assets/csscoverage/sourceurl.html diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/stylesheet1.css b/src/Playwright.Tests/assets/csscoverage/stylesheet1.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/stylesheet1.css rename to src/Playwright.Tests/assets/csscoverage/stylesheet1.css diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/stylesheet2.css b/src/Playwright.Tests/assets/csscoverage/stylesheet2.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/stylesheet2.css rename to src/Playwright.Tests/assets/csscoverage/stylesheet2.css diff --git a/src/Playwright.Tests.TestServer/assets/csscoverage/unused.html b/src/Playwright.Tests/assets/csscoverage/unused.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/csscoverage/unused.html rename to src/Playwright.Tests/assets/csscoverage/unused.html diff --git a/src/Playwright.Tests.TestServer/assets/deep-shadow.html b/src/Playwright.Tests/assets/deep-shadow.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/deep-shadow.html rename to src/Playwright.Tests/assets/deep-shadow.html diff --git a/src/Playwright.Tests.TestServer/assets/detect-touch.html b/src/Playwright.Tests/assets/detect-touch.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/detect-touch.html rename to src/Playwright.Tests/assets/detect-touch.html diff --git a/src/Playwright.Tests.TestServer/assets/digits/0.png b/src/Playwright.Tests/assets/digits/0.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/0.png rename to src/Playwright.Tests/assets/digits/0.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/1.png b/src/Playwright.Tests/assets/digits/1.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/1.png rename to src/Playwright.Tests/assets/digits/1.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/2.png b/src/Playwright.Tests/assets/digits/2.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/2.png rename to src/Playwright.Tests/assets/digits/2.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/3.png b/src/Playwright.Tests/assets/digits/3.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/3.png rename to src/Playwright.Tests/assets/digits/3.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/4.png b/src/Playwright.Tests/assets/digits/4.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/4.png rename to src/Playwright.Tests/assets/digits/4.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/5.png b/src/Playwright.Tests/assets/digits/5.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/5.png rename to src/Playwright.Tests/assets/digits/5.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/6.png b/src/Playwright.Tests/assets/digits/6.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/6.png rename to src/Playwright.Tests/assets/digits/6.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/7.png b/src/Playwright.Tests/assets/digits/7.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/7.png rename to src/Playwright.Tests/assets/digits/7.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/8.png b/src/Playwright.Tests/assets/digits/8.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/8.png rename to src/Playwright.Tests/assets/digits/8.png diff --git a/src/Playwright.Tests.TestServer/assets/digits/9.png b/src/Playwright.Tests/assets/digits/9.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/digits/9.png rename to src/Playwright.Tests/assets/digits/9.png diff --git a/src/Playwright.Tests.TestServer/assets/dom.html b/src/Playwright.Tests/assets/dom.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/dom.html rename to src/Playwright.Tests/assets/dom.html diff --git a/src/Playwright.Tests.TestServer/assets/download-blob.html b/src/Playwright.Tests/assets/download-blob.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/download-blob.html rename to src/Playwright.Tests/assets/download-blob.html diff --git a/src/Playwright.Tests.TestServer/assets/drag-n-drop.html b/src/Playwright.Tests/assets/drag-n-drop.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/drag-n-drop.html rename to src/Playwright.Tests/assets/drag-n-drop.html diff --git a/src/Playwright.Tests.TestServer/assets/dummy_bad_browser_executable.js b/src/Playwright.Tests/assets/dummy_bad_browser_executable.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/dummy_bad_browser_executable.js rename to src/Playwright.Tests/assets/dummy_bad_browser_executable.js diff --git a/src/Playwright.Tests.TestServer/assets/dynamic-oopif.html b/src/Playwright.Tests/assets/dynamic-oopif.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/dynamic-oopif.html rename to src/Playwright.Tests/assets/dynamic-oopif.html diff --git a/src/Playwright.Tests.TestServer/assets/empty.html b/src/Playwright.Tests/assets/empty.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/empty.html rename to src/Playwright.Tests/assets/empty.html diff --git a/src/Playwright.Tests.TestServer/assets/empty.pdf b/src/Playwright.Tests/assets/empty.pdf similarity index 100% rename from src/Playwright.Tests.TestServer/assets/empty.pdf rename to src/Playwright.Tests/assets/empty.pdf diff --git a/src/Playwright.Tests.TestServer/assets/error.html b/src/Playwright.Tests/assets/error.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/error.html rename to src/Playwright.Tests/assets/error.html diff --git a/src/Playwright.Tests.TestServer/assets/es6/.eslintrc b/src/Playwright.Tests/assets/es6/.eslintrc similarity index 100% rename from src/Playwright.Tests.TestServer/assets/es6/.eslintrc rename to src/Playwright.Tests/assets/es6/.eslintrc diff --git a/src/Playwright.Tests.TestServer/assets/es6/es6import.js b/src/Playwright.Tests/assets/es6/es6import.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/es6/es6import.js rename to src/Playwright.Tests/assets/es6/es6import.js diff --git a/src/Playwright.Tests.TestServer/assets/es6/es6module.js b/src/Playwright.Tests/assets/es6/es6module.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/es6/es6module.js rename to src/Playwright.Tests/assets/es6/es6module.js diff --git a/src/Playwright.Tests.TestServer/assets/es6/es6pathimport.js b/src/Playwright.Tests/assets/es6/es6pathimport.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/es6/es6pathimport.js rename to src/Playwright.Tests/assets/es6/es6pathimport.js diff --git a/src/Playwright.Tests.TestServer/assets/file-to-upload-2.txt b/src/Playwright.Tests/assets/file-to-upload-2.txt similarity index 100% rename from src/Playwright.Tests.TestServer/assets/file-to-upload-2.txt rename to src/Playwright.Tests/assets/file-to-upload-2.txt diff --git a/src/Playwright.Tests.TestServer/assets/file-to-upload.txt b/src/Playwright.Tests/assets/file-to-upload.txt similarity index 100% rename from src/Playwright.Tests.TestServer/assets/file-to-upload.txt rename to src/Playwright.Tests/assets/file-to-upload.txt diff --git a/src/Playwright.Tests.TestServer/assets/formatted-number.html b/src/Playwright.Tests/assets/formatted-number.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/formatted-number.html rename to src/Playwright.Tests/assets/formatted-number.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/child-redirect.html b/src/Playwright.Tests/assets/frames/child-redirect.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/child-redirect.html rename to src/Playwright.Tests/assets/frames/child-redirect.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/frame.html b/src/Playwright.Tests/assets/frames/frame.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/frame.html rename to src/Playwright.Tests/assets/frames/frame.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/frameset.html b/src/Playwright.Tests/assets/frames/frameset.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/frameset.html rename to src/Playwright.Tests/assets/frames/frameset.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/lazy-frame.html b/src/Playwright.Tests/assets/frames/lazy-frame.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/lazy-frame.html rename to src/Playwright.Tests/assets/frames/lazy-frame.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/nested-frames.html b/src/Playwright.Tests/assets/frames/nested-frames.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/nested-frames.html rename to src/Playwright.Tests/assets/frames/nested-frames.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/one-frame.html b/src/Playwright.Tests/assets/frames/one-frame.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/one-frame.html rename to src/Playwright.Tests/assets/frames/one-frame.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/redirect-my-parent.html b/src/Playwright.Tests/assets/frames/redirect-my-parent.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/redirect-my-parent.html rename to src/Playwright.Tests/assets/frames/redirect-my-parent.html diff --git a/src/Playwright.Tests.TestServer/assets/frames/script.js b/src/Playwright.Tests/assets/frames/script.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/script.js rename to src/Playwright.Tests/assets/frames/script.js diff --git a/src/Playwright.Tests.TestServer/assets/frames/style.css b/src/Playwright.Tests/assets/frames/style.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/style.css rename to src/Playwright.Tests/assets/frames/style.css diff --git a/src/Playwright.Tests.TestServer/assets/frames/two-frames.html b/src/Playwright.Tests/assets/frames/two-frames.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/frames/two-frames.html rename to src/Playwright.Tests/assets/frames/two-frames.html diff --git a/src/Playwright.Tests.TestServer/assets/geolocation.html b/src/Playwright.Tests/assets/geolocation.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/geolocation.html rename to src/Playwright.Tests/assets/geolocation.html diff --git a/src/Playwright.Tests.TestServer/assets/global-var.html b/src/Playwright.Tests/assets/global-var.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/global-var.html rename to src/Playwright.Tests/assets/global-var.html diff --git a/src/Playwright.Tests.TestServer/assets/grid-iframe-in-shadow.html b/src/Playwright.Tests/assets/grid-iframe-in-shadow.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/grid-iframe-in-shadow.html rename to src/Playwright.Tests/assets/grid-iframe-in-shadow.html diff --git a/src/Playwright.Tests.TestServer/assets/grid.html b/src/Playwright.Tests/assets/grid.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/grid.html rename to src/Playwright.Tests/assets/grid.html diff --git a/src/Playwright.Tests.TestServer/assets/har-fulfill.har b/src/Playwright.Tests/assets/har-fulfill.har similarity index 100% rename from src/Playwright.Tests.TestServer/assets/har-fulfill.har rename to src/Playwright.Tests/assets/har-fulfill.har diff --git a/src/Playwright.Tests.TestServer/assets/har-redirect.har b/src/Playwright.Tests/assets/har-redirect.har similarity index 100% rename from src/Playwright.Tests.TestServer/assets/har-redirect.har rename to src/Playwright.Tests/assets/har-redirect.har diff --git a/src/Playwright.Tests.TestServer/assets/har-sha1-main-response.txt b/src/Playwright.Tests/assets/har-sha1-main-response.txt similarity index 100% rename from src/Playwright.Tests.TestServer/assets/har-sha1-main-response.txt rename to src/Playwright.Tests/assets/har-sha1-main-response.txt diff --git a/src/Playwright.Tests.TestServer/assets/har-sha1.har b/src/Playwright.Tests/assets/har-sha1.har similarity index 100% rename from src/Playwright.Tests.TestServer/assets/har-sha1.har rename to src/Playwright.Tests/assets/har-sha1.har diff --git a/src/Playwright.Tests.TestServer/assets/har.html b/src/Playwright.Tests/assets/har.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/har.html rename to src/Playwright.Tests/assets/har.html diff --git a/src/Playwright.Tests.TestServer/assets/headings.html b/src/Playwright.Tests/assets/headings.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/headings.html rename to src/Playwright.Tests/assets/headings.html diff --git a/src/Playwright.Tests.TestServer/assets/highdpi.html b/src/Playwright.Tests/assets/highdpi.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/highdpi.html rename to src/Playwright.Tests/assets/highdpi.html diff --git a/src/Playwright.Tests.TestServer/assets/historyapi.html b/src/Playwright.Tests/assets/historyapi.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/historyapi.html rename to src/Playwright.Tests/assets/historyapi.html diff --git a/src/Playwright.Tests.TestServer/assets/injectedfile.js b/src/Playwright.Tests/assets/injectedfile.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/injectedfile.js rename to src/Playwright.Tests/assets/injectedfile.js diff --git a/src/Playwright.Tests.TestServer/assets/injectedstyle.css b/src/Playwright.Tests/assets/injectedstyle.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/injectedstyle.css rename to src/Playwright.Tests/assets/injectedstyle.css diff --git a/src/Playwright.Tests.TestServer/assets/input/animating-button.html b/src/Playwright.Tests/assets/input/animating-button.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/animating-button.html rename to src/Playwright.Tests/assets/input/animating-button.html diff --git a/src/Playwright.Tests.TestServer/assets/input/button.html b/src/Playwright.Tests/assets/input/button.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/button.html rename to src/Playwright.Tests/assets/input/button.html diff --git a/src/Playwright.Tests.TestServer/assets/input/checkbox.html b/src/Playwright.Tests/assets/input/checkbox.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/checkbox.html rename to src/Playwright.Tests/assets/input/checkbox.html diff --git a/src/Playwright.Tests.TestServer/assets/input/fileupload-multi.html b/src/Playwright.Tests/assets/input/fileupload-multi.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/fileupload-multi.html rename to src/Playwright.Tests/assets/input/fileupload-multi.html diff --git a/src/Playwright.Tests.TestServer/assets/input/fileupload.html b/src/Playwright.Tests/assets/input/fileupload.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/fileupload.html rename to src/Playwright.Tests/assets/input/fileupload.html diff --git a/src/Playwright.Tests.TestServer/assets/input/folderupload.html b/src/Playwright.Tests/assets/input/folderupload.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/folderupload.html rename to src/Playwright.Tests/assets/input/folderupload.html diff --git a/src/Playwright.Tests.TestServer/assets/input/handle-locator.html b/src/Playwright.Tests/assets/input/handle-locator.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/handle-locator.html rename to src/Playwright.Tests/assets/input/handle-locator.html diff --git a/src/Playwright.Tests.TestServer/assets/input/keyboard.html b/src/Playwright.Tests/assets/input/keyboard.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/keyboard.html rename to src/Playwright.Tests/assets/input/keyboard.html diff --git a/src/Playwright.Tests.TestServer/assets/input/mouse-helper.js b/src/Playwright.Tests/assets/input/mouse-helper.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/mouse-helper.js rename to src/Playwright.Tests/assets/input/mouse-helper.js diff --git a/src/Playwright.Tests.TestServer/assets/input/rotatedButton.html b/src/Playwright.Tests/assets/input/rotatedButton.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/rotatedButton.html rename to src/Playwright.Tests/assets/input/rotatedButton.html diff --git a/src/Playwright.Tests.TestServer/assets/input/scrollable.html b/src/Playwright.Tests/assets/input/scrollable.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/scrollable.html rename to src/Playwright.Tests/assets/input/scrollable.html diff --git a/src/Playwright.Tests.TestServer/assets/input/scrollable2.html b/src/Playwright.Tests/assets/input/scrollable2.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/scrollable2.html rename to src/Playwright.Tests/assets/input/scrollable2.html diff --git a/src/Playwright.Tests.TestServer/assets/input/select.html b/src/Playwright.Tests/assets/input/select.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/select.html rename to src/Playwright.Tests/assets/input/select.html diff --git a/src/Playwright.Tests.TestServer/assets/input/textarea.html b/src/Playwright.Tests/assets/input/textarea.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/textarea.html rename to src/Playwright.Tests/assets/input/textarea.html diff --git a/src/Playwright.Tests.TestServer/assets/input/touches.html b/src/Playwright.Tests/assets/input/touches.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/input/touches.html rename to src/Playwright.Tests/assets/input/touches.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/eval.html b/src/Playwright.Tests/assets/jscoverage/eval.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/eval.html rename to src/Playwright.Tests/assets/jscoverage/eval.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/involved.html b/src/Playwright.Tests/assets/jscoverage/involved.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/involved.html rename to src/Playwright.Tests/assets/jscoverage/involved.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/multiple.html b/src/Playwright.Tests/assets/jscoverage/multiple.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/multiple.html rename to src/Playwright.Tests/assets/jscoverage/multiple.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/ranges.html b/src/Playwright.Tests/assets/jscoverage/ranges.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/ranges.html rename to src/Playwright.Tests/assets/jscoverage/ranges.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/script1.js b/src/Playwright.Tests/assets/jscoverage/script1.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/script1.js rename to src/Playwright.Tests/assets/jscoverage/script1.js diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/script2.js b/src/Playwright.Tests/assets/jscoverage/script2.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/script2.js rename to src/Playwright.Tests/assets/jscoverage/script2.js diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/simple.html b/src/Playwright.Tests/assets/jscoverage/simple.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/simple.html rename to src/Playwright.Tests/assets/jscoverage/simple.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/sourceurl.html b/src/Playwright.Tests/assets/jscoverage/sourceurl.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/sourceurl.html rename to src/Playwright.Tests/assets/jscoverage/sourceurl.html diff --git a/src/Playwright.Tests.TestServer/assets/jscoverage/unused.html b/src/Playwright.Tests/assets/jscoverage/unused.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/jscoverage/unused.html rename to src/Playwright.Tests/assets/jscoverage/unused.html diff --git a/src/Playwright.Tests.TestServer/assets/load-event/load-event.html b/src/Playwright.Tests/assets/load-event/load-event.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/load-event/load-event.html rename to src/Playwright.Tests/assets/load-event/load-event.html diff --git a/src/Playwright.Tests.TestServer/assets/load-event/module.js b/src/Playwright.Tests/assets/load-event/module.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/load-event/module.js rename to src/Playwright.Tests/assets/load-event/module.js diff --git a/src/Playwright.Tests.TestServer/assets/media-query-prefers-color-scheme.svg b/src/Playwright.Tests/assets/media-query-prefers-color-scheme.svg similarity index 100% rename from src/Playwright.Tests.TestServer/assets/media-query-prefers-color-scheme.svg rename to src/Playwright.Tests/assets/media-query-prefers-color-scheme.svg diff --git a/src/Playwright.Tests.TestServer/assets/mobile.html b/src/Playwright.Tests/assets/mobile.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/mobile.html rename to src/Playwright.Tests/assets/mobile.html diff --git a/src/Playwright.Tests.TestServer/assets/modernizr.html b/src/Playwright.Tests/assets/modernizr.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/modernizr.html rename to src/Playwright.Tests/assets/modernizr.html diff --git a/src/Playwright.Tests.TestServer/assets/modernizr.js b/src/Playwright.Tests/assets/modernizr.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/modernizr.js rename to src/Playwright.Tests/assets/modernizr.js diff --git a/src/Playwright.Tests.TestServer/assets/modernizr/mobile-safari-14-1.json b/src/Playwright.Tests/assets/modernizr/mobile-safari-14-1.json similarity index 100% rename from src/Playwright.Tests.TestServer/assets/modernizr/mobile-safari-14-1.json rename to src/Playwright.Tests/assets/modernizr/mobile-safari-14-1.json diff --git a/src/Playwright.Tests.TestServer/assets/modernizr/safari-14-1.json b/src/Playwright.Tests/assets/modernizr/safari-14-1.json similarity index 100% rename from src/Playwright.Tests.TestServer/assets/modernizr/safari-14-1.json rename to src/Playwright.Tests/assets/modernizr/safari-14-1.json diff --git a/src/Playwright.Tests.TestServer/assets/movie.mp4 b/src/Playwright.Tests/assets/movie.mp4 similarity index 100% rename from src/Playwright.Tests.TestServer/assets/movie.mp4 rename to src/Playwright.Tests/assets/movie.mp4 diff --git a/src/Playwright.Tests.TestServer/assets/movie.ogv b/src/Playwright.Tests/assets/movie.ogv similarity index 100% rename from src/Playwright.Tests.TestServer/assets/movie.ogv rename to src/Playwright.Tests/assets/movie.ogv diff --git a/src/Playwright.Tests.TestServer/assets/mui.html b/src/Playwright.Tests/assets/mui.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/mui.html rename to src/Playwright.Tests/assets/mui.html diff --git a/src/Playwright.Tests.TestServer/assets/networkidle-frame.html b/src/Playwright.Tests/assets/networkidle-frame.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/networkidle-frame.html rename to src/Playwright.Tests/assets/networkidle-frame.html diff --git a/src/Playwright.Tests.TestServer/assets/networkidle.html b/src/Playwright.Tests/assets/networkidle.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/networkidle.html rename to src/Playwright.Tests/assets/networkidle.html diff --git a/src/Playwright.Tests.TestServer/assets/networkidle.js b/src/Playwright.Tests/assets/networkidle.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/networkidle.js rename to src/Playwright.Tests/assets/networkidle.js diff --git a/src/Playwright.Tests.TestServer/assets/offscreenbuttons.html b/src/Playwright.Tests/assets/offscreenbuttons.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/offscreenbuttons.html rename to src/Playwright.Tests/assets/offscreenbuttons.html diff --git a/src/Playwright.Tests.TestServer/assets/one-style.css b/src/Playwright.Tests/assets/one-style.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/one-style.css rename to src/Playwright.Tests/assets/one-style.css diff --git a/src/Playwright.Tests.TestServer/assets/one-style.html b/src/Playwright.Tests/assets/one-style.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/one-style.html rename to src/Playwright.Tests/assets/one-style.html diff --git a/src/Playwright.Tests.TestServer/assets/overflow-large.html b/src/Playwright.Tests/assets/overflow-large.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/overflow-large.html rename to src/Playwright.Tests/assets/overflow-large.html diff --git a/src/Playwright.Tests.TestServer/assets/overflow.html b/src/Playwright.Tests/assets/overflow.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/overflow.html rename to src/Playwright.Tests/assets/overflow.html diff --git a/src/Playwright.Tests.TestServer/assets/player.html b/src/Playwright.Tests/assets/player.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/player.html rename to src/Playwright.Tests/assets/player.html diff --git a/src/Playwright.Tests.TestServer/assets/playground.html b/src/Playwright.Tests/assets/playground.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/playground.html rename to src/Playwright.Tests/assets/playground.html diff --git a/src/Playwright.Tests.TestServer/assets/popup/popup.html b/src/Playwright.Tests/assets/popup/popup.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/popup/popup.html rename to src/Playwright.Tests/assets/popup/popup.html diff --git a/src/Playwright.Tests.TestServer/assets/popup/window-open.html b/src/Playwright.Tests/assets/popup/window-open.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/popup/window-open.html rename to src/Playwright.Tests/assets/popup/window-open.html diff --git a/src/Playwright.Tests.TestServer/assets/pptr.png b/src/Playwright.Tests/assets/pptr.png similarity index 100% rename from src/Playwright.Tests.TestServer/assets/pptr.png rename to src/Playwright.Tests/assets/pptr.png diff --git a/src/Playwright.Tests.TestServer/assets/react.html b/src/Playwright.Tests/assets/react.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react.html rename to src/Playwright.Tests/assets/react.html diff --git a/src/Playwright.Tests.TestServer/assets/react/material-ui@5.2.2.production.min.js b/src/Playwright.Tests/assets/react/material-ui@5.2.2.production.min.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react/material-ui@5.2.2.production.min.js rename to src/Playwright.Tests/assets/react/material-ui@5.2.2.production.min.js diff --git a/src/Playwright.Tests.TestServer/assets/react/react-dom@16.13.1.production.min.js b/src/Playwright.Tests/assets/react/react-dom@16.13.1.production.min.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react/react-dom@16.13.1.production.min.js rename to src/Playwright.Tests/assets/react/react-dom@16.13.1.production.min.js diff --git a/src/Playwright.Tests.TestServer/assets/react/react-dom@17.0.2.production.min.js b/src/Playwright.Tests/assets/react/react-dom@17.0.2.production.min.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react/react-dom@17.0.2.production.min.js rename to src/Playwright.Tests/assets/react/react-dom@17.0.2.production.min.js diff --git a/src/Playwright.Tests.TestServer/assets/react/react@16.13.1.production.min.js b/src/Playwright.Tests/assets/react/react@16.13.1.production.min.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react/react@16.13.1.production.min.js rename to src/Playwright.Tests/assets/react/react@16.13.1.production.min.js diff --git a/src/Playwright.Tests.TestServer/assets/react/react@17.0.2.production.min.js b/src/Playwright.Tests/assets/react/react@17.0.2.production.min.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/react/react@17.0.2.production.min.js rename to src/Playwright.Tests/assets/react/react@17.0.2.production.min.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react-dom_15.7.0.js b/src/Playwright.Tests/assets/reading-list/react-dom_15.7.0.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react-dom_15.7.0.js rename to src/Playwright.Tests/assets/reading-list/react-dom_15.7.0.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react-dom_16.14.0.js b/src/Playwright.Tests/assets/reading-list/react-dom_16.14.0.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react-dom_16.14.0.js rename to src/Playwright.Tests/assets/reading-list/react-dom_16.14.0.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react-dom_17.0.2.js b/src/Playwright.Tests/assets/reading-list/react-dom_17.0.2.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react-dom_17.0.2.js rename to src/Playwright.Tests/assets/reading-list/react-dom_17.0.2.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react15.html b/src/Playwright.Tests/assets/reading-list/react15.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react15.html rename to src/Playwright.Tests/assets/reading-list/react15.html diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react16.html b/src/Playwright.Tests/assets/reading-list/react16.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react16.html rename to src/Playwright.Tests/assets/reading-list/react16.html diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react17.html b/src/Playwright.Tests/assets/reading-list/react17.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react17.html rename to src/Playwright.Tests/assets/reading-list/react17.html diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react_15.7.0.js b/src/Playwright.Tests/assets/reading-list/react_15.7.0.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react_15.7.0.js rename to src/Playwright.Tests/assets/reading-list/react_15.7.0.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react_16.14.0.js b/src/Playwright.Tests/assets/reading-list/react_16.14.0.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react_16.14.0.js rename to src/Playwright.Tests/assets/reading-list/react_16.14.0.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/react_17.0.2.js b/src/Playwright.Tests/assets/reading-list/react_17.0.2.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/react_17.0.2.js rename to src/Playwright.Tests/assets/reading-list/react_17.0.2.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/style.css b/src/Playwright.Tests/assets/reading-list/style.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/style.css rename to src/Playwright.Tests/assets/reading-list/style.css diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/vue2.html b/src/Playwright.Tests/assets/reading-list/vue2.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/vue2.html rename to src/Playwright.Tests/assets/reading-list/vue2.html diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/vue3.html b/src/Playwright.Tests/assets/reading-list/vue3.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/vue3.html rename to src/Playwright.Tests/assets/reading-list/vue3.html diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/vue_2.6.14.js b/src/Playwright.Tests/assets/reading-list/vue_2.6.14.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/vue_2.6.14.js rename to src/Playwright.Tests/assets/reading-list/vue_2.6.14.js diff --git a/src/Playwright.Tests.TestServer/assets/reading-list/vue_3.1.5.js b/src/Playwright.Tests/assets/reading-list/vue_3.1.5.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/reading-list/vue_3.1.5.js rename to src/Playwright.Tests/assets/reading-list/vue_3.1.5.js diff --git a/src/Playwright.Tests.TestServer/assets/redirectloop1.html b/src/Playwright.Tests/assets/redirectloop1.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/redirectloop1.html rename to src/Playwright.Tests/assets/redirectloop1.html diff --git a/src/Playwright.Tests.TestServer/assets/redirectloop2.html b/src/Playwright.Tests/assets/redirectloop2.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/redirectloop2.html rename to src/Playwright.Tests/assets/redirectloop2.html diff --git a/src/Playwright.Tests.TestServer/assets/resetcss.html b/src/Playwright.Tests/assets/resetcss.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/resetcss.html rename to src/Playwright.Tests/assets/resetcss.html diff --git a/src/Playwright.Tests.TestServer/assets/rotate-z.html b/src/Playwright.Tests/assets/rotate-z.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/rotate-z.html rename to src/Playwright.Tests/assets/rotate-z.html diff --git a/src/Playwright.Tests.TestServer/assets/screenshots/canvas.html b/src/Playwright.Tests/assets/screenshots/canvas.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/screenshots/canvas.html rename to src/Playwright.Tests/assets/screenshots/canvas.html diff --git a/src/Playwright.Tests.TestServer/assets/screenshots/controls.html b/src/Playwright.Tests/assets/screenshots/controls.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/screenshots/controls.html rename to src/Playwright.Tests/assets/screenshots/controls.html diff --git a/src/Playwright.Tests.TestServer/assets/screenshots/translateZ.html b/src/Playwright.Tests/assets/screenshots/translateZ.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/screenshots/translateZ.html rename to src/Playwright.Tests/assets/screenshots/translateZ.html diff --git a/src/Playwright.Tests.TestServer/assets/screenshots/webgl.html b/src/Playwright.Tests/assets/screenshots/webgl.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/screenshots/webgl.html rename to src/Playwright.Tests/assets/screenshots/webgl.html diff --git a/src/Playwright.Tests.TestServer/assets/sectionselectorengine.js b/src/Playwright.Tests/assets/sectionselectorengine.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/sectionselectorengine.js rename to src/Playwright.Tests/assets/sectionselectorengine.js diff --git a/src/Playwright.Tests.TestServer/assets/self-request.html b/src/Playwright.Tests/assets/self-request.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/self-request.html rename to src/Playwright.Tests/assets/self-request.html diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/empty/sw.html b/src/Playwright.Tests/assets/serviceworkers/empty/sw.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/empty/sw.html rename to src/Playwright.Tests/assets/serviceworkers/empty/sw.html diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/empty/sw.js b/src/Playwright.Tests/assets/serviceworkers/empty/sw.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/empty/sw.js rename to src/Playwright.Tests/assets/serviceworkers/empty/sw.js diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/style.css b/src/Playwright.Tests/assets/serviceworkers/fetch/style.css similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/style.css rename to src/Playwright.Tests/assets/serviceworkers/fetch/style.css diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/sw.html b/src/Playwright.Tests/assets/serviceworkers/fetch/sw.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/sw.html rename to src/Playwright.Tests/assets/serviceworkers/fetch/sw.html diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/sw.js b/src/Playwright.Tests/assets/serviceworkers/fetch/sw.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/fetch/sw.js rename to src/Playwright.Tests/assets/serviceworkers/fetch/sw.js diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/fetchdummy/sw.html b/src/Playwright.Tests/assets/serviceworkers/fetchdummy/sw.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/fetchdummy/sw.html rename to src/Playwright.Tests/assets/serviceworkers/fetchdummy/sw.html diff --git a/src/Playwright.Tests.TestServer/assets/serviceworkers/fetchdummy/sw.js b/src/Playwright.Tests/assets/serviceworkers/fetchdummy/sw.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/serviceworkers/fetchdummy/sw.js rename to src/Playwright.Tests/assets/serviceworkers/fetchdummy/sw.js diff --git a/src/Playwright.Tests.TestServer/assets/shadow-dom-link.html b/src/Playwright.Tests/assets/shadow-dom-link.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/shadow-dom-link.html rename to src/Playwright.Tests/assets/shadow-dom-link.html diff --git a/src/Playwright.Tests.TestServer/assets/shadow.html b/src/Playwright.Tests/assets/shadow.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/shadow.html rename to src/Playwright.Tests/assets/shadow.html diff --git a/src/Playwright.Tests.TestServer/assets/simple-extension/content-script.js b/src/Playwright.Tests/assets/simple-extension/content-script.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/simple-extension/content-script.js rename to src/Playwright.Tests/assets/simple-extension/content-script.js diff --git a/src/Playwright.Tests.TestServer/assets/simple-extension/index.js b/src/Playwright.Tests/assets/simple-extension/index.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/simple-extension/index.js rename to src/Playwright.Tests/assets/simple-extension/index.js diff --git a/src/Playwright.Tests.TestServer/assets/simple-extension/manifest.json b/src/Playwright.Tests/assets/simple-extension/manifest.json similarity index 100% rename from src/Playwright.Tests.TestServer/assets/simple-extension/manifest.json rename to src/Playwright.Tests/assets/simple-extension/manifest.json diff --git a/src/Playwright.Tests.TestServer/assets/simple.json b/src/Playwright.Tests/assets/simple.json similarity index 100% rename from src/Playwright.Tests.TestServer/assets/simple.json rename to src/Playwright.Tests/assets/simple.json diff --git a/src/Playwright.Tests.TestServer/assets/simplezip.json b/src/Playwright.Tests/assets/simplezip.json similarity index 100% rename from src/Playwright.Tests.TestServer/assets/simplezip.json rename to src/Playwright.Tests/assets/simplezip.json diff --git a/src/Playwright.Tests.TestServer/assets/tamperable.html b/src/Playwright.Tests/assets/tamperable.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/tamperable.html rename to src/Playwright.Tests/assets/tamperable.html diff --git a/src/Playwright.Tests.TestServer/assets/title.html b/src/Playwright.Tests/assets/title.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/title.html rename to src/Playwright.Tests/assets/title.html diff --git a/src/Playwright.Tests.TestServer/assets/video.html b/src/Playwright.Tests/assets/video.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/video.html rename to src/Playwright.Tests/assets/video.html diff --git a/src/Playwright.Tests.TestServer/assets/video_mp4.html b/src/Playwright.Tests/assets/video_mp4.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/video_mp4.html rename to src/Playwright.Tests/assets/video_mp4.html diff --git a/src/Playwright.Tests.TestServer/assets/wasm/table2.html b/src/Playwright.Tests/assets/wasm/table2.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/wasm/table2.html rename to src/Playwright.Tests/assets/wasm/table2.html diff --git a/src/Playwright.Tests.TestServer/assets/wasm/table2.wasm b/src/Playwright.Tests/assets/wasm/table2.wasm similarity index 100% rename from src/Playwright.Tests.TestServer/assets/wasm/table2.wasm rename to src/Playwright.Tests/assets/wasm/table2.wasm diff --git a/src/Playwright.Tests.TestServer/assets/window-stop.html b/src/Playwright.Tests/assets/window-stop.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/window-stop.html rename to src/Playwright.Tests/assets/window-stop.html diff --git a/src/Playwright.Tests.TestServer/assets/worker/import-me.js b/src/Playwright.Tests/assets/worker/import-me.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/worker/import-me.js rename to src/Playwright.Tests/assets/worker/import-me.js diff --git a/src/Playwright.Tests.TestServer/assets/worker/worker-http-import.html b/src/Playwright.Tests/assets/worker/worker-http-import.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/worker/worker-http-import.html rename to src/Playwright.Tests/assets/worker/worker-http-import.html diff --git a/src/Playwright.Tests.TestServer/assets/worker/worker-http-import.js b/src/Playwright.Tests/assets/worker/worker-http-import.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/worker/worker-http-import.js rename to src/Playwright.Tests/assets/worker/worker-http-import.js diff --git a/src/Playwright.Tests.TestServer/assets/worker/worker.html b/src/Playwright.Tests/assets/worker/worker.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/worker/worker.html rename to src/Playwright.Tests/assets/worker/worker.html diff --git a/src/Playwright.Tests.TestServer/assets/worker/worker.js b/src/Playwright.Tests/assets/worker/worker.js similarity index 100% rename from src/Playwright.Tests.TestServer/assets/worker/worker.js rename to src/Playwright.Tests/assets/worker/worker.js diff --git a/src/Playwright.Tests.TestServer/assets/wrappedlink.html b/src/Playwright.Tests/assets/wrappedlink.html similarity index 100% rename from src/Playwright.Tests.TestServer/assets/wrappedlink.html rename to src/Playwright.Tests/assets/wrappedlink.html diff --git a/src/Playwright.sln b/src/Playwright.sln index f652dc5f2e..d243a2e140 100644 --- a/src/Playwright.sln +++ b/src/Playwright.sln @@ -1,9 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31516.353 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestTools", "TestTools", "{D250D790-5A30-4C38-8F60-50FA96DB4E67}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5F0EC30F-2600-4399-9925-A16B049B9311}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -24,18 +22,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playwright.Tooling", "tools EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playwright.CLI", "Playwright.CLI\Playwright.CLI.csproj", "{735E5F83-813C-4F5C-BB69-D3F87B15CF39}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playwright.Tests.TestServer", "Playwright.Tests.TestServer\Playwright.Tests.TestServer.csproj", "{55165383-EBE7-462B-B154-738818787740}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playwright.NUnit", "Playwright.NUnit\Playwright.NUnit.csproj", "{3EC5B076-CEE4-41A4-AA8E-4FDFFD08D4E9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playwright.MSTest", "Playwright.MSTest\Playwright.MSTest.csproj", "{62443703-36D1-43C9-B245-9E494FC5E50D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.TestingHarnessTest", "Playwright.TestingHarnessTest\Playwright.TestingHarnessTest.csproj", "{AE6072B5-4235-499F-8B0E-B8BCFC125CF5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.TestAdapter", "Playwright.TestAdapter\Playwright.TestAdapter.csproj", "{61837C33-9182-4FBF-86F4-BDB757D1C023}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.Examples", "Playwright.Examples\Playwright.Examples.csproj", "{A7BFC553-1AFF-490B-86E2-09DBF24BDA69}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.TestingHarnessTest", "Playwright.TestingHarnessTest\Playwright.TestingHarnessTest.csproj", "{27D8C307-0B8D-456D-A76F-86F410A3684A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -58,10 +54,6 @@ Global {735E5F83-813C-4F5C-BB69-D3F87B15CF39}.Debug|Any CPU.Build.0 = Debug|Any CPU {735E5F83-813C-4F5C-BB69-D3F87B15CF39}.Release|Any CPU.ActiveCfg = Release|Any CPU {735E5F83-813C-4F5C-BB69-D3F87B15CF39}.Release|Any CPU.Build.0 = Release|Any CPU - {55165383-EBE7-462B-B154-738818787740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55165383-EBE7-462B-B154-738818787740}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55165383-EBE7-462B-B154-738818787740}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55165383-EBE7-462B-B154-738818787740}.Release|Any CPU.Build.0 = Release|Any CPU {3EC5B076-CEE4-41A4-AA8E-4FDFFD08D4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EC5B076-CEE4-41A4-AA8E-4FDFFD08D4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EC5B076-CEE4-41A4-AA8E-4FDFFD08D4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -70,10 +62,6 @@ Global {62443703-36D1-43C9-B245-9E494FC5E50D}.Debug|Any CPU.Build.0 = Debug|Any CPU {62443703-36D1-43C9-B245-9E494FC5E50D}.Release|Any CPU.ActiveCfg = Release|Any CPU {62443703-36D1-43C9-B245-9E494FC5E50D}.Release|Any CPU.Build.0 = Release|Any CPU - {AE6072B5-4235-499F-8B0E-B8BCFC125CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE6072B5-4235-499F-8B0E-B8BCFC125CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE6072B5-4235-499F-8B0E-B8BCFC125CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE6072B5-4235-499F-8B0E-B8BCFC125CF5}.Release|Any CPU.Build.0 = Release|Any CPU {61837C33-9182-4FBF-86F4-BDB757D1C023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61837C33-9182-4FBF-86F4-BDB757D1C023}.Debug|Any CPU.Build.0 = Debug|Any CPU {61837C33-9182-4FBF-86F4-BDB757D1C023}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,6 +70,10 @@ Global {A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Release|Any CPU.Build.0 = Release|Any CPU + {27D8C307-0B8D-456D-A76F-86F410A3684A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27D8C307-0B8D-456D-A76F-86F410A3684A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27D8C307-0B8D-456D-A76F-86F410A3684A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27D8C307-0B8D-456D-A76F-86F410A3684A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -89,9 +81,8 @@ Global GlobalSection(NestedProjects) = preSolution {61C89FA2-645D-4D0E-9A20-06ABE32054CF} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476} {735E5F83-813C-4F5C-BB69-D3F87B15CF39} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476} - {55165383-EBE7-462B-B154-738818787740} = {D250D790-5A30-4C38-8F60-50FA96DB4E67} {A7BFC553-1AFF-490B-86E2-09DBF24BDA69} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476} - {AE6072B5-4235-499F-8B0E-B8BCFC125CF5} = {D250D790-5A30-4C38-8F60-50FA96DB4E67} + {27D8C307-0B8D-456D-A76F-86F410A3684A} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8D6EDE73-B005-4ABC-BCF8-BB3C154497EC}