From d88d58e8db80b42cfd99fd41be941f720273db48 Mon Sep 17 00:00:00 2001
From: Bassam Ismail <skippednote@gmail.com>
Date: Fri, 26 Jun 2020 20:55:04 +0530
Subject: [PATCH 1/3] fix(820): check if media has captions

---
 src/compiler/compile/nodes/Element.ts         | 20 ++++++++++++
 .../a11y-media-has-caption/input.svelte       |  4 +++
 .../a11y-media-has-caption/warnings.json      | 32 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 test/validator/samples/a11y-media-has-caption/input.svelte
 create mode 100644 test/validator/samples/a11y-media-has-caption/warnings.json

diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 7a70e603a77f..00b5e5279df5 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -507,6 +507,26 @@ export default class Element extends Node {
 			}
 		}
 
+
+		if (this.is_media_node()) {
+			if (attribute_map.has('muted')) {
+				return;
+			}
+
+			let has_caption;
+			const track = this.children.find((i: Element) => i.name === 'track');
+			if (track) {
+				has_caption = track.attributes.find(a => a.name === "kind" && a.get_static_value() === "captions");
+			}
+
+			if (!has_caption) {
+				component.warn(this, {
+					code: `a11y-media-has-caption`,
+					message: `A11y: Media elements such as <audio> and <video> must have a <track> for captions.`
+				});
+			}
+		}
+
 		if (a11y_no_onchange.has(this.name)) {
 			if (handlers_map.has('change') && !handlers_map.has('blur')) {
 				component.warn(this, {
diff --git a/test/validator/samples/a11y-media-has-caption/input.svelte b/test/validator/samples/a11y-media-has-caption/input.svelte
new file mode 100644
index 000000000000..105269cddb48
--- /dev/null
+++ b/test/validator/samples/a11y-media-has-caption/input.svelte
@@ -0,0 +1,4 @@
+<video><track kind="captions"/></video>
+<video></video>
+<video><track /></video>
+<audio muted></audio>
diff --git a/test/validator/samples/a11y-media-has-caption/warnings.json b/test/validator/samples/a11y-media-has-caption/warnings.json
new file mode 100644
index 000000000000..79c31ebeccf3
--- /dev/null
+++ b/test/validator/samples/a11y-media-has-caption/warnings.json
@@ -0,0 +1,32 @@
+[
+  {
+    "code": "a11y-media-has-caption",
+    "end": {
+      "character": 55,
+      "column": 15,
+      "line": 2
+    },
+    "message": "A11y: Media elements such as <audio> and <video> must have a <track> for captions.",
+    "pos": 40,
+    "start": {
+      "character": 40,
+      "column": 0,
+      "line": 2
+    }
+  },
+  {
+    "code": "a11y-media-has-caption",
+    "end": {
+      "character": 80,
+      "column": 24,
+      "line": 3
+    },
+    "message": "A11y: Media elements such as <audio> and <video> must have a <track> for captions.",
+    "pos": 56,
+    "start": {
+      "character": 56,
+      "column": 0,
+      "line": 3
+    }
+  }
+]

From 136e156f9415c50ac8fedd1bf2f77073af08142b Mon Sep 17 00:00:00 2001
From: Bassam Ismail <skippednote@gmail.com>
Date: Fri, 26 Jun 2020 21:22:43 +0530
Subject: [PATCH 2/3] fix(820): update css test

---
 .../omit-scoping-attribute-attribute-selector/expected.html | 4 ++--
 .../omit-scoping-attribute-attribute-selector/input.svelte  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector/expected.html b/test/css/samples/omit-scoping-attribute-attribute-selector/expected.html
index 52175f98b660..f585d6bcdda2 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector/expected.html
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector/expected.html
@@ -1,2 +1,2 @@
-<div><video class="svelte-xyz" autoplay></video>
-	<video></video></div>
\ No newline at end of file
+<div><video class="svelte-xyz" autoplay muted></video>
+	<video muted></video></div>
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector/input.svelte b/test/css/samples/omit-scoping-attribute-attribute-selector/input.svelte
index 6f4549ead8d8..af06836d291f 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector/input.svelte
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector/input.svelte
@@ -1,10 +1,10 @@
 <div>
-	<video autoplay></video>
-	<video></video>
+	<video autoplay muted></video>
+	<video muted></video>
 </div>
 
 <style>
 	[autoplay] {
 		color: red;
 	}
-</style>
\ No newline at end of file
+</style>

From afb542230994290355f3a2d4b7f8e940e6f48808 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 5 Aug 2020 12:10:16 -0400
Subject: [PATCH 3/3] adjust warning message

---
 src/compiler/compile/nodes/Element.ts                       | 4 ++--
 test/validator/samples/a11y-media-has-caption/warnings.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 00b5e5279df5..0f68eeb84615 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -516,13 +516,13 @@ export default class Element extends Node {
 			let has_caption;
 			const track = this.children.find((i: Element) => i.name === 'track');
 			if (track) {
-				has_caption = track.attributes.find(a => a.name === "kind" && a.get_static_value() === "captions");
+				has_caption = track.attributes.find(a => a.name === 'kind' && a.get_static_value() === 'captions');
 			}
 
 			if (!has_caption) {
 				component.warn(this, {
 					code: `a11y-media-has-caption`,
-					message: `A11y: Media elements such as <audio> and <video> must have a <track> for captions.`
+					message: `A11y: Media elements must have a <track kind="captions">`
 				});
 			}
 		}
diff --git a/test/validator/samples/a11y-media-has-caption/warnings.json b/test/validator/samples/a11y-media-has-caption/warnings.json
index 79c31ebeccf3..a8c894b1d491 100644
--- a/test/validator/samples/a11y-media-has-caption/warnings.json
+++ b/test/validator/samples/a11y-media-has-caption/warnings.json
@@ -6,7 +6,7 @@
       "column": 15,
       "line": 2
     },
-    "message": "A11y: Media elements such as <audio> and <video> must have a <track> for captions.",
+    "message": "A11y: Media elements must have a <track kind=\"captions\">",
     "pos": 40,
     "start": {
       "character": 40,
@@ -21,7 +21,7 @@
       "column": 24,
       "line": 3
     },
-    "message": "A11y: Media elements such as <audio> and <video> must have a <track> for captions.",
+    "message": "A11y: Media elements must have a <track kind=\"captions\">",
     "pos": 56,
     "start": {
       "character": 56,