diff --git a/shot_scraper/cli.py b/shot_scraper/cli.py index dbedac2..c7dca8a 100644 --- a/shot_scraper/cli.py +++ b/shot_scraper/cli.py @@ -702,9 +702,10 @@ def accessibility( skip_or_fail(response, skip, fail) if javascript: _evaluate_js(page, javascript) - snapshot = page.accessibility.snapshot() + snapshot = page.locator("body").aria_snapshot() browser_obj.close() - output.write(json.dumps(snapshot, indent=4)) + # aria_snapshot() returns YAML, parse it for JSON output + output.write(json.dumps(yaml.safe_load(snapshot), indent=4)) output.write("\n") diff --git a/tests/run_examples.sh b/tests/run_examples.sh index 2b56d2d..d9123e3 100755 --- a/tests/run_examples.sh +++ b/tests/run_examples.sh @@ -45,15 +45,15 @@ shot-scraper 'https://www.owlsnearme.com/?place=127871' \ -o examples/owlsnearme-wait.jpg \ --wait-for "!!document.querySelector('section.secondary')" # Accessibility -# #shot-scraper accessibility https://datasette.io/ \ -# > examples/datasette-accessibility.json -# shot-scraper accessibility https://simonwillison.net \ -# --javascript "document.getElementById('wrapper').style.display='none'" \ -# > examples/simonwillison-accessibility-javascript.json -# shot-scraper accessibility https://simonwillison.net \ -# --javascript "document.getElementById('wrapper').style.display='none'" \ -# --output examples/simonwillison-accessibility-javascript-and-dash-output.json -# shot-scraper accessibility examples/local.html -o examples/local-accessibility.json +shot-scraper accessibility https://datasette.io/ \ + > examples/datasette-accessibility.json +shot-scraper accessibility https://simonwillison.net \ + --javascript "document.getElementById('wrapper').style.display='none'" \ + > examples/simonwillison-accessibility-javascript.json +shot-scraper accessibility https://simonwillison.net \ + --javascript "document.getElementById('wrapper').style.display='none'" \ + --output examples/simonwillison-accessibility-javascript-and-dash-output.json +shot-scraper accessibility examples/local.html -o examples/local-accessibility.json # PDF (cd examples && shot-scraper pdf https://datasette.io/tools) shot-scraper pdf https://datasette.io \