Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f66928b
Introduce protocol in launch options
kblok Apr 1, 2024
3f84a05
code style
kblok Apr 1, 2024
dc1a7a7
Merge branch 'master' into protocol-option
kblok Apr 1, 2024
4e23bac
Add protocol to browser class
kblok Apr 1, 2024
d0722c8
Merge branch 'protocol-option' of https://github.com/hardkoded/puppet…
kblok Apr 1, 2024
a24dba7
Merge branch 'master' into protocol-option
kblok Jun 3, 2024
664e364
small progress on browser launch
kblok Jun 6, 2024
e2fd92a
Some work using our own connection
kblok Jun 6, 2024
0b44e8c
Some good progress
kblok Jun 6, 2024
966fdc3
Merge remote-tracking branch 'origin/master' into protocol-using-webd…
kblok Jun 26, 2024
ba490de
more progress
kblok Jun 26, 2024
f7cfaac
Merge branch 'master' into protocol-using-webdriver-driver
kblok Jul 5, 2024
8b61c88
some progress
kblok Jul 11, 2024
6ae3e4e
some progress
kblok Jul 15, 2024
ebbccac
progress
kblok Jul 17, 2024
c992628
This builds
kblok Jul 17, 2024
ffb1461
Merge branch 'master' into protocol-using-webdriver-driver
kblok Jul 17, 2024
560ce2f
Use env for CDP runs
kblok Jul 17, 2024
c4edaa7
remove bidi project from solution
kblok Jul 17, 2024
79dc94a
Merge remote-tracking branch 'origin/master' into protocol-using-webd…
kblok Jul 17, 2024
722f30c
code style
kblok Jul 17, 2024
f105198
not a valid expectation
kblok Jul 17, 2024
91ca182
some tests to ignore
kblok Jul 17, 2024
68ff59b
change location of the line output expression
kblok Jul 17, 2024
6b3dd6f
run bidi only on firefox
kblok Jul 19, 2024
5a9415c
Firefox preferences change
kblok Jul 19, 2024
e4bedb2
Merge remote-tracking branch 'origin/master' into protocol-using-webd…
kblok Jul 22, 2024
a0a0948
Merge branch 'master' into protocol-using-webdriver-driver
kblok Jul 23, 2024
c4e41a1
Add missing argument
kblok Jul 23, 2024
da707c7
small change
kblok Jul 23, 2024
d451054
Merge remote-tracking branch 'origin/master' into protocol-using-webd…
kblok Aug 22, 2024
8b297d6
Merge branch 'master' into protocol-using-webdriver-driver
kblok Sep 6, 2024
019cc7b
Ignore some tests that are already ignored
kblok Sep 6, 2024
2f71503
small progress
kblok Sep 6, 2024
14ae610
Some progress
kblok Sep 12, 2024
bdf8641
some progress
kblok Sep 19, 2024
61f35ee
some more progress
kblok Oct 7, 2024
1d12a8a
Some progress
kblok Oct 15, 2024
b0ff570
Merge remote-tracking branch 'origin/master' into protocol-using-webd…
kblok Oct 18, 2024
5e3301a
first passing test
kblok Oct 25, 2024
496df6a
Use package
kblok Oct 28, 2024
51e63b0
Use envs in PuppeteerTestAttribute
kblok Oct 28, 2024
00b074e
Use latest firefox
kblok Oct 28, 2024
9f2daf3
remove warn
kblok Oct 28, 2024
39af673
Bump to latest webdriver bidi
kblok Oct 28, 2024
74a92a8
implement some tests ignore others
kblok Oct 28, 2024
489b4dc
Ignore more tests
kblok Oct 28, 2024
0280f8d
Ignore other tests
kblok Oct 28, 2024
c2a9fd9
more ignores
kblok Oct 28, 2024
dc8ca4f
Ignore another test
kblok Oct 28, 2024
3dec6d4
another one
kblok Oct 28, 2024
46fcf53
More ignore
kblok Oct 28, 2024
07802c3
Ignore SSL tests
kblok Oct 28, 2024
05951a2
Ignore another one
kblok Oct 28, 2024
c618372
ignore should navigate to about:blank
kblok Oct 29, 2024
7e84e87
Ignore should work with anchor navigation
kblok Oct 29, 2024
eca8a64
Dispose only if necesarilly
kblok Oct 29, 2024
fb769b2
Dispose only if necesarilly
kblok Oct 29, 2024
5b01048
Ignore prerender.spec
kblok Oct 29, 2024
4337a69
Ignore more tests
kblok Oct 29, 2024
f655b61
tag one more test correctly
kblok Oct 29, 2024
5750bc1
Merge branch 'v21' into protocol-using-webdriver-driver
kblok Oct 29, 2024
a8ba6c4
Remove firefox CDP from CI/CD
kblok Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:

jobs:
build:
name: build-${{ matrix.browser }}-${{ matrix.mode }}-${{ matrix.os }}
name: ${{ matrix.browser }}-${{ matrix.mode }}-${{ matrix.os }}-${{ matrix.protocol }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -28,33 +28,31 @@ jobs:
- os: ubuntu-latest
browser: CHROME
mode: headless
protocol: cdp
- os: ubuntu-latest
browser: CHROME
mode: headful
protocol: cdp
- os: ubuntu-latest
browser: CHROME
mode: headless-shell
- os: ubuntu-latest
browser: FIREFOX
mode: headless
- os: ubuntu-latest
browser: FIREFOX
mode: headful
protocol: cdp
- os: windows-latest
browser: CHROME
mode: headless
protocol: cdp
- os: windows-latest
browser: CHROME
mode: headful
protocol: cdp
- os: windows-latest
browser: CHROME
mode: headless-shell
- os: windows-latest
protocol: cdp
- os: ubuntu-latest
browser: FIREFOX
mode: headless
- os: windows-latest
browser: FIREFOX
mode: headful
protocol: webdriverbidi
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core
Expand Down Expand Up @@ -82,7 +80,7 @@ jobs:
New-SelfSignedCertificate -Subject "localhost" -FriendlyName "Puppeteer" -CertStoreLocation "cert:\CurrentUser\My"
Get-ChildItem -Path cert:\CurrentUSer\my | where { $_.friendlyname -eq "Puppeteer" } | Export-Certificate -FilePath $env:GITHUB_WORKSPACE\lib\PuppeteerSharp.TestServer\testCert.cer
- name: Check formatting
if: ${{ matrix.os == 'ubuntu-latest' && matrix.browser == 'CHROME' && matrix.mode == 'headless' }}
if: ${{ matrix.os == 'ubuntu-latest' && matrix.browser == 'CHROME' && matrix.mode == 'headless' && matrix.protocol == 'cdp' }}
run: dotnet format ./lib/PuppeteerSharp.sln --verify-no-changes --exclude-diagnostics CA1865
- name: Build
working-directory: lib
Expand All @@ -95,6 +93,7 @@ jobs:
env:
BROWSER: ${{ matrix.browser }}
HEADLESS_MODE: ${{ matrix.mode }}
PROTOCOL: ${{ matrix.protocol }}
run: |
Xvfb :1 -screen 5 1024x768x8 &
export DISPLAY=:1.5
Expand All @@ -105,6 +104,7 @@ jobs:
env:
BROWSER: ${{ matrix.browser }}
HEADLESS_MODE: ${{ matrix.mode }}
PROTOCOL: ${{ matrix.protocol }}
run: |
cd .\lib\PuppeteerSharp.Tests
dotnet test -s test.runsettings --blame-hang-timeout 300000
Expand Down
5 changes: 3 additions & 2 deletions lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ public class PuppeteerTestAttribute : NUnitAttribute, IApplyToTest
{
private static TestExpectation[] _localExpectations;
private static TestExpectation[] _upstreamExpectations;

public static readonly bool IsChrome = Environment.GetEnvironmentVariable("BROWSER") != "FIREFOX";
// TODO: Change implementation when we implement Webdriver Bidi
public static readonly bool IsCdp = true;
public static readonly bool IsCdp = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROTOCOL")) || Environment.GetEnvironmentVariable("PROTOCOL")!.Equals("cdp");

public static readonly HeadlessMode Headless =
string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HEADLESS_MODE")) ?
(System.Diagnostics.Debugger.IsAttached ? HeadlessMode.False : HeadlessMode.True) :
Expand Down
Loading
Loading