Skip to content

Commit 713b34d

Browse files
authored
Fix wrong test names and tooling (#1731)
1 parent fcb435f commit 713b34d

File tree

6 files changed

+66
-52
lines changed

6 files changed

+66
-52
lines changed

lib/PuppeteerSharp.Tests/NavigationTests/PageGoBackTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public PageGoBackTests(ITestOutputHelper output) : base(output)
1414
}
1515

1616
//TODO: This is working in puppeteer. I don't know why is hanging here.
17-
[PuppeteerTest("page.spec.ts", "Page.goBack", "should work")]
17+
[PuppeteerTest("navigation.spec.ts", "Page.goBack", "should work")]
1818
[SkipBrowserFact(skipFirefox: true)]
1919
public async Task ShouldWork()
2020
{
@@ -33,7 +33,7 @@ public async Task ShouldWork()
3333
Assert.Null(response);
3434
}
3535

36-
[PuppeteerTest("page.spec.ts", "Page.goBack", "should work with HistoryAPI")]
36+
[PuppeteerTest("navigation.spec.ts", "Page.goBack", "should work with HistoryAPI")]
3737
[SkipBrowserFact(skipFirefox: true)]
3838
public async Task ShouldWorkWithHistoryAPI()
3939
{

lib/PuppeteerSharp.Tests/NavigationTests/PageGotoTests.cs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ public PageGotoTests(ITestOutputHelper output) : base(output)
1919
{
2020
}
2121

22-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work")]
22+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work")]
2323
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
2424
public async Task ShouldWork()
2525
{
2626
await Page.GoToAsync(TestConstants.EmptyPage);
2727
Assert.Equal(TestConstants.EmptyPage, Page.Url);
2828
}
2929

30-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work with anchor navigation")]
30+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work with anchor navigation")]
3131
[SkipBrowserFact(skipFirefox: true)]
3232
public async Task ShouldWorkWithAnchorNavigation()
3333
{
@@ -39,7 +39,7 @@ public async Task ShouldWorkWithAnchorNavigation()
3939
Assert.Equal($"{TestConstants.EmptyPage}#bar", Page.Url);
4040
}
4141

42-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work with redirects")]
42+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work with redirects")]
4343
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
4444
public async Task ShouldWorkWithRedirects()
4545
{
@@ -50,23 +50,23 @@ public async Task ShouldWorkWithRedirects()
5050
await Page.GoToAsync(TestConstants.EmptyPage);
5151
}
5252

53-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to about:blank")]
53+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to about:blank")]
5454
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
5555
public async Task ShouldNavigateToAboutBlank()
5656
{
5757
var response = await Page.GoToAsync(TestConstants.AboutBlank);
5858
Assert.Null(response);
5959
}
6060

61-
[PuppeteerTest("page.spec.ts", "Page.goto", "should return response when page changes its URL after load")]
61+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should return response when page changes its URL after load")]
6262
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
6363
public async Task ShouldReturnResponseWhenPageChangesItsURLAfterLoad()
6464
{
6565
var response = await Page.GoToAsync(TestConstants.ServerUrl + "/historyapi.html");
6666
Assert.Equal(HttpStatusCode.OK, response.Status);
6767
}
6868

69-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work with subframes return 204")]
69+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work with subframes return 204")]
7070
[SkipBrowserFact(skipFirefox: true)]
7171
public async Task ShouldWorkWithSubframesReturn204()
7272
{
@@ -78,7 +78,7 @@ public async Task ShouldWorkWithSubframesReturn204()
7878
await Page.GoToAsync(TestConstants.ServerUrl + "/frames/one-frame.html");
7979
}
8080

81-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when server returns 204")]
81+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when server returns 204")]
8282
[SkipBrowserFact(skipFirefox: true)]
8383
public async Task ShouldFailWhenServerReturns204()
8484
{
@@ -100,7 +100,7 @@ public async Task ShouldFailWhenServerReturns204()
100100
}
101101
}
102102

103-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to empty page with domcontentloaded")]
103+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to empty page with domcontentloaded")]
104104
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
105105
public async Task ShouldNavigateToEmptyPageWithDOMContentLoaded()
106106
{
@@ -112,7 +112,7 @@ public async Task ShouldNavigateToEmptyPageWithDOMContentLoaded()
112112
Assert.Null(response.SecurityDetails);
113113
}
114114

115-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work when page calls history API in beforeunload")]
115+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work when page calls history API in beforeunload")]
116116
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
117117
public async Task ShouldWorkWhenPageCallsHistoryAPIInBeforeunload()
118118
{
@@ -125,23 +125,23 @@ await Page.EvaluateFunctionAsync(@"() =>
125125
Assert.Equal(HttpStatusCode.OK, response.Status);
126126
}
127127

128-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to empty page with networkidle0")]
128+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to empty page with networkidle0")]
129129
[SkipBrowserFact(skipFirefox: true)]
130130
public async Task ShouldNavigateToEmptyPageWithNetworkidle0()
131131
{
132132
var response = await Page.GoToAsync(TestConstants.EmptyPage, new NavigationOptions { WaitUntil = new[] { WaitUntilNavigation.Networkidle0 } });
133133
Assert.Equal(HttpStatusCode.OK, response.Status);
134134
}
135135

136-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to empty page with networkidle2")]
136+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to empty page with networkidle2")]
137137
[SkipBrowserFact(skipFirefox: true)]
138138
public async Task ShouldNavigateToEmptyPageWithNetworkidle2()
139139
{
140140
var response = await Page.GoToAsync(TestConstants.EmptyPage, new NavigationOptions { WaitUntil = new[] { WaitUntilNavigation.Networkidle2 } });
141141
Assert.Equal(HttpStatusCode.OK, response.Status);
142142
}
143143

144-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when navigating to bad url")]
144+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when navigating to bad url")]
145145
[SkipBrowserFact(skipFirefox: true)]
146146
public async Task ShouldFailWhenNavigatingToBadUrl()
147147
{
@@ -157,7 +157,7 @@ public async Task ShouldFailWhenNavigatingToBadUrl()
157157
}
158158
}
159159

160-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when navigating to bad SSL")]
160+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when navigating to bad SSL")]
161161
[SkipBrowserFact(skipFirefox: true)]
162162
public async Task ShouldFailWhenNavigatingToBadSSL()
163163
{
@@ -177,7 +177,7 @@ public async Task ShouldFailWhenNavigatingToBadSSL()
177177
}
178178
}
179179

180-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when navigating to bad SSL after redirects")]
180+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when navigating to bad SSL after redirects")]
181181
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
182182
public async Task ShouldFailWhenNavigatingToBadSSLAfterRedirects()
183183
{
@@ -193,7 +193,7 @@ public async Task ShouldFailWhenNavigatingToBadSSLAfterRedirects()
193193
}
194194
}
195195

196-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when main resources failed to load")]
196+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when main resources failed to load")]
197197
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
198198
public async Task ShouldFailWhenMainResourcesFailedToLoad()
199199
{
@@ -209,7 +209,7 @@ public async Task ShouldFailWhenMainResourcesFailedToLoad()
209209
}
210210
}
211211

212-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when exceeding maximum navigation timeout")]
212+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when exceeding maximum navigation timeout")]
213213
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
214214
public async Task ShouldFailWhenExceedingMaximumNavigationTimeout()
215215
{
@@ -220,7 +220,7 @@ public async Task ShouldFailWhenExceedingMaximumNavigationTimeout()
220220
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
221221
}
222222

223-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when exceeding default maximum navigation timeout")]
223+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when exceeding default maximum navigation timeout")]
224224
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
225225
public async Task ShouldFailWhenExceedingDefaultMaximumNavigationTimeout()
226226
{
@@ -231,7 +231,7 @@ public async Task ShouldFailWhenExceedingDefaultMaximumNavigationTimeout()
231231
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
232232
}
233233

234-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when exceeding default maximum timeout")]
234+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when exceeding default maximum timeout")]
235235
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
236236
public async Task ShouldFailWhenExceedingDefaultMaximumTimeout()
237237
{
@@ -242,7 +242,7 @@ public async Task ShouldFailWhenExceedingDefaultMaximumTimeout()
242242
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
243243
}
244244

245-
[PuppeteerTest("page.spec.ts", "Page.goto", "should prioritize default navigation timeout over default timeout")]
245+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should prioritize default navigation timeout over default timeout")]
246246
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
247247
public async Task ShouldPrioritizeDefaultNavigationTimeoutOverDefaultTimeout()
248248
{
@@ -254,7 +254,7 @@ public async Task ShouldPrioritizeDefaultNavigationTimeoutOverDefaultTimeout()
254254
Assert.Contains("Timeout of 1 ms exceeded", exception.Message);
255255
}
256256

257-
[PuppeteerTest("page.spec.ts", "Page.goto", "should disable timeout when its set to 0")]
257+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should disable timeout when its set to 0")]
258258
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
259259
public async Task ShouldDisableTimeoutWhenItsSetTo0()
260260
{
@@ -270,31 +270,31 @@ void OnLoad(object sender, EventArgs e)
270270
Assert.True(loaded);
271271
}
272272

273-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work when navigating to valid url")]
273+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work when navigating to valid url")]
274274
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
275275
public async Task ShouldWorkWhenNavigatingToValidUrl()
276276
{
277277
var response = await Page.GoToAsync(TestConstants.EmptyPage);
278278
Assert.Equal(HttpStatusCode.OK, response.Status);
279279
}
280280

281-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work when navigating to data url")]
281+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work when navigating to data url")]
282282
[SkipBrowserFact(skipFirefox: true)]
283283
public async Task ShouldWorkWhenNavigatingToDataUrl()
284284
{
285285
var response = await Page.GoToAsync("data:text/html,hello");
286286
Assert.Equal(HttpStatusCode.OK, response.Status);
287287
}
288288

289-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work when navigating to 404")]
289+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work when navigating to 404")]
290290
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
291291
public async Task ShouldWorkWhenNavigatingTo404()
292292
{
293293
var response = await Page.GoToAsync(TestConstants.ServerUrl + "/not-found");
294294
Assert.Equal(HttpStatusCode.NotFound, response.Status);
295295
}
296296

297-
[PuppeteerTest("page.spec.ts", "Page.goto", "should return last response in redirect chain")]
297+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should return last response in redirect chain")]
298298
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
299299
public async Task ShouldReturnLastResponseInRedirectChain()
300300
{
@@ -307,7 +307,7 @@ public async Task ShouldReturnLastResponseInRedirectChain()
307307
Assert.Equal(TestConstants.EmptyPage, response.Url);
308308
}
309309

310-
[PuppeteerTest("page.spec.ts", "Page.goto", "should wait for network idle to succeed navigation")]
310+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should wait for network idle to succeed navigation")]
311311
[SkipBrowserFact(skipFirefox: true)]
312312
public async Task ShouldWaitForNetworkIdleToSucceedNavigation()
313313
{
@@ -397,7 +397,7 @@ await Task.WhenAll(
397397
Assert.Equal(HttpStatusCode.OK, navigationResponse.Status);
398398
}
399399

400-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to dataURL and fire dataURL requests")]
400+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to dataURL and fire dataURL requests")]
401401
[SkipBrowserFact(skipFirefox: true)]
402402
public async Task ShouldNavigateToDataURLAndFireDataURLRequests()
403403
{
@@ -416,7 +416,7 @@ public async Task ShouldNavigateToDataURLAndFireDataURLRequests()
416416
Assert.Equal(dataUrl, requests[0].Url);
417417
}
418418

419-
[PuppeteerTest("page.spec.ts", "Page.goto", "should navigate to URL with hash and fire requests without hash")]
419+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should navigate to URL with hash and fire requests without hash")]
420420
[SkipBrowserFact(skipFirefox: true)]
421421
public async Task ShouldNavigateToURLWithHashAndFireRequestsWithoutHash()
422422
{
@@ -435,7 +435,7 @@ public async Task ShouldNavigateToURLWithHashAndFireRequestsWithoutHash()
435435
Assert.Equal(TestConstants.EmptyPage, requests[0].Url);
436436
}
437437

438-
[PuppeteerTest("page.spec.ts", "Page.goto", "should work with self requesting page")]
438+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should work with self requesting page")]
439439
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
440440
public async Task ShouldWorkWithSelfRequestingPage()
441441
{
@@ -444,7 +444,7 @@ public async Task ShouldWorkWithSelfRequestingPage()
444444
Assert.Contains("self-request.html", response.Url);
445445
}
446446

447-
[PuppeteerTest("page.spec.ts", "Page.goto", "should fail when navigating and show the url at the error message")]
447+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should fail when navigating and show the url at the error message")]
448448
[Fact(Timeout = TestConstants.DefaultTestTimeout)]
449449
public async Task ShouldFailWhenNavigatingAndShowTheUrlAtTheErrorMessage()
450450
{
@@ -454,7 +454,7 @@ public async Task ShouldFailWhenNavigatingAndShowTheUrlAtTheErrorMessage()
454454
Assert.Contains(url, exception.Url);
455455
}
456456

457-
[PuppeteerTest("page.spec.ts", "Page.goto", "should send referer")]
457+
[PuppeteerTest("navigation.spec.ts", "Page.goto", "should send referer")]
458458
[SkipBrowserFact(skipFirefox: true)]
459459
public async Task ShouldSendReferer()
460460
{

lib/PuppeteerSharp.Tests/NetworkTests/RequestRespondTests.cs renamed to lib/PuppeteerSharp.Tests/RequestInterceptionTests/RequestRespondTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Xunit;
88
using Xunit.Abstractions;
99

10-
namespace PuppeteerSharp.Tests.NetworkTests
10+
namespace PuppeteerSharp.Tests.RequestInterceptionTests
1111
{
1212
[Collection(TestConstants.TestFixtureCollectionName)]
1313
public class RequestRespondTests : PuppeteerPageBaseTest
@@ -16,7 +16,7 @@ public RequestRespondTests(ITestOutputHelper output) : base(output)
1616
{
1717
}
1818

19-
[PuppeteerTest("network.spec.ts", "Request.respond", "should work")]
19+
[PuppeteerTest("requestinterception.spec.ts", "Request.respond", "should work")]
2020
[SkipBrowserFact(skipFirefox: true)]
2121
public async Task ShouldWork()
2222
{
@@ -45,14 +45,14 @@ await e.Request.RespondAsync(new ResponseData
4545
/// I found that status 422 is not available in all .NET runtimes (see https://github.com/dotnet/core/blob/4c4642d548074b3fbfd425541a968aadd75fea99/release-notes/2.1/Preview/api-diff/preview2/2.1-preview2_System.Net.md)
4646
/// As the goal here is testing HTTP codes that are not in Chromium (see https://cs.chromium.org/chromium/src/net/http/http_status_code_list.h?sq=package:chromium&g=0) we will use code 426: Upgrade Required
4747
/// </summary>
48-
[PuppeteerTest("network.spec.ts", "Request.respond", "should work with status code 422")]
48+
[PuppeteerTest("requestinterception.spec.ts", "Request.respond", "should work with status code 422")]
4949
[SkipBrowserFact(skipFirefox: true)]
5050
public async Task ShouldWorkReturnStatusPhrases()
5151
{
5252
await Page.SetRequestInterceptionAsync(true);
5353
Page.Request += async (_, e) =>
5454
{
55-
await e.Request.RespondAsync(new ResponseData
55+
await e. Request.RespondAsync(new ResponseData
5656
{
5757
Status = HttpStatusCode.UpgradeRequired,
5858
Body = "Yo, page!"
@@ -65,7 +65,7 @@ await e.Request.RespondAsync(new ResponseData
6565
Assert.Equal("Yo, page!", await Page.EvaluateExpressionAsync<string>("document.body.textContent"));
6666
}
6767

68-
[PuppeteerTest("network.spec.ts", "Request.respond", "should redirect")]
68+
[PuppeteerTest("requestinterception.spec.ts", "Request.respond", "should redirect")]
6969
[SkipBrowserFact(skipFirefox: true)]
7070
public async Task ShouldRedirect()
7171
{
@@ -96,7 +96,7 @@ await e.Request.RespondAsync(new ResponseData
9696
Assert.Equal(TestConstants.EmptyPage, response.Url);
9797
}
9898

99-
[PuppeteerTest("network.spec.ts", "Request.respond", "should allow mocking binary responses")]
99+
[PuppeteerTest("requestinterception.spec.ts", "Request.respond", "should allow mocking binary responses")]
100100
[SkipBrowserFact(skipFirefox: true)]
101101
public async Task ShouldAllowMockingBinaryResponses()
102102
{
@@ -122,7 +122,7 @@ await Page.EvaluateFunctionAsync(@"PREFIX =>
122122
Assert.True(ScreenshotHelper.PixelMatch("mock-binary-response.png", await img.ScreenshotDataAsync()));
123123
}
124124

125-
[PuppeteerTest("network.spec.ts", "Request.respond", "should stringify intercepted request response headers")]
125+
[PuppeteerTest("requestinterception.spec.ts", "Request.respond", "should stringify intercepted request response headers")]
126126
[SkipBrowserFact(skipFirefox: true)]
127127
public async Task ShouldStringifyInterceptedRequestResponseHeaders()
128128
{

lib/PuppeteerSharp.Tests/TouchScreenTests/TouchScreenTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public TouchScreenTests(ITestOutputHelper output) : base(output)
1616
{
1717
}
1818

19-
[PuppeteerTest("touchescreen.spec.ts", "Touchscreen", "tap the button")]
19+
[PuppeteerTest("touchscreen.spec.ts", "Touchscreen", "tap the button")]
2020
[SkipBrowserFact(skipFirefox: true)]
2121
public async Task ShouldTapTheButton()
2222
{
@@ -26,7 +26,7 @@ public async Task ShouldTapTheButton()
2626
Assert.Equal("Clicked", await Page.EvaluateExpressionAsync<string>("result"));
2727
}
2828

29-
[PuppeteerTest("touchescreen.spec.ts", "Touchscreen", "should report touches")]
29+
[PuppeteerTest("touchscreen.spec.ts", "Touchscreen", "should report touches")]
3030
[SkipBrowserFact(skipFirefox: true)]
3131
public async Task ShouldReportTouches()
3232
{

0 commit comments

Comments
 (0)