From 48466072adce9e5966896c1b5336b72ebddffa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= Date: Sat, 15 Apr 2023 17:21:15 -0300 Subject: [PATCH] fix add script code --- lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs | 6 +++--- lib/PuppeteerSharp/Frame.cs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs b/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs index 09cce864b..4244853dc 100644 --- a/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs +++ b/lib/PuppeteerSharp.Tests/PageTests/AddStyleTagTests.cs @@ -40,9 +40,9 @@ public async Task ShouldWorkWithAUrl() public async Task ShouldThrowAnErrorIfLoadingFromUrlFail() { await Page.GoToAsync(TestConstants.EmptyPage); - var exception = await Assert.ThrowsAsync(() + var exception = await Assert.ThrowsAnyAsync(() => Page.AddStyleTagAsync(new AddTagOptions { Url = "/nonexistfile.js" })); - Assert.Equal("Loading style from /nonexistfile.js failed", exception.Message); + Assert.Contains("Could not load style", exception.Message); } [PuppeteerTest("page.spec.ts", "Page.addStyleTag", "should work with a path")] @@ -99,7 +99,7 @@ public async Task ShouldThrowWhenAddedWithContentToTheCSPPage() public async Task ShouldThrowWhenAddedWithURLToTheCSPPage() { await Page.GoToAsync(TestConstants.ServerUrl + "/csp.html"); - var exception = await Assert.ThrowsAsync( + var exception = await Assert.ThrowsAnyAsync( () => Page.AddStyleTagAsync(new AddTagOptions { Url = TestConstants.CrossProcessUrl + "/injectedstyle.css" diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs index 2487bfde5..27e2ba987 100644 --- a/lib/PuppeteerSharp/Frame.cs +++ b/lib/PuppeteerSharp/Frame.cs @@ -203,10 +203,10 @@ public async Task AddStyleTagAsync(AddTagOptions options) @"async (puppeteerUtil, url, id, type, content) => { const createDeferredPromise = puppeteerUtil.createDeferredPromise; const promise = createDeferredPromise(); - let element: HTMLStyleElement | HTMLLinkElement; + let element; if (!url) { element = document.createElement('style'); - element.appendChild(document.createTextNode(content!)); + element.appendChild(document.createTextNode(content)); } else { const link = document.createElement('link'); link.rel = 'stylesheet'; @@ -225,7 +225,7 @@ public async Task AddStyleTagAsync(AddTagOptions options) event => { promise.reject( new Error( - (event as ErrorEvent).message ?? 'Could not load style' + event.message ?? 'Could not load style' ) ); }, @@ -235,7 +235,7 @@ public async Task AddStyleTagAsync(AddTagOptions options) await promise; return element; }", - PuppeteerWorld.PuppeteerUtil, + await PuppeteerWorld.PuppeteerUtil.ConfigureAwait(false), options.Url, options.Id, options.Type, @@ -300,7 +300,7 @@ public async Task AddScriptTagAsync(AddTagOptions options) await promise; return script; }", - PuppeteerWorld.PuppeteerUtil, + await PuppeteerWorld.PuppeteerUtil.ConfigureAwait(false), options.Url, options.Id, options.Type,