style: format HTML files with Prettier (#1508)

Prettier now supports HTML, so we'll run all of our HTML files through it to avoid style inconsistencies. ## Reviewer checks **Required fields, to be filled out by PR reviewer(s)** - [x] Follows the commit message policy, appropriate for next version - [x] Has documentation updated, a DU ticket, or requires no documentation change - [x] Includes new tests, or was unnecessary - [x] Code is reviewed for security by: @WilcoFiers
dequelabs · Apr 19, 2019 · 376a6a1 · 376a6a1
1 parent 8d85082
commit 376a6a1
Show file tree

Hide file tree

Showing 213 changed files with 6,550 additions and 3,773 deletions.
diff --git a/doc/examples/mocha/test/test.html b/doc/examples/mocha/test/test.html
@@ -1,33 +1,50 @@
 <!DOCTYPE html>
 <html>
-<head>
-	<meta charset="utf-8">
-	<title>Example Mocha Test</title>
-	<link rel="stylesheet" href="../node_modules/mocha/mocha.css" type="text/css" charset="utf-8" />
-</head>
-<body>
-	<!-- Required for browser reporter -->
-	<div id="mocha"></div>
+	<head>
+		<meta charset="utf-8" />
+		<title>Example Mocha Test</title>
+		<link
+			rel="stylesheet"
+			href="../node_modules/mocha/mocha.css"
+			type="text/css"
+			charset="utf-8"
+		/>
+	</head>
+	<body>
+		<!-- Required for browser reporter -->
+		<div id="mocha"></div>
 
-	<script src="../node_modules/mocha/mocha.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../node_modules/chai/chai.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../node_modules/axe-core/axe.min.js" type="text/javascript" charset="utf-8"></script>
-	<script type="text/javascript" charset="utf-8">
-		mocha.setup('bdd');
-		var expect = chai.expect;
-	</script>
+		<script
+			src="../node_modules/mocha/mocha.js"
+			type="text/javascript"
+			charset="utf-8"
+		></script>
+		<script
+			src="../node_modules/chai/chai.js"
+			type="text/javascript"
+			charset="utf-8"
+		></script>
+		<script
+			src="../node_modules/axe-core/axe.min.js"
+			type="text/javascript"
+			charset="utf-8"
+		></script>
+		<script type="text/javascript" charset="utf-8">
+			mocha.setup('bdd');
+			var expect = chai.expect;
+		</script>
 
-	<!-- Include axe -->
+		<!-- Include axe -->
 
-	<!-- Spec files -->
-	<script src="a11y.js" type="text/javascript" charset="utf-8"></script>
-	<div id="working">
-		<label for="labelfld">Label for this text field.</label>
-		<input type="text" id="labelfld">
-	</div>
-	<div id="broken">
-		<p>Label for this text field.</p>
-		<input type="text" id="nolabelfld">
-	</div>
-</body>
+		<!-- Spec files -->
+		<script src="a11y.js" type="text/javascript" charset="utf-8"></script>
+		<div id="working">
+			<label for="labelfld">Label for this text field.</label>
+			<input type="text" id="labelfld" />
+		</div>
+		<div id="broken">
+			<p>Label for this text field.</p>
+			<input type="text" id="nolabelfld" />
+		</div>
+	</body>
 </html>
diff --git a/doc/examples/qunit/test/test.html b/doc/examples/qunit/test/test.html
@@ -1,27 +1,29 @@
 <!DOCTYPE html>
 <html>
-<head>
-	<meta charset="utf-8">
-	<title>Basic Test Suite</title>
-	<!-- Load local QUnit. -->
-	<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" media="screen">
-	<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
-	<!-- Load local lib and tests. -->
-	<script src="../node_modules/axe-core/axe.min.js"></script>
-	<script src="a11y.js"></script>
-</head>
-<body>
-	<div id="qunit"></div>
-	<div id="qunit-fixture">
-	</div>
-	<div id="working">
-		<label for="labelfld">Label for this text field.</label>
-		<input type="text" id="labelfld">
-	</div>
-	<div id="broken">
-		<p>Label for this text field.</p>
-		<input type="text" id="nolabelfld">
-	</div>
-
-</body>
+	<head>
+		<meta charset="utf-8" />
+		<title>Basic Test Suite</title>
+		<!-- Load local QUnit. -->
+		<link
+			rel="stylesheet"
+			href="../node_modules/qunitjs/qunit/qunit.css"
+			media="screen"
+		/>
+		<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
+		<!-- Load local lib and tests. -->
+		<script src="../node_modules/axe-core/axe.min.js"></script>
+		<script src="a11y.js"></script>
+	</head>
+	<body>
+		<div id="qunit"></div>
+		<div id="qunit-fixture"></div>
+		<div id="working">
+			<label for="labelfld">Label for this text field.</label>
+			<input type="text" id="labelfld" />
+		</div>
+		<div id="broken">
+			<p>Label for this text field.</p>
+			<input type="text" id="nolabelfld" />
+		</div>
+	</body>
 </html>
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
 		"rule-gen": "node build/rule-generator",
 		"next-release": "standard-version --scripts.prebump=./build/next-version.js --skip.commit=true --skip.tag=true",
 		"sri-update": "grunt build && node build/sri-update && git add sri-history.json",
-		"fmt": "prettier --write *.{json,md,js} **/*.ts './{build,doc,lib,test}/**/*.{json,md,js,ts}'"
+		"fmt": "prettier --write *.{json,md,js} **/*.ts './{build,doc,lib,test}/**/*.{json,md,js,ts,html}'"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.3.4",
@@ -115,7 +115,7 @@
 		"minami": "^1.2.3",
 		"mkdirp": "^0.5.1",
 		"mocha": "^6.1.2",
-		"prettier": "^1.14.0",
+		"prettier": "^1.17.0",
 		"retire": "^2.0.1",
 		"revalidator": "~0.3.1",
 		"selenium-webdriver": "~3.6.0",
@@ -126,7 +126,7 @@
 	},
 	"dependencies": {},
 	"lint-staged": {
-		"*.{md,json,ts}": [
+		"*.{md,json,ts,html}": [
 			"prettier --write",
 			"git add"
 		],

diff --git a/test/core/public/run-rules.js b/test/core/public/run-rules.js
@@ -149,6 +149,7 @@ describe('runRules', function() {
 		fixture.appendChild(frame);
 	});
 
+	// NOTE: this test depends on the whitespace in /test/mock/frames/context.html. If the whitespace changes in that file, this test needs to be updated to reflect that change.
 	it('should properly calculate context and return results from matching frames', function(done) {
 		axe._load({
 			rules: [
@@ -251,7 +252,8 @@ describe('runRules', function() {
 										node: {
 											selector: ['#context-test', '#foo'],
 											xpath: ["/iframe[@id='context-test']", "/div[@id='foo']"],
-											source: '<div id="foo">\n		<div id="bar"></div>\n	</div>'
+											source:
+												'<div id="foo">\n\t\t\t<div id="bar"></div>\n\t\t</div>'
 										},
 										any: [
 											{
@@ -265,7 +267,7 @@ describe('runRules', function() {
 															"/div[@id='foo']"
 														],
 														source:
-															'<div id="foo">\n		<div id="bar"></div>\n	</div>'
+															'<div id="foo">\n\t\t\t<div id="bar"></div>\n\t\t</div>'
 													}
 												]
 											}

diff --git a/test/integration/full/aria-hidden-body/fail.html b/test/integration/full/aria-hidden-body/fail.html
@@ -1,26 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
 <html lang="en">
-<head>
-<title>aria-hidden on body Test</title>
+	<head>
+		<title>aria-hidden on body Test</title>
 
-<link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
-<script src="/node_modules/mocha/mocha.js"></script>
-<script src="/node_modules/chai/chai.js"></script>
-<script src="/axe.js"></script>
-<script>
-	mocha.setup({
-		timeout: 10000,
-		ui: 'bdd'
-	});
-	var assert = chai.assert;
-</script>
-<script src="/test/integration/no-ui-reporter.js"></script>
-</head>
-<body aria-hidden="true">
-	<h2>Some title.</h2>
-	<a href="http://www.deque.com">Deque</a>
-	<div id="mocha"></div>
-	<script src="fail.js"></script>
-	<script src="/test/integration/adapter.js"></script>
-</body>
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="/node_modules/mocha/mocha.css"
+		/>
+		<script src="/node_modules/mocha/mocha.js"></script>
+		<script src="/node_modules/chai/chai.js"></script>
+		<script src="/axe.js"></script>
+		<script>
+			mocha.setup({
+				timeout: 10000,
+				ui: 'bdd'
+			});
+			var assert = chai.assert;
+		</script>
+		<script src="/test/integration/no-ui-reporter.js"></script>
+	</head>
+	<body aria-hidden="true">
+		<h2>Some title.</h2>
+		<a href="http://www.deque.com">Deque</a>
+		<div id="mocha"></div>
+		<script src="fail.js"></script>
+		<script src="/test/integration/adapter.js"></script>
+	</body>
 </html>
diff --git a/test/integration/full/aria-hidden-body/pass.html b/test/integration/full/aria-hidden-body/pass.html
@@ -1,26 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
 <html lang="en">
-<head>
-<title>aria-hidden on body Test</title>
+	<head>
+		<title>aria-hidden on body Test</title>
 
-<link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
-<script src="/node_modules/mocha/mocha.js"></script>
-<script src="/node_modules/chai/chai.js"></script>
-<script src="/axe.js"></script>
-<script>
-	mocha.setup({
-		timeout: 10000,
-		ui: 'bdd'
-	});
-	var assert = chai.assert;
-</script>
-<script src="/test/integration/no-ui-reporter.js"></script>
-</head>
-<body aria-hidden="false">
-	<h2>Some title.</h2>
-	<a href="http://www.deque.com">Deque</a>
-	<div id="mocha"></div>
-	<script src="pass.js"></script>
-	<script src="/test/integration/adapter.js"></script>
-</body>
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="/node_modules/mocha/mocha.css"
+		/>
+		<script src="/node_modules/mocha/mocha.js"></script>
+		<script src="/node_modules/chai/chai.js"></script>
+		<script src="/axe.js"></script>
+		<script>
+			mocha.setup({
+				timeout: 10000,
+				ui: 'bdd'
+			});
+			var assert = chai.assert;
+		</script>
+		<script src="/test/integration/no-ui-reporter.js"></script>
+	</head>
+	<body aria-hidden="false">
+		<h2>Some title.</h2>
+		<a href="http://www.deque.com">Deque</a>
+		<div id="mocha"></div>
+		<script src="pass.js"></script>
+		<script src="/test/integration/adapter.js"></script>
+	</body>
 </html>
diff --git a/test/integration/full/async/async.html b/test/integration/full/async/async.html
@@ -1,29 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML+ARIA 1.0//EN" "http://www.w3.org/WAI/ARIA/schemata/html4-aria-1.dtd">
 <html lang="en">
-<head>
-<title>Async Test</title>
+	<head>
+		<title>Async Test</title>
 
-<link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
-<script src="/node_modules/mocha/mocha.js"></script>
-<script src="/node_modules/chai/chai.js"></script>
-<script src="/axe.js"></script>
-<script>
-  mocha.setup({
-    timeout: 10000,
-    ui: 'bdd'
-  });
-  var assert = chai.assert;
-</script>
-<script src="/test/integration/no-ui-reporter.js"></script>
-</head>
-<body>
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="/node_modules/mocha/mocha.css"
+		/>
+		<script src="/node_modules/mocha/mocha.js"></script>
+		<script src="/node_modules/chai/chai.js"></script>
+		<script src="/axe.js"></script>
+		<script>
+			mocha.setup({
+				timeout: 10000,
+				ui: 'bdd'
+			});
+			var assert = chai.assert;
+		</script>
+		<script src="/test/integration/no-ui-reporter.js"></script>
+	</head>
+	<body>
+		<div class="async" data-out="true" id="pass"></div>
+		<div class="async" data-out="false" id="violation"></div>
+		<div class="async" data-out="undefined" id="incomplete"></div>
 
-  <div class="async" data-out="true" id="pass"></div>
-  <div class="async" data-out="false" id="violation"></div>
-  <div class="async" data-out="undefined" id="incomplete"></div>
-
-  <div id="mocha"></div>
-  <script src="async.js"></script>
-  <script src="/test/integration/adapter.js"></script>
-</body>
+		<div id="mocha"></div>
+		<script src="async.js"></script>
+		<script src="/test/integration/adapter.js"></script>
+	</body>
 </html>