Skip to content

Commit f644d10

Browse files
hlauerikssonhlaueriksson
authored
Merge pull request #23 from hlaueriksson/bump
Bump
2 parents ed5c812 + 90450ba commit f644d10

File tree

43 files changed

+491
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+491
-540
lines changed

‎Analyzers.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</AdditionalFiles>
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
15+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
19+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
23+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>

‎PuppeteerSharp.Contrib.Extensions.md

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,9 @@ Evaluation:
6060
- `IsDisabledAsync`
6161
- `IsEmptyAsync`
6262
- `IsEnabledAsync`
63-
- `IsHiddenAsync`
6463
- `IsReadOnlyAsync`
6564
- `IsRequiredAsync`
6665
- `IsSelectedAsync`
67-
- `IsVisibleAsync`
6866

6967
Query:
7068

@@ -120,16 +118,16 @@ namespace PuppeteerSharp.Contrib.Sample
120118
var html = await Page.QuerySelectorAsync("html");
121119

122120
var div = await Page.QuerySelectorWithContentAsync("div", "Ba.");
123-
Assert.AreEqual("bar", await div.IdAsync());
121+
Assert.That(await div.IdAsync(), Is.EqualTo("bar"));
124122

125123
div = await html.QuerySelectorWithContentAsync("div", "Ba.");
126-
Assert.AreEqual("bar", await div.IdAsync());
124+
Assert.That(await div.IdAsync(), Is.EqualTo("bar"));
127125

128126
var divs = await Page.QuerySelectorAllWithContentAsync("div", "Ba.");
129-
Assert.AreEqual(new[] { "bar", "baz" }, await Task.WhenAll(divs.Select(x => x.IdAsync())));
127+
Assert.That(await Task.WhenAll(divs.Select(x => x.IdAsync())), Is.EqualTo(new[] { "bar", "baz" }));
130128

131129
divs = await html.QuerySelectorAllWithContentAsync("div", "Ba.");
132-
Assert.AreEqual(new[] { "bar", "baz" }, await Task.WhenAll(divs.Select(x => x.IdAsync())));
130+
Assert.That(await Task.WhenAll(divs.Select(x => x.IdAsync())), Is.EqualTo(new[] { "bar", "baz" }));
133131
}
134132

135133
[Test]
@@ -147,25 +145,25 @@ namespace PuppeteerSharp.Contrib.Sample
147145
</html>");
148146

149147
var form = await Page.QuerySelectorAsync("form");
150-
Assert.AreEqual("post", await form.GetAttributeAsync("method"));
148+
Assert.That(await form.GetAttributeAsync("method"), Is.EqualTo("post"));
151149

152150
var input = await Page.QuerySelectorAsync("#name");
153-
Assert.True(await input.HasAttributeAsync("required"));
151+
Assert.That(await input.HasAttributeAsync("required"));
154152

155153
var link = await Page.QuerySelectorAsync("a");
156-
Assert.AreEqual("/unsubscribe/", await link.HrefAsync());
154+
Assert.That(await link.HrefAsync(), Is.EqualTo("/unsubscribe/"));
157155

158156
input = await Page.QuerySelectorAsync("input[type=email]");
159-
Assert.AreEqual("email", await input.IdAsync());
157+
Assert.That(await input.IdAsync(), Is.EqualTo("email"));
160158

161159
input = await Page.QuerySelectorAsync("#email");
162-
Assert.AreEqual("email", await input.NameAsync());
160+
Assert.That(await input.NameAsync(), Is.EqualTo("email"));
163161

164162
var img = await Page.QuerySelectorAsync("img");
165-
Assert.AreEqual("unsubscribe.png", await img.SrcAsync());
163+
Assert.That(await img.SrcAsync(), Is.EqualTo("unsubscribe.png"));
166164

167165
input = await Page.QuerySelectorAsync("input[type=submit]");
168-
Assert.AreEqual("Subscribe!", await input.ValueAsync());
166+
Assert.That(await input.ValueAsync(), Is.EqualTo("Subscribe!"));
169167
}
170168

171169
[Test]
@@ -174,9 +172,9 @@ namespace PuppeteerSharp.Contrib.Sample
174172
await Page.SetContentAsync("<div class='foo bar' />");
175173

176174
var div = await Page.QuerySelectorAsync("div");
177-
Assert.AreEqual("foo bar", await div.ClassNameAsync());
178-
Assert.AreEqual(new[] { "foo", "bar" }, await div.ClassListAsync());
179-
Assert.True(await div.HasClassAsync("bar"));
175+
Assert.That(await div.ClassNameAsync(), Is.EqualTo("foo bar"));
176+
Assert.That(await div.ClassListAsync(), Is.EqualTo(new[] { "foo", "bar" }));
177+
Assert.That(await div.HasClassAsync("bar"));
180178
}
181179

182180
[Test]
@@ -192,24 +190,22 @@ namespace PuppeteerSharp.Contrib.Sample
192190
");
193191

194192
var html = await Page.QuerySelectorAsync("html");
195-
Assert.True(await html.HasContentAsync("Foo"));
193+
Assert.That(await html.HasContentAsync("Foo"));
196194

197195
var div = await Page.QuerySelectorAsync("div");
198-
Assert.AreEqual("\n Foo\n <span>Bar</span>\n ", await div.InnerHtmlAsync());
199-
Assert.AreEqual("<div>\n Foo\n <span>Bar</span>\n </div>", await div.OuterHtmlAsync());
200-
Assert.AreEqual("Foo Bar", await div.InnerTextAsync());
201-
Assert.AreEqual("\n Foo\n Bar\n ", await div.TextContentAsync());
196+
Assert.That(await div.InnerHtmlAsync(), Is.EqualTo("\n Foo\n <span>Bar</span>\n "));
197+
Assert.That(await div.OuterHtmlAsync(), Is.EqualTo("<div>\n Foo\n <span>Bar</span>\n </div>"));
198+
Assert.That(await div.InnerTextAsync(), Is.EqualTo("Foo Bar"));
199+
Assert.That(await div.TextContentAsync(), Is.EqualTo("\n Foo\n Bar\n "));
202200
}
203201

204202
[Test]
205-
public async Task Visibility()
203+
public async Task Existentiality()
206204
{
207205
await Page.SetContentAsync("<div>Foo</div>");
208206

209207
var div = await Page.QuerySelectorAsync("div");
210-
Assert.True(div.Exists());
211-
Assert.False(await div.IsHiddenAsync());
212-
Assert.True(await div.IsVisibleAsync());
208+
Assert.That(div.Exists());
213209
}
214210

215211
[Test]
@@ -228,19 +224,19 @@ namespace PuppeteerSharp.Contrib.Sample
228224
");
229225

230226
var input = await Page.QuerySelectorAsync("input[type=text]");
231-
Assert.True(await input.HasFocusAsync());
232-
Assert.True(await input.IsRequiredAsync());
227+
Assert.That(await input.HasFocusAsync());
228+
Assert.That(await input.IsRequiredAsync());
233229

234230
input = await Page.QuerySelectorAsync("input[type=radio]");
235-
Assert.False(await input.IsDisabledAsync());
236-
Assert.True(await input.IsEnabledAsync());
237-
Assert.True(await input.IsReadOnlyAsync());
231+
Assert.That(await input.IsDisabledAsync(), Is.False);
232+
Assert.That(await input.IsEnabledAsync());
233+
Assert.That(await input.IsReadOnlyAsync());
238234

239235
input = await Page.QuerySelectorAsync("input[type=checkbox]");
240-
Assert.True(await input.IsCheckedAsync());
236+
Assert.That(await input.IsCheckedAsync());
241237

242238
input = await Page.QuerySelectorAsync("#foo");
243-
Assert.True(await input.IsSelectedAsync());
239+
Assert.That(await input.IsSelectedAsync());
244240
}
245241
}
246242
}

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ namespace PuppeteerSharp.Contrib.Sample
126126
await page.WaitForSelectorAsync("[data-testid=\"results-list\"]");
127127

128128
var repositories = await page.QuerySelectorAllAsync("[data-testid=\"results-list\"] > div");
129-
Assert.IsNotEmpty(repositories);
129+
Assert.That(repositories, Is.Not.Empty);
130130
var repository = repositories.First();
131131
await repository.ShouldHaveContentAsync("hardkoded/puppeteer-sharp");
132132
var text = await repository.QuerySelectorAsync("h3 + div");
@@ -137,7 +137,7 @@ namespace PuppeteerSharp.Contrib.Sample
137137

138138
heading = await page.QuerySelectorAsync("article > h1");
139139
await heading.ShouldHaveContentAsync("Puppeteer Sharp");
140-
Assert.AreEqual("https://github.com/hardkoded/puppeteer-sharp", page.Url);
140+
Assert.That(page.Url, Is.EqualTo("https://github.com/hardkoded/puppeteer-sharp"));
141141
}
142142

143143
[Test]
@@ -152,7 +152,7 @@ namespace PuppeteerSharp.Contrib.Sample
152152

153153
var status = await page.QuerySelectorAsync(".checks-list-item-icon svg");
154154
var label = await status.GetAttributeAsync("aria-label");
155-
Assert.AreEqual("completed successfully", label);
155+
Assert.That(label, Is.EqualTo("completed successfully"));
156156
}
157157

158158
[Test]
@@ -166,7 +166,7 @@ namespace PuppeteerSharp.Contrib.Sample
166166
await page.GoToAsync("https://github.com/puppeteer/puppeteer");
167167
var puppeteerVersion = await GetLatestReleaseVersion();
168168

169-
Assert.AreEqual(puppeteerVersion, puppeteerSharpVersion);
169+
Assert.That(puppeteerSharpVersion, Is.EqualTo(puppeteerVersion));
170170

171171
async Task<string> GetLatestReleaseVersion()
172172
{
@@ -322,7 +322,7 @@ namespace PuppeteerSharp.Contrib.Sample
322322

323323
var searchPage = await startPage.SearchAsync("Puppeteer Sharp");
324324
var repositories = await searchPage.RepoListItems;
325-
Assert.IsNotEmpty(repositories);
325+
Assert.That(repositories, Is.Not.Empty);
326326
var repository = repositories.First();
327327
var text = await repository.Text;
328328
await text.ShouldHaveContentAsync("Headless Chrome .NET API");
@@ -332,7 +332,7 @@ namespace PuppeteerSharp.Contrib.Sample
332332
var repoPage = await searchPage.GotoAsync(repository);
333333
heading = await repoPage.Heading;
334334
await heading.ShouldHaveContentAsync("Puppeteer Sharp");
335-
Assert.AreEqual("https://github.com/hardkoded/puppeteer-sharp", repoPage.Page.Url);
335+
Assert.That(repoPage.Page.Url, Is.EqualTo("https://github.com/hardkoded/puppeteer-sharp"));
336336
}
337337

338338
[Test]
@@ -344,7 +344,7 @@ namespace PuppeteerSharp.Contrib.Sample
344344

345345
var actionsPage = await repoPage.GotoActionsAsync();
346346
var status = await actionsPage.GetLatestWorkflowRunStatusAsync();
347-
Assert.AreEqual("completed successfully", status);
347+
Assert.That(status, Is.EqualTo("completed successfully"));
348348
}
349349

350350
[Test]
@@ -358,7 +358,7 @@ namespace PuppeteerSharp.Contrib.Sample
358358
repoPage = await page.GoToAsync<GitHubRepoPage>("https://github.com/hardkoded/puppeteer-sharp");
359359
var puppeteerSharpVersion = await repoPage.GetLatestReleaseVersionAsync();
360360

361-
Assert.AreEqual(puppeteerVersion, puppeteerSharpVersion);
361+
Assert.That(puppeteerSharpVersion, Is.EqualTo(puppeteerVersion));
362362
}
363363
}
364364
}

‎samples/PuppeteerSharp.Contrib.Sample.MSTest/PuppeteerSharp.Contrib.Sample.MSTest.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
13-
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
13+
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
1414
<PackageReference Include="PuppeteerSharp.Contrib.Should" Version="6.0.0" />
1515
</ItemGroup>
1616

‎samples/PuppeteerSharp.Contrib.Sample.Machine.Specifications/PuppeteerSharp.Contrib.Sample.Machine.Specifications.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Machine.Specifications" Version="1.1.1" />
11+
<PackageReference Include="Machine.Specifications" Version="1.1.2" />
1212
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.2" />
1313
<PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1515
<PackageReference Include="PuppeteerSharp.Contrib.Should" Version="6.0.0" />
16+
<!-- Vulnerabilities -->
17+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
18+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
1619
</ItemGroup>
1720

1821
</Project>

‎samples/PuppeteerSharp.Contrib.Sample.NUnit/Examples.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,18 @@ public async Task query()
221221

222222
var element = await page.QuerySelectorAsync("div#readme");
223223
var elements = await page.QuerySelectorAllAsync("div");
224-
Assert.IsNotNull(element);
225-
Assert.IsNotEmpty(elements);
224+
Assert.That(element, Is.Not.Null);
225+
Assert.That(elements, Is.Not.Empty);
226226

227227
var missingElement = await page.QuerySelectorAsync("div#missing");
228228
var missingElements = await page.QuerySelectorAllAsync("div.missing");
229-
Assert.IsNull(missingElement);
230-
Assert.IsEmpty(missingElements);
229+
Assert.That(missingElement, Is.Null);
230+
Assert.That(missingElements, Is.Empty);
231231

232232
var elementInElement = await element.QuerySelectorAsync("h1");
233233
var elementsInElement = await element.QuerySelectorAllAsync("h1");
234-
Assert.IsNotNull(elementInElement);
235-
Assert.IsNotEmpty(elementsInElement);
234+
Assert.That(elementInElement, Is.Not.Null);
235+
Assert.That(elementsInElement, Is.Not.Empty);
236236

237237
// other
238238
var handle = await page.QuerySelectorAllHandleAsync("div#readme");
@@ -250,10 +250,10 @@ public async Task evaluate()
250250
var innerText = await page.EvaluateExpressionAsync<string>($"document.querySelector({"'#repository-container-header strong a'"}).innerText");
251251
var url = await page.EvaluateExpressionAsync<string>($"document.querySelector({"'#repository-container-header strong a'"}).getAttribute('href')");
252252
var hasContent = await page.EvaluateExpressionAsync<bool>($"document.querySelector({"'#repository-container-header strong a'"}).textContent.includes({"'puppeteer-sharp'"})");
253-
Assert.AreEqual("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>", outerHtml);
254-
Assert.AreEqual("puppeteer-sharp", innerText);
255-
Assert.AreEqual("/hardkoded/puppeteer-sharp", url);
256-
Assert.IsTrue(hasContent);
253+
Assert.That(outerHtml, Is.EqualTo("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>"));
254+
Assert.That(innerText, Is.EqualTo("puppeteer-sharp"));
255+
Assert.That(url, Is.EqualTo("/hardkoded/puppeteer-sharp"));
256+
Assert.That(hasContent);
257257

258258
await page.EvaluateExpressionHandleAsync("document.body");
259259
await page.EvaluateExpressionOnNewDocumentAsync("document.body");
@@ -266,28 +266,28 @@ public async Task evaluate()
266266
innerText = await page.EvaluateFunctionAsync<string>("e => e.innerText", element);
267267
url = await page.EvaluateFunctionAsync<string>("e => e.getAttribute('href')", element);
268268
hasContent = await page.EvaluateFunctionAsync<bool>("(e, value) => e.textContent.includes(value)", element, "puppeteer-sharp");
269-
Assert.AreEqual("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>", outerHtml);
270-
Assert.AreEqual("puppeteer-sharp", innerText);
271-
Assert.AreEqual("/hardkoded/puppeteer-sharp", url);
272-
Assert.IsTrue(hasContent);
269+
Assert.That(outerHtml, Is.EqualTo("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>"));
270+
Assert.That(innerText, Is.EqualTo("puppeteer-sharp"));
271+
Assert.That(url, Is.EqualTo("/hardkoded/puppeteer-sharp"));
272+
Assert.That(hasContent);
273273

274274
outerHtml = await element.EvaluateFunctionAsync<string>("e => e.outerHTML");
275275
innerText = await element.EvaluateFunctionAsync<string>("e => e.innerText");
276276
url = await element.EvaluateFunctionAsync<string>("e => e.getAttribute('href')");
277277
hasContent = await element.EvaluateFunctionAsync<bool>("(e, value) => e.textContent.includes(value)", "puppeteer-sharp");
278-
Assert.AreEqual("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>", outerHtml);
279-
Assert.AreEqual("puppeteer-sharp", innerText);
280-
Assert.AreEqual("/hardkoded/puppeteer-sharp", url);
281-
Assert.IsTrue(hasContent);
278+
Assert.That(outerHtml, Is.EqualTo("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>"));
279+
Assert.That(innerText, Is.EqualTo("puppeteer-sharp"));
280+
Assert.That(url, Is.EqualTo("/hardkoded/puppeteer-sharp"));
281+
Assert.That(hasContent);
282282

283283
outerHtml = await (await element.GetPropertyAsync("outerHTML")).JsonValueAsync<string>();
284284
innerText = await (await element.GetPropertyAsync("innerText")).JsonValueAsync<string>();
285285
url = await (await element.GetPropertyAsync("href")).JsonValueAsync<string>();
286286
hasContent = await (await element.GetPropertyAsync("textContent")).EvaluateFunctionAsync<bool>("(p, value) => p.includes(value)", "puppeteer-sharp");
287-
Assert.AreEqual("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>", outerHtml);
288-
Assert.AreEqual("puppeteer-sharp", innerText);
289-
Assert.AreEqual("https://github.com/hardkoded/puppeteer-sharp", url);
290-
Assert.IsTrue(hasContent);
287+
Assert.That(outerHtml, Is.EqualTo("<a data-pjax=\"#repo-content-pjax-container\" data-turbo-frame=\"repo-content-turbo-frame\" href=\"/hardkoded/puppeteer-sharp\">puppeteer-sharp</a>"));
288+
Assert.That(innerText, Is.EqualTo("puppeteer-sharp"));
289+
Assert.That(url, Is.EqualTo("https://github.com/hardkoded/puppeteer-sharp"));
290+
Assert.That(hasContent);
291291

292292
await element.EvaluateFunctionHandleAsync("() => 1 + 1 === 2");
293293
}
@@ -298,17 +298,17 @@ public async Task is_()
298298
var page = await Page();
299299

300300
await page.GoToAsync("https://github.com/hardkoded/puppeteer-sharp");
301-
Assert.IsFalse(page.IsClosed);
301+
Assert.That(page.IsClosed, Is.False);
302302
//page.IsDragInterceptionEnabled // Obsolete
303303

304304
var frame = page.MainFrame;
305-
Assert.IsFalse(frame.IsOopFrame);
305+
Assert.That(frame.IsOopFrame, Is.False);
306306

307307
var element = page.QuerySelectorAsync("#include_email");
308-
Assert.IsFalse(element.IsCompleted);
309-
Assert.IsFalse(element.IsCompletedSuccessfully);
310-
Assert.IsFalse(element.IsCanceled);
311-
Assert.IsFalse(element.IsFaulted);
308+
Assert.That(element.IsCompleted, Is.False);
309+
Assert.That(element.IsCompletedSuccessfully, Is.False);
310+
Assert.That(element.IsCanceled, Is.False);
311+
Assert.That(element.IsFaulted, Is.False);
312312
}
313313
}
314314
}

0 commit comments

Comments
 (0)