From 85b66058fa0d14d0b693cf5b6d8d07f8384bf94f Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sat, 4 May 2019 17:17:43 -0700
Subject: [PATCH 01/15] add ios-pwa audit to pwa category.

---
 lighthouse-core/audits/ios-pwa-icon.js   | 54 ++++++++++++++++++++++++
 lighthouse-core/config/default-config.js |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 lighthouse-core/audits/ios-pwa-icon.js

diff --git a/lighthouse-core/audits/ios-pwa-icon.js b/lighthouse-core/audits/ios-pwa-icon.js
new file mode 100644
index 000000000000..defd17762177
--- /dev/null
+++ b/lighthouse-core/audits/ios-pwa-icon.js
@@ -0,0 +1,54 @@
+/**
+ * @license Copyright 2019 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+const Audit = require('./audit');
+
+/**
+ * @fileoverview
+ * Audits if the page's web app has a valid icon for iOS installability.
+ */
+
+class IosPwaIcon extends Audit {
+  /**
+   * @return {LH.Audit.Meta}
+   */
+  static get meta() {
+    return {
+      id: 'ios-pwa-icon',
+      title: 'Web app has a valid iOS PWA icon',
+      // title: 'Web app manifest meets the installability requirements',
+      failureTitle: 'Web app does not have a valid iOS PWA icon',
+      description: 'In order to be installable as an iOS PWA, '
+        + 'web apps must have a valid iOS icon.',
+      requiredArtifacts: ['LinkElements'],
+    };
+  }
+
+  /**
+   * @param {LH.Artifacts} artifacts
+   * @param {LH.Audit.Context} _
+   * @return {Promise<LH.Audit.Product>}
+   */
+  static audit(artifacts, _) {
+    const appleTouchIcons = artifacts.LinkElements.filter(el => el.rel === 'apple-touch-icon');
+
+    // Audit passes if an `apple-touch-icon` exists.
+    const passed = appleTouchIcons.length !== 0;
+
+    let explanation;
+    if (!passed) {
+      explanation = 'No Apple touch icon link found.';
+    }
+
+    return {
+      score: passed ? 1 : 0,
+      explanation,
+    };
+  }
+}
+
+module.exports = IosPwaIcon;
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index 9184e54928f1..ffc3e3cbaf2b 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -179,6 +179,7 @@ const defaultConfig = {
     'critical-request-chains',
     'redirects',
     'installable-manifest',
+    'ios-pwa-icon',
     'splash-screen',
     'themed-omnibox',
     'content-width',
@@ -516,6 +517,7 @@ const defaultConfig = {
         {id: 'is-on-https', weight: 2, group: 'pwa-installable'},
         {id: 'service-worker', weight: 1, group: 'pwa-installable'},
         {id: 'installable-manifest', weight: 2, group: 'pwa-installable'},
+        {id: 'ios-pwa-icon', weight: 1, group: 'pwa-installable'},
         // PWA Optimized
         {id: 'redirects-http', weight: 2, group: 'pwa-optimized'},
         {id: 'splash-screen', weight: 1, group: 'pwa-optimized'},

From 560dbe7fb687aba7853ec1803f3a89e018e6dfb4 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sat, 4 May 2019 18:14:16 -0700
Subject: [PATCH 02/15] nits

---
 lighthouse-core/audits/ios-pwa-icon.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lighthouse-core/audits/ios-pwa-icon.js b/lighthouse-core/audits/ios-pwa-icon.js
index defd17762177..a3c0bd3853ac 100644
--- a/lighthouse-core/audits/ios-pwa-icon.js
+++ b/lighthouse-core/audits/ios-pwa-icon.js
@@ -8,8 +8,7 @@
 const Audit = require('./audit');
 
 /**
- * @fileoverview
- * Audits if the page's web app has a valid icon for iOS installability.
+ * @fileoverview Audits if a page's web app has a valid icon for iOS installability.
  */
 
 class IosPwaIcon extends Audit {
@@ -19,11 +18,11 @@ class IosPwaIcon extends Audit {
   static get meta() {
     return {
       id: 'ios-pwa-icon',
-      title: 'Web app has a valid iOS PWA icon',
-      // title: 'Web app manifest meets the installability requirements',
-      failureTitle: 'Web app does not have a valid iOS PWA icon',
-      description: 'In order to be installable as an iOS PWA, '
-        + 'web apps must have a valid iOS icon.',
+      title: 'Web app has a valid iOS touch icon',
+      failureTitle: 'Web app does not have a valid iOS touch icon',
+      description: 'In order to be installable as an iOS PWA '
+        + 'web apps must have a valid apple-touch-icon. '
+        + '[Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).',
       requiredArtifacts: ['LinkElements'],
     };
   }
@@ -31,7 +30,7 @@ class IosPwaIcon extends Audit {
   /**
    * @param {LH.Artifacts} artifacts
    * @param {LH.Audit.Context} _
-   * @return {Promise<LH.Audit.Product>}
+   * @return {LH.Audit.Product}
    */
   static audit(artifacts, _) {
     const appleTouchIcons = artifacts.LinkElements.filter(el => el.rel === 'apple-touch-icon');
@@ -41,7 +40,7 @@ class IosPwaIcon extends Audit {
 
     let explanation;
     if (!passed) {
-      explanation = 'No Apple touch icon link found.';
+      explanation = 'No `apple-touch-icon` link found.';
     }
 
     return {

From 00a9235818ee3c3d695182ae8dad543be38721f8 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sat, 4 May 2019 18:30:25 -0700
Subject: [PATCH 03/15] added tests, updated sample json

---
 .../test/audits/ios-pwa-icon-test.js          | 36 +++++++++++++++++++
 lighthouse-core/test/results/sample_v2.json   | 21 ++++++++++-
 proto/sample_v2_round_trip.json               | 27 +++++++++++---
 3 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 lighthouse-core/test/audits/ios-pwa-icon-test.js

diff --git a/lighthouse-core/test/audits/ios-pwa-icon-test.js b/lighthouse-core/test/audits/ios-pwa-icon-test.js
new file mode 100644
index 000000000000..ca2021632503
--- /dev/null
+++ b/lighthouse-core/test/audits/ios-pwa-icon-test.js
@@ -0,0 +1,36 @@
+/**
+ * @license Copyright 2016 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+const IosPwaIcon = require('../../audits/ios-pwa-icon.js');
+
+/* eslint-env jest */
+
+describe('PWA: ios-pwa-icon audit', () => {
+  it(`fails when apple-touch-icon is not present`, async () => {
+    const artifacts = {
+      LinkElements: [],
+    };
+
+    const context = {settings: {}, computedCache: new Map()};
+    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(0);
+    expect(explanation).toBe('No `apple-touch-icon` link found.');
+  });
+
+  it(`passes when apple-touch-icon is on page`, async () => {
+    const artifacts = {
+      LinkElements: [{rel: 'apple-touch-icon', href: 'https://example.com/touch-icon.png'}],
+    };
+
+    const context = {settings: {}, computedCache: new Map()};
+    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(1);
+    expect(explanation).toBeUndefined();
+  });
+});
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index c045c7cddc02..cf2e19cb151d 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -476,6 +476,14 @@
         ]
       }
     },
+    "ios-pwa-icon": {
+      "id": "ios-pwa-icon",
+      "title": "Web app does not have a valid iOS touch icon",
+      "description": "In order to be installable as an iOS PWA web apps must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+      "score": 0,
+      "scoreDisplayMode": "binary",
+      "explanation": "No `apple-touch-icon` link found."
+    },
     "splash-screen": {
       "id": "splash-screen",
       "title": "Is not configured for a custom splash screen",
@@ -3660,6 +3668,11 @@
           "weight": 2,
           "group": "pwa-installable"
         },
+        {
+          "id": "ios-pwa-icon",
+          "weight": 1,
+          "group": "pwa-installable"
+        },
         {
           "id": "redirects-http",
           "weight": 2,
@@ -3704,7 +3717,7 @@
         }
       ],
       "id": "pwa",
-      "score": 0.42
+      "score": 0.41
     }
   },
   "categoryGroups": {
@@ -4073,6 +4086,12 @@
         "duration": 100,
         "entryType": "measure"
       },
+      {
+        "startTime": 0,
+        "name": "lh:audit:ios-pwa-icon",
+        "duration": 100,
+        "entryType": "measure"
+      },
       {
         "startTime": 0,
         "name": "lh:audit:splash-screen",
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index d9f5ba95c53b..045a0112e3c0 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -1040,6 +1040,14 @@
             "scoreDisplayMode": "manual",
             "title": "Interactive elements indicate their purpose and state"
         },
+        "ios-pwa-icon": {
+            "description": "In order to be installable as an iOS PWA web apps must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+            "explanation": "No `apple-touch-icon` link found.",
+            "id": "ios-pwa-icon",
+            "score": 0.0,
+            "scoreDisplayMode": "binary",
+            "title": "Web app does not have a valid iOS touch icon"
+        },
         "is-crawlable": {
             "description": "Search engines are unable to include your pages in search results if they don't have permission to crawl them. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/indexing).",
             "details": {
@@ -1100,7 +1108,7 @@
                         "name": "WordPress"
                     }
                 ],
-                "summary": {},
+                "summary": null,
                 "type": "table"
             },
             "id": "js-libraries",
@@ -1227,7 +1235,7 @@
             "details": {
                 "headings": [],
                 "items": [],
-                "summary": {},
+                "summary": null,
                 "type": "table"
             },
             "id": "link-text",
@@ -1883,7 +1891,7 @@
                         "vulnCount": 2.0
                     }
                 ],
-                "summary": {},
+                "summary": null,
                 "type": "table"
             },
             "displayValue": "2 vulnerabilities detected",
@@ -3521,6 +3529,11 @@
                     "id": "installable-manifest",
                     "weight": 2.0
                 },
+                {
+                    "group": "pwa-installable",
+                    "id": "ios-pwa-icon",
+                    "weight": 1.0
+                },
                 {
                     "group": "pwa-optimized",
                     "id": "redirects-http",
@@ -3567,7 +3580,7 @@
             "description": "These checks validate the aspects of a Progressive Web App. [Learn more](https://developers.google.com/web/progressive-web-apps/checklist).",
             "id": "pwa",
             "manualDescription": "These checks are required by the baseline [PWA Checklist](https://developers.google.com/web/progressive-web-apps/checklist) but are not automatically checked by Lighthouse. They do not affect your score but it's important that you verify them manually.",
-            "score": 0.42,
+            "score": 0.41,
             "title": "Progressive Web App"
         },
         "seo": {
@@ -4076,6 +4089,12 @@
                 "name": "lh:computed:ManifestValues",
                 "startTime": 0.0
             },
+            {
+                "duration": 100.0,
+                "entryType": "measure",
+                "name": "lh:audit:ios-pwa-icon",
+                "startTime": 0.0
+            },
             {
                 "duration": 100.0,
                 "entryType": "measure",

From e43efc6c9026c2dddda4b121fd88dc28ec680793 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sat, 4 May 2019 21:05:52 -0700
Subject: [PATCH 04/15] update tests, i18n audit.

---
 .../test/cli/__snapshots__/index-test.js.snap |  8 +++++
 lighthouse-core/audits/ios-pwa-icon.js        | 35 ++++++++++++++-----
 lighthouse-core/lib/i18n/en-US.json           | 16 +++++++++
 .../test/audits/ios-pwa-icon-test.js          | 16 +++++++--
 .../html/renderer/category-renderer-test.js   |  4 +--
 lighthouse-core/test/results/sample_v2.json   | 15 ++++++--
 proto/sample_v2_round_trip.json               |  6 ++--
 7 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
index d1e45ec5d810..ea19819b1d63 100644
--- a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
+++ b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
@@ -69,6 +69,9 @@ Object {
     Object {
       "path": "installable-manifest",
     },
+    Object {
+      "path": "ios-pwa-icon",
+    },
     Object {
       "path": "splash-screen",
     },
@@ -893,6 +896,11 @@ Object {
           "id": "installable-manifest",
           "weight": 2,
         },
+        Object {
+          "group": "pwa-installable",
+          "id": "ios-pwa-icon",
+          "weight": 1,
+        },
         Object {
           "group": "pwa-optimized",
           "id": "redirects-http",
diff --git a/lighthouse-core/audits/ios-pwa-icon.js b/lighthouse-core/audits/ios-pwa-icon.js
index a3c0bd3853ac..bc4148fed619 100644
--- a/lighthouse-core/audits/ios-pwa-icon.js
+++ b/lighthouse-core/audits/ios-pwa-icon.js
@@ -5,12 +5,29 @@
  */
 'use strict';
 
-const Audit = require('./audit');
+const Audit = require('./audit.js');
+const i18n = require('../lib/i18n/i18n.js');
 
 /**
- * @fileoverview Audits if a page's web app has a valid icon for iOS installability.
+ * @fileoverview Audits if a page's web app has an icon link for iOS installability.
  */
 
+const UIStrings = {
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. "iOS" is the name of the Apple operating system and should not be translated. */
+  title: 'Site a valid iOS touch icon',
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. "iOS" is the name of the Apple operating system and should not be translated. */
+  failureTitle: 'Site does not have a valid iOS touch icon',
+  /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
+  description:
+  'In order to be installable as an iOS PWA ' +
+  'sites must have a valid apple-touch-icon. ' +
+  '[Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).',
+  /** Explanatory message stating that there was a failure in an audit caused by the page having an invalid apple-touch-icon link. `apple-touch-icon` is a HTML tag value and should not be translated. */
+  explanation: 'No valid `apple-touch-icon` link found.',
+};
+
+const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+
 class IosPwaIcon extends Audit {
   /**
    * @return {LH.Audit.Meta}
@@ -18,11 +35,9 @@ class IosPwaIcon extends Audit {
   static get meta() {
     return {
       id: 'ios-pwa-icon',
-      title: 'Web app has a valid iOS touch icon',
-      failureTitle: 'Web app does not have a valid iOS touch icon',
-      description: 'In order to be installable as an iOS PWA '
-        + 'web apps must have a valid apple-touch-icon. '
-        + '[Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).',
+      title: str_(UIStrings.title),
+      failureTitle: str_(UIStrings.failureTitle),
+      description: str_(UIStrings.description),
       requiredArtifacts: ['LinkElements'],
     };
   }
@@ -33,14 +48,15 @@ class IosPwaIcon extends Audit {
    * @return {LH.Audit.Product}
    */
   static audit(artifacts, _) {
-    const appleTouchIcons = artifacts.LinkElements.filter(el => el.rel === 'apple-touch-icon');
+    const appleTouchIcons = artifacts.LinkElements.filter(
+      el => el.rel === 'apple-touch-icon' && el.href !== undefined);
 
     // Audit passes if an `apple-touch-icon` exists.
     const passed = appleTouchIcons.length !== 0;
 
     let explanation;
     if (!passed) {
-      explanation = 'No `apple-touch-icon` link found.';
+      explanation = str_(UIStrings.explanation);
     }
 
     return {
@@ -51,3 +67,4 @@ class IosPwaIcon extends Audit {
 }
 
 module.exports = IosPwaIcon;
+module.exports.UIStrings = UIStrings;
diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index e40e4f0483bd..056459e43673 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -635,6 +635,22 @@
     "message": "All text remains visible during webfont loads",
     "description": "Title of a diagnostic audit that provides detail on if all the text on a webpage was visible while the page was loading its webfonts. This descriptive title is shown to users when the amount is acceptable and no user action is required."
   },
+  "lighthouse-core/audits/ios-pwa-icon.js | description": {
+    "message": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
+  },
+  "lighthouse-core/audits/ios-pwa-icon.js | explanation": {
+    "message": "No valid `apple-touch-icon` link found.",
+    "description": "Explanatory message stating that there was a failure in an audit caused by the page having an invalid apple-touch-icon link. `apple-touch-icon` is a HTML tag value and should not be translated."
+  },
+  "lighthouse-core/audits/ios-pwa-icon.js | failureTitle": {
+    "message": "Site does not have a valid iOS touch icon",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. \"iOS\" is the name of the Apple operating system and should not be translated."
+  },
+  "lighthouse-core/audits/ios-pwa-icon.js | title": {
+    "message": "Site a valid iOS touch icon",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. \"iOS\" is the name of the Apple operating system and should not be translated."
+  },
   "lighthouse-core/audits/load-fast-enough-for-pwa.js | description": {
     "message": "A fast page load over a cellular network ensures a good mobile user experience. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/fast-3g).",
     "description": "Description of a Lighthouse audit that tells the user *why* they need to load fast enough on mobile networks. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
diff --git a/lighthouse-core/test/audits/ios-pwa-icon-test.js b/lighthouse-core/test/audits/ios-pwa-icon-test.js
index ca2021632503..febe6787a286 100644
--- a/lighthouse-core/test/audits/ios-pwa-icon-test.js
+++ b/lighthouse-core/test/audits/ios-pwa-icon-test.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright 2016 Google Inc. All Rights Reserved.
+ * @license Copyright 2019 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
@@ -19,7 +19,19 @@ describe('PWA: ios-pwa-icon audit', () => {
     const {score, explanation} = IosPwaIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
-    expect(explanation).toBe('No `apple-touch-icon` link found.');
+    expect(explanation).toBeDisplayString('No valid `apple-touch-icon` link found.');
+  });
+
+  it(`fails when apple-touch-icon does not have an href`, async () => {
+    const artifacts = {
+      LinkElements: [{rel: 'apple-touch-icon'}],
+    };
+
+    const context = {settings: {}, computedCache: new Map()};
+    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(0);
+    expect(explanation).toBeDisplayString('No valid `apple-touch-icon` link found.');
   });
 
   it(`passes when apple-touch-icon is on page`, async () => {
diff --git a/lighthouse-core/test/report/html/renderer/category-renderer-test.js b/lighthouse-core/test/report/html/renderer/category-renderer-test.js
index 8e691f5a5862..b18f27521c78 100644
--- a/lighthouse-core/test/report/html/renderer/category-renderer-test.js
+++ b/lighthouse-core/test/report/html/renderer/category-renderer-test.js
@@ -366,7 +366,7 @@ describe('CategoryRenderer', () => {
       const manualAudits = elem.querySelectorAll('.lh-clump--manual .lh-audit');
 
       assert.equal(passedAudits.length, 2);
-      assert.equal(failedAudits.length, 8);
+      assert.equal(failedAudits.length, 9);
       assert.equal(warningAudits.length, 2);
       assert.equal(manualAudits.length, 3);
     });
@@ -380,7 +380,7 @@ describe('CategoryRenderer', () => {
       const failedAudits = elem.querySelectorAll('.lh-clump--failed .lh-audit');
 
       assert.equal(passedAudits.length, 0);
-      assert.equal(failedAudits.length, 12);
+      assert.equal(failedAudits.length, 13);
     });
 
     it('expands warning audit group', () => {
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index cf2e19cb151d..67153a614003 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -478,11 +478,11 @@
     },
     "ios-pwa-icon": {
       "id": "ios-pwa-icon",
-      "title": "Web app does not have a valid iOS touch icon",
-      "description": "In order to be installable as an iOS PWA web apps must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+      "title": "Site does not have a valid iOS touch icon",
+      "description": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
       "score": 0,
       "scoreDisplayMode": "binary",
-      "explanation": "No `apple-touch-icon` link found."
+      "explanation": "No valid `apple-touch-icon` link found."
     },
     "splash-screen": {
       "id": "splash-screen",
@@ -4930,6 +4930,15 @@
       "lighthouse-core/audits/redirects.js | description": [
         "audits.redirects.description"
       ],
+      "lighthouse-core/audits/ios-pwa-icon.js | failureTitle": [
+        "audits[ios-pwa-icon].title"
+      ],
+      "lighthouse-core/audits/ios-pwa-icon.js | description": [
+        "audits[ios-pwa-icon].description"
+      ],
+      "lighthouse-core/audits/ios-pwa-icon.js | explanation": [
+        "audits[ios-pwa-icon].explanation"
+      ],
       "lighthouse-core/audits/mainthread-work-breakdown.js | title": [
         "audits[mainthread-work-breakdown].title"
       ],
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index 045a0112e3c0..fe108d4920a4 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -1041,12 +1041,12 @@
             "title": "Interactive elements indicate their purpose and state"
         },
         "ios-pwa-icon": {
-            "description": "In order to be installable as an iOS PWA web apps must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
-            "explanation": "No `apple-touch-icon` link found.",
+            "description": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+            "explanation": "No valid `apple-touch-icon` link found.",
             "id": "ios-pwa-icon",
             "score": 0.0,
             "scoreDisplayMode": "binary",
-            "title": "Web app does not have a valid iOS touch icon"
+            "title": "Site does not have a valid iOS touch icon"
         },
         "is-crawlable": {
             "description": "Search engines are unable to include your pages in search results if they don't have permission to crawl them. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/indexing).",

From 5239b85b044cc5d194e0728fb0650c08b764acb4 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 16:56:42 -0700
Subject: [PATCH 05/15] renamed files, updated a lot of things.  testing next.

---
 .../{ios-pwa-icon.js => apple-touch-icon.js}  | 56 +++++++++++++------
 lighthouse-core/config/default-config.js      |  4 +-
 lighthouse-core/lib/i18n/en-US.json           | 36 ++++++------
 ...-icon-test.js => apple-touch-icon-test.js} |  4 +-
 lighthouse-core/test/results/sample_v2.json   | 33 +++++------
 proto/sample_v2_round_trip.json               | 28 +++++-----
 6 files changed, 92 insertions(+), 69 deletions(-)
 rename lighthouse-core/audits/{ios-pwa-icon.js => apple-touch-icon.js} (53%)
 rename lighthouse-core/test/audits/{ios-pwa-icon-test.js => apple-touch-icon-test.js} (94%)

diff --git a/lighthouse-core/audits/ios-pwa-icon.js b/lighthouse-core/audits/apple-touch-icon.js
similarity index 53%
rename from lighthouse-core/audits/ios-pwa-icon.js
rename to lighthouse-core/audits/apple-touch-icon.js
index bc4148fed619..db9d8d99067b 100644
--- a/lighthouse-core/audits/ios-pwa-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -6,6 +6,7 @@
 'use strict';
 
 const Audit = require('./audit.js');
+const URL = require('../lib/url-shim');
 const i18n = require('../lib/i18n/i18n.js');
 
 /**
@@ -13,17 +14,19 @@ const i18n = require('../lib/i18n/i18n.js');
  */
 
 const UIStrings = {
-  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. "iOS" is the name of the Apple operating system and should not be translated. */
-  title: 'Site a valid iOS touch icon',
-  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. "iOS" is the name of the Apple operating system and should not be translated. */
-  failureTitle: 'Site does not have a valid iOS touch icon',
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. */
+  title: 'Provides a valid apple-touch-icon',
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. */
+  failureTitle: 'Does not provide a valid apple-touch-icon',
   /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
-  description:
-  'In order to be installable as an iOS PWA ' +
-  'sites must have a valid apple-touch-icon. ' +
-  '[Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).',
-  /** Explanatory message stating that there was a failure in an audit caused by the page having an invalid apple-touch-icon link. `apple-touch-icon` is a HTML tag value and should not be translated. */
-  explanation: 'No valid `apple-touch-icon` link found.',
+  description: 'In order to have a custom icon on iOS once ' +
+  'installed, a site must have a valid apple-touch-icon. ' +
+  '[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).',
+  /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attributes and should not be translated. */
+  precomposedWarning: '`apple-touch-icon-precomposed` is out of date, ' +
+  '`apple-touch-icon` is preferred.',
+  /** Explanatory message stating that there was a failure in an audit caused by the page's `apple-touch-icon` having an invalide `href` attribute. `apple-touch-icon` and `href` are HTML tag values and should not be translated. */
+  explanation: '`apple-touch-icon`\'s `href` attribute is not valid',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
@@ -34,7 +37,7 @@ class IosPwaIcon extends Audit {
    */
   static get meta() {
     return {
-      id: 'ios-pwa-icon',
+      id: 'apple-touch-icon',
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
@@ -44,23 +47,42 @@ class IosPwaIcon extends Audit {
 
   /**
    * @param {LH.Artifacts} artifacts
-   * @param {LH.Audit.Context} _
    * @return {LH.Audit.Product}
    */
-  static audit(artifacts, _) {
+  static audit(artifacts) {
+    let explanation;
     const appleTouchIcons = artifacts.LinkElements.filter(
-      el => el.rel === 'apple-touch-icon' && el.href !== undefined);
+      el => {
+        if (el.rel !== 'apple-touch-icon' && el.rel !== 'apple-touch-icon-precomposed'
+          || !el.href) {
+          return false;
+        }
+        // Check that the href is valid
+        try {
+          new URL(el.href);
+          return true;
+        } catch (e) {}
+        // Check if the href needs the base url to be valid
+        try {
+          new URL(el.href, artifacts.URL.finalUrl);
+          return true;
+        } catch (e) {
+          explanation = str_(UIStrings.explanation);
+          return false;
+        }
+      });
 
     // Audit passes if an `apple-touch-icon` exists.
     const passed = appleTouchIcons.length !== 0;
 
-    let explanation;
-    if (!passed) {
-      explanation = str_(UIStrings.explanation);
+    const warnings = [];
+    if (appleTouchIcons.filter(el => el.rel === 'apple-touch-icon-precomposed').length !== 0) {
+      warnings.push(str_(UIStrings.precomposedWarning));
     }
 
     return {
       score: passed ? 1 : 0,
+      warnings,
       explanation,
     };
   }
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index ffc3e3cbaf2b..42672983cf19 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -179,7 +179,7 @@ const defaultConfig = {
     'critical-request-chains',
     'redirects',
     'installable-manifest',
-    'ios-pwa-icon',
+    'apple-touch-icon',
     'splash-screen',
     'themed-omnibox',
     'content-width',
@@ -517,7 +517,6 @@ const defaultConfig = {
         {id: 'is-on-https', weight: 2, group: 'pwa-installable'},
         {id: 'service-worker', weight: 1, group: 'pwa-installable'},
         {id: 'installable-manifest', weight: 2, group: 'pwa-installable'},
-        {id: 'ios-pwa-icon', weight: 1, group: 'pwa-installable'},
         // PWA Optimized
         {id: 'redirects-http', weight: 2, group: 'pwa-optimized'},
         {id: 'splash-screen', weight: 1, group: 'pwa-optimized'},
@@ -525,6 +524,7 @@ const defaultConfig = {
         {id: 'content-width', weight: 1, group: 'pwa-optimized'},
         {id: 'viewport', weight: 2, group: 'pwa-optimized'},
         {id: 'without-javascript', weight: 1, group: 'pwa-optimized'},
+        {id: 'apple-touch-icon', weight: 1, group: 'pwa-optimized'},
         // Manual audits
         {id: 'pwa-cross-browser', weight: 0},
         {id: 'pwa-page-transitions', weight: 0},
diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index 056459e43673..a87bc37f2414 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -423,6 +423,26 @@
     "message": "`<video>` elements contain a `<track>` element with `[kind=\"description\"]`",
     "description": "Title of an accesibility audit that evaluates if all video elements have child track elements that contain a description of the video content. This title is descriptive of the successful state and is shown to users when no user action is required."
   },
+  "lighthouse-core/audits/apple-touch-icon.js | description": {
+    "message": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
+  },
+  "lighthouse-core/audits/apple-touch-icon.js | explanation": {
+    "message": "`apple-touch-icon`'s `href` attribute is not valid",
+    "description": "Explanatory message stating that there was a failure in an audit caused by the page's `apple-touch-icon` having an invalide `href` attribute. `apple-touch-icon` and `href` are HTML tag values and should not be translated."
+  },
+  "lighthouse-core/audits/apple-touch-icon.js | failureTitle": {
+    "message": "Does not provide a valid apple-touch-icon",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon."
+  },
+  "lighthouse-core/audits/apple-touch-icon.js | precomposedWarning": {
+    "message": "`apple-touch-icon-precomposed` is out of date, `apple-touch-icon` is preferred.",
+    "description": "Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  \"apple-touch-icon-precomposed\" and \"apple-touch-icon\" are HTML attributes and should not be translated."
+  },
+  "lighthouse-core/audits/apple-touch-icon.js | title": {
+    "message": "Provides a valid apple-touch-icon",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon."
+  },
   "lighthouse-core/audits/bootup-time.js | chromeExtensionsWarning": {
     "message": "Chrome extensions negatively affected this page's load performance. Try auditing the page in incognito mode or from a Chrome profile without extensions.",
     "description": "A message displayed in a Lighthouse audit result warning that Chrome extensions on the user's system substantially affected Lighthouse's measurements and instructs the user on how to run again without those extensions."
@@ -635,22 +655,6 @@
     "message": "All text remains visible during webfont loads",
     "description": "Title of a diagnostic audit that provides detail on if all the text on a webpage was visible while the page was loading its webfonts. This descriptive title is shown to users when the amount is acceptable and no user action is required."
   },
-  "lighthouse-core/audits/ios-pwa-icon.js | description": {
-    "message": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
-    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
-  },
-  "lighthouse-core/audits/ios-pwa-icon.js | explanation": {
-    "message": "No valid `apple-touch-icon` link found.",
-    "description": "Explanatory message stating that there was a failure in an audit caused by the page having an invalid apple-touch-icon link. `apple-touch-icon` is a HTML tag value and should not be translated."
-  },
-  "lighthouse-core/audits/ios-pwa-icon.js | failureTitle": {
-    "message": "Site does not have a valid iOS touch icon",
-    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. \"iOS\" is the name of the Apple operating system and should not be translated."
-  },
-  "lighthouse-core/audits/ios-pwa-icon.js | title": {
-    "message": "Site a valid iOS touch icon",
-    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. \"iOS\" is the name of the Apple operating system and should not be translated."
-  },
   "lighthouse-core/audits/load-fast-enough-for-pwa.js | description": {
     "message": "A fast page load over a cellular network ensures a good mobile user experience. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/fast-3g).",
     "description": "Description of a Lighthouse audit that tells the user *why* they need to load fast enough on mobile networks. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
diff --git a/lighthouse-core/test/audits/ios-pwa-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
similarity index 94%
rename from lighthouse-core/test/audits/ios-pwa-icon-test.js
rename to lighthouse-core/test/audits/apple-touch-icon-test.js
index febe6787a286..d558a5fceda3 100644
--- a/lighthouse-core/test/audits/ios-pwa-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const IosPwaIcon = require('../../audits/ios-pwa-icon.js');
+const IosPwaIcon = require('../../audits/apple-touch-icon.js');
 
 /* eslint-env jest */
 
-describe('PWA: ios-pwa-icon audit', () => {
+describe('PWA: apple-touch-icon audit', () => {
   it(`fails when apple-touch-icon is not present`, async () => {
     const artifacts = {
       LinkElements: [],
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index 67153a614003..76685fec4b1f 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -476,13 +476,13 @@
         ]
       }
     },
-    "ios-pwa-icon": {
-      "id": "ios-pwa-icon",
-      "title": "Site does not have a valid iOS touch icon",
-      "description": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
+    "apple-touch-icon": {
+      "id": "apple-touch-icon",
+      "title": "Does not provide a valid apple-touch-icon",
+      "description": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
       "score": 0,
       "scoreDisplayMode": "binary",
-      "explanation": "No valid `apple-touch-icon` link found."
+      "warnings": []
     },
     "splash-screen": {
       "id": "splash-screen",
@@ -3668,11 +3668,6 @@
           "weight": 2,
           "group": "pwa-installable"
         },
-        {
-          "id": "ios-pwa-icon",
-          "weight": 1,
-          "group": "pwa-installable"
-        },
         {
           "id": "redirects-http",
           "weight": 2,
@@ -3703,6 +3698,11 @@
           "weight": 1,
           "group": "pwa-optimized"
         },
+        {
+          "id": "apple-touch-icon",
+          "weight": 1,
+          "group": "pwa-optimized"
+        },
         {
           "id": "pwa-cross-browser",
           "weight": 0
@@ -4088,7 +4088,7 @@
       },
       {
         "startTime": 0,
-        "name": "lh:audit:ios-pwa-icon",
+        "name": "lh:audit:apple-touch-icon",
         "duration": 100,
         "entryType": "measure"
       },
@@ -4930,14 +4930,11 @@
       "lighthouse-core/audits/redirects.js | description": [
         "audits.redirects.description"
       ],
-      "lighthouse-core/audits/ios-pwa-icon.js | failureTitle": [
-        "audits[ios-pwa-icon].title"
-      ],
-      "lighthouse-core/audits/ios-pwa-icon.js | description": [
-        "audits[ios-pwa-icon].description"
+      "lighthouse-core/audits/apple-touch-icon.js | failureTitle": [
+        "audits[apple-touch-icon].title"
       ],
-      "lighthouse-core/audits/ios-pwa-icon.js | explanation": [
-        "audits[ios-pwa-icon].explanation"
+      "lighthouse-core/audits/apple-touch-icon.js | description": [
+        "audits[apple-touch-icon].description"
       ],
       "lighthouse-core/audits/mainthread-work-breakdown.js | title": [
         "audits[mainthread-work-breakdown].title"
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index fe108d4920a4..3f3dbd5c68a2 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -20,6 +20,14 @@
             "scoreDisplayMode": "binary",
             "title": "Uses Application Cache"
         },
+        "apple-touch-icon": {
+            "description": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+            "id": "apple-touch-icon",
+            "score": 0.0,
+            "scoreDisplayMode": "binary",
+            "title": "Does not provide a valid apple-touch-icon",
+            "warnings": []
+        },
         "aria-allowed-attr": {
             "description": "Each ARIA `role` supports a specific subset of `aria-*` attributes. Mismatching these invalidates the `aria-*` attributes. [Learn more](https://dequeuniversity.com/rules/axe/3.1/aria-allowed-attr?application=lighthouse).",
             "id": "aria-allowed-attr",
@@ -1040,14 +1048,6 @@
             "scoreDisplayMode": "manual",
             "title": "Interactive elements indicate their purpose and state"
         },
-        "ios-pwa-icon": {
-            "description": "In order to be installable as an iOS PWA sites must have a valid apple-touch-icon. [Learn More](https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html).",
-            "explanation": "No valid `apple-touch-icon` link found.",
-            "id": "ios-pwa-icon",
-            "score": 0.0,
-            "scoreDisplayMode": "binary",
-            "title": "Site does not have a valid iOS touch icon"
-        },
         "is-crawlable": {
             "description": "Search engines are unable to include your pages in search results if they don't have permission to crawl them. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/indexing).",
             "details": {
@@ -3529,11 +3529,6 @@
                     "id": "installable-manifest",
                     "weight": 2.0
                 },
-                {
-                    "group": "pwa-installable",
-                    "id": "ios-pwa-icon",
-                    "weight": 1.0
-                },
                 {
                     "group": "pwa-optimized",
                     "id": "redirects-http",
@@ -3564,6 +3559,11 @@
                     "id": "without-javascript",
                     "weight": 1.0
                 },
+                {
+                    "group": "pwa-optimized",
+                    "id": "apple-touch-icon",
+                    "weight": 1.0
+                },
                 {
                     "id": "pwa-cross-browser",
                     "weight": 0.0
@@ -4092,7 +4092,7 @@
             {
                 "duration": 100.0,
                 "entryType": "measure",
-                "name": "lh:audit:ios-pwa-icon",
+                "name": "lh:audit:apple-touch-icon",
                 "startTime": 0.0
             },
             {

From bbc3374df5663b30daf9a61da0446ab3a62e609d Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 17:09:43 -0700
Subject: [PATCH 06/15] tests

---
 .../test/cli/__snapshots__/index-test.js.snap | 12 ++---
 .../test/audits/apple-touch-icon-test.js      | 44 ++++++++++++++++---
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
index ea19819b1d63..13268b7bcf6d 100644
--- a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
+++ b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
@@ -70,7 +70,7 @@ Object {
       "path": "installable-manifest",
     },
     Object {
-      "path": "ios-pwa-icon",
+      "path": "apple-touch-icon",
     },
     Object {
       "path": "splash-screen",
@@ -896,11 +896,6 @@ Object {
           "id": "installable-manifest",
           "weight": 2,
         },
-        Object {
-          "group": "pwa-installable",
-          "id": "ios-pwa-icon",
-          "weight": 1,
-        },
         Object {
           "group": "pwa-optimized",
           "id": "redirects-http",
@@ -931,6 +926,11 @@ Object {
           "id": "without-javascript",
           "weight": 1,
         },
+        Object {
+          "group": "pwa-optimized",
+          "id": "apple-touch-icon",
+          "weight": 1,
+        },
         Object {
           "id": "pwa-cross-browser",
           "weight": 0,
diff --git a/lighthouse-core/test/audits/apple-touch-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
index d558a5fceda3..fe2262775bf7 100644
--- a/lighthouse-core/test/audits/apple-touch-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -16,10 +16,9 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+    const {score} = IosPwaIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
-    expect(explanation).toBeDisplayString('No valid `apple-touch-icon` link found.');
   });
 
   it(`fails when apple-touch-icon does not have an href`, async () => {
@@ -27,11 +26,35 @@ describe('PWA: apple-touch-icon audit', () => {
       LinkElements: [{rel: 'apple-touch-icon'}],
     };
 
+    const context = {settings: {}, computedCache: new Map()};
+    const {score} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(0);
+  });
+
+  it(`fails when apple-touch-icon href is invalid`, async () => {
+    const artifacts = {
+      LinkElements: [{rel: 'apple-touch-icon', href: 'not-a-url'}],
+    };
+
     const context = {settings: {}, computedCache: new Map()};
     const {score, explanation} = IosPwaIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
-    expect(explanation).toBeDisplayString('No valid `apple-touch-icon` link found.');
+    expect(explanation).toBeDisplayString('`apple-touch-icon`\'s `href` attribute is not valid');
+  });
+
+  it(`warns when apple-touch-icon-precomposed exists`, async () => {
+    const artifacts = {
+      LinkElements: [{rel: 'apple-touch-icon-precomposed', href: 'https://example.com/touch-icon.png'}],
+    };
+
+    const context = {settings: {}, computedCache: new Map()};
+    const {score, warnings} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(1);
+    expect(warnings[0]).toBeDisplayString('`apple-touch-icon-precomposed` is ' +
+      'out of date, `apple-touch-icon` is preferred.');
   });
 
   it(`passes when apple-touch-icon is on page`, async () => {
@@ -40,9 +63,20 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+    const {score} = IosPwaIcon.audit(artifacts, context);
+
+    expect(score).toBe(1);
+  });
+
+  it(`passes when apple-touch-icon is on page with href requiring base_url`, async () => {
+    const artifacts = {
+      URL: {finalUrl: 'https://example.com/'},
+      LinkElements: [{rel: 'apple-touch-icon', href: 'touch-icon.png'}],
+    };
+
+    const context = {settings: {}, computedCache: new Map()};
+    const {score} = IosPwaIcon.audit(artifacts, context);
 
     expect(score).toBe(1);
-    expect(explanation).toBeUndefined();
   });
 });

From 4f117817791a00eb64b4f14f19b031d7d00d7ce8 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 17:13:36 -0700
Subject: [PATCH 07/15] rename test var

---
 .../test/audits/apple-touch-icon-test.js           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lighthouse-core/test/audits/apple-touch-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
index fe2262775bf7..0b7f8b2788df 100644
--- a/lighthouse-core/test/audits/apple-touch-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const IosPwaIcon = require('../../audits/apple-touch-icon.js');
+const AppleTouchIcon = require('../../audits/apple-touch-icon.js');
 
 /* eslint-env jest */
 
@@ -16,7 +16,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score} = IosPwaIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
   });
@@ -27,7 +27,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score} = IosPwaIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
   });
@@ -38,7 +38,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score, explanation} = IosPwaIcon.audit(artifacts, context);
+    const {score, explanation} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(0);
     expect(explanation).toBeDisplayString('`apple-touch-icon`\'s `href` attribute is not valid');
@@ -50,7 +50,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score, warnings} = IosPwaIcon.audit(artifacts, context);
+    const {score, warnings} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(1);
     expect(warnings[0]).toBeDisplayString('`apple-touch-icon-precomposed` is ' +
@@ -63,7 +63,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score} = IosPwaIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(1);
   });
@@ -75,7 +75,7 @@ describe('PWA: apple-touch-icon audit', () => {
     };
 
     const context = {settings: {}, computedCache: new Map()};
-    const {score} = IosPwaIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts, context);
 
     expect(score).toBe(1);
   });

From 95d15c029482651c5cbf9238060d4021a82a0ba1 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 17:25:26 -0700
Subject: [PATCH 08/15] added apple-touch-icon to pwa expectations

---
 lighthouse-cli/test/smokehouse/pwa-expectations.js  | 3 +++
 lighthouse-cli/test/smokehouse/pwa2-expectations.js | 3 +++
 lighthouse-cli/test/smokehouse/pwa3-expectations.js | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/lighthouse-cli/test/smokehouse/pwa-expectations.js b/lighthouse-cli/test/smokehouse/pwa-expectations.js
index b4a91c98c0b1..bb0af93846fe 100644
--- a/lighthouse-cli/test/smokehouse/pwa-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa-expectations.js
@@ -66,6 +66,9 @@ module.exports = [
         'content-width': {
           score: 1,
         },
+        'apple-touch-icon': {
+          score: 0,
+        },
 
         // "manual" audits. Just verify in the results.
         'pwa-cross-browser': {
diff --git a/lighthouse-cli/test/smokehouse/pwa2-expectations.js b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
index 3a56038d3e74..5d3c17c9fe84 100644
--- a/lighthouse-cli/test/smokehouse/pwa2-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
@@ -61,6 +61,9 @@ module.exports = [
         'content-width': {
           score: 1,
         },
+        'apple-touch-icon': {
+          score: 0,
+        },
 
         // "manual" audits. Just verify in the results.
         'pwa-cross-browser': {
diff --git a/lighthouse-cli/test/smokehouse/pwa3-expectations.js b/lighthouse-cli/test/smokehouse/pwa3-expectations.js
index 351a34272daf..9aab71218e25 100644
--- a/lighthouse-cli/test/smokehouse/pwa3-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa3-expectations.js
@@ -58,6 +58,9 @@ module.exports = [
         'content-width': {
           score: 1,
         },
+        'apple-touch-icon': {
+          score: 0,
+        },
 
         // "manual" audits. Just verify in the results.
         'pwa-cross-browser': {

From 910ed1f24f401b9ce412ffac2f4449c0aaee23f3 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 18:23:50 -0700
Subject: [PATCH 09/15] Paul's wording.  Figured out base_url

---
 lighthouse-core/audits/apple-touch-icon.js    | 19 ++++++---------
 .../test/audits/apple-touch-icon-test.js      | 23 +++++++++----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index db9d8d99067b..8409e91e982d 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -18,9 +18,9 @@ const UIStrings = {
   title: 'Provides a valid apple-touch-icon',
   /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. */
   failureTitle: 'Does not provide a valid apple-touch-icon',
-  /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
-  description: 'In order to have a custom icon on iOS once ' +
-  'installed, a site must have a valid apple-touch-icon. ' +
+  /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. "apple-touch-icon" is an HTML attribute and should not be translated. */
+  description: 'For ideal appearance on iOS when users add to the home screen, define an ' +
+  '`apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.' +
   '[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).',
   /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attributes and should not be translated. */
   precomposedWarning: '`apple-touch-icon-precomposed` is out of date, ' +
@@ -51,18 +51,13 @@ class IosPwaIcon extends Audit {
    */
   static audit(artifacts) {
     let explanation;
-    const appleTouchIcons = artifacts.LinkElements.filter(
-      el => {
-        if (el.rel !== 'apple-touch-icon' && el.rel !== 'apple-touch-icon-precomposed'
-          || !el.href) {
+    const appleTouchIcons = artifacts.LinkElements
+      .filter(el => el.rel === 'apple-touch-icon' || el.rel === 'apple-touch-icon-precomposed')
+      .filter(el => {
+        if (!el.href) {
           return false;
         }
         // Check that the href is valid
-        try {
-          new URL(el.href);
-          return true;
-        } catch (e) {}
-        // Check if the href needs the base url to be valid
         try {
           new URL(el.href, artifacts.URL.finalUrl);
           return true;
diff --git a/lighthouse-core/test/audits/apple-touch-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
index 0b7f8b2788df..74e6674fedca 100644
--- a/lighthouse-core/test/audits/apple-touch-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -12,33 +12,33 @@ const AppleTouchIcon = require('../../audits/apple-touch-icon.js');
 describe('PWA: apple-touch-icon audit', () => {
   it(`fails when apple-touch-icon is not present`, async () => {
     const artifacts = {
+      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score} = AppleTouchIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(0);
   });
 
   it(`fails when apple-touch-icon does not have an href`, async () => {
     const artifacts = {
+      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon'}],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score} = AppleTouchIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(0);
   });
 
   it(`fails when apple-touch-icon href is invalid`, async () => {
     const artifacts = {
+      URL: {finalUrl: 'not-a-base-url'},
       LinkElements: [{rel: 'apple-touch-icon', href: 'not-a-url'}],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score, explanation} = AppleTouchIcon.audit(artifacts, context);
+    const {score, explanation} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(0);
     expect(explanation).toBeDisplayString('`apple-touch-icon`\'s `href` attribute is not valid');
@@ -46,11 +46,11 @@ describe('PWA: apple-touch-icon audit', () => {
 
   it(`warns when apple-touch-icon-precomposed exists`, async () => {
     const artifacts = {
+      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon-precomposed', href: 'https://example.com/touch-icon.png'}],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score, warnings} = AppleTouchIcon.audit(artifacts, context);
+    const {score, warnings} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(1);
     expect(warnings[0]).toBeDisplayString('`apple-touch-icon-precomposed` is ' +
@@ -59,11 +59,11 @@ describe('PWA: apple-touch-icon audit', () => {
 
   it(`passes when apple-touch-icon is on page`, async () => {
     const artifacts = {
+      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon', href: 'https://example.com/touch-icon.png'}],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score} = AppleTouchIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(1);
   });
@@ -74,8 +74,7 @@ describe('PWA: apple-touch-icon audit', () => {
       LinkElements: [{rel: 'apple-touch-icon', href: 'touch-icon.png'}],
     };
 
-    const context = {settings: {}, computedCache: new Map()};
-    const {score} = AppleTouchIcon.audit(artifacts, context);
+    const {score} = AppleTouchIcon.audit(artifacts);
 
     expect(score).toBe(1);
   });

From 66fd11c024f021fc134dae6a1b7b2f6775859952 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 18:27:20 -0700
Subject: [PATCH 10/15] updated assets

---
 lighthouse-core/lib/i18n/en-US.json         | 4 ++--
 lighthouse-core/test/results/sample_v2.json | 2 +-
 proto/sample_v2_round_trip.json             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index a87bc37f2414..37e684915814 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -424,8 +424,8 @@
     "description": "Title of an accesibility audit that evaluates if all video elements have child track elements that contain a description of the video content. This title is descriptive of the successful state and is shown to users when no user action is required."
   },
   "lighthouse-core/audits/apple-touch-icon.js | description": {
-    "message": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
-    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation."
+    "message": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. \"apple-touch-icon\" is an HTML attribute and should not be translated."
   },
   "lighthouse-core/audits/apple-touch-icon.js | explanation": {
     "message": "`apple-touch-icon`'s `href` attribute is not valid",
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index 76685fec4b1f..cc0f115eeb93 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -479,7 +479,7 @@
     "apple-touch-icon": {
       "id": "apple-touch-icon",
       "title": "Does not provide a valid apple-touch-icon",
-      "description": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+      "description": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
       "score": 0,
       "scoreDisplayMode": "binary",
       "warnings": []
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index 3f3dbd5c68a2..09d9287af7e4 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -21,7 +21,7 @@
             "title": "Uses Application Cache"
         },
         "apple-touch-icon": {
-            "description": "In order to have a custom icon on iOS once installed, a site must have a valid apple-touch-icon. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+            "description": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
             "id": "apple-touch-icon",
             "score": 0.0,
             "scoreDisplayMode": "binary",

From a45afbcc913654a11a51cbc90d3d819bb9db1e57 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Sun, 5 May 2019 21:39:14 -0700
Subject: [PATCH 11/15] null -> {}

---
 proto/sample_v2_round_trip.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index 09d9287af7e4..fc352df5f20d 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -1108,7 +1108,7 @@
                         "name": "WordPress"
                     }
                 ],
-                "summary": null,
+                "summary": {},
                 "type": "table"
             },
             "id": "js-libraries",
@@ -1235,7 +1235,7 @@
             "details": {
                 "headings": [],
                 "items": [],
-                "summary": null,
+                "summary": {},
                 "type": "table"
             },
             "id": "link-text",
@@ -1891,7 +1891,7 @@
                         "vulnCount": 2.0
                     }
                 ],
-                "summary": null,
+                "summary": {},
                 "type": "table"
             },
             "displayValue": "2 vulnerabilities detected",

From 52e05283c68dc0bc5e8a02c1ecc46982fa8bf9f2 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Mon, 6 May 2019 10:32:06 -0700
Subject: [PATCH 12/15] Remove URL checks.  Update pwa expectations, don't know
 how they passed before? Removed href explanation.  Updated en-US.

---
 .../test/smokehouse/pwa-expectations.js       |  5 +++-
 .../test/smokehouse/pwa2-expectations.js      |  5 +++-
 .../test/smokehouse/pwa3-expectations.js      |  2 +-
 lighthouse-core/audits/apple-touch-icon.js    | 23 +++----------------
 lighthouse-core/lib/i18n/en-US.json           |  4 ----
 .../test/audits/apple-touch-icon-test.js      | 12 ----------
 6 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/lighthouse-cli/test/smokehouse/pwa-expectations.js b/lighthouse-cli/test/smokehouse/pwa-expectations.js
index bb0af93846fe..85616240be77 100644
--- a/lighthouse-cli/test/smokehouse/pwa-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa-expectations.js
@@ -67,7 +67,7 @@ module.exports = [
           score: 1,
         },
         'apple-touch-icon': {
-          score: 0,
+          score: 1,
         },
 
         // "manual" audits. Just verify in the results.
@@ -131,6 +131,9 @@ module.exports = [
         'content-width': {
           score: 1,
         },
+        'apple-touch-icon': {
+          score: 1,
+        },
 
         // "manual" audits. Just verify in the results.
         'pwa-cross-browser': {
diff --git a/lighthouse-cli/test/smokehouse/pwa2-expectations.js b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
index 5d3c17c9fe84..c26fd00fc680 100644
--- a/lighthouse-cli/test/smokehouse/pwa2-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
@@ -62,7 +62,7 @@ module.exports = [
           score: 1,
         },
         'apple-touch-icon': {
-          score: 0,
+          score: 1,
         },
 
         // "manual" audits. Just verify in the results.
@@ -126,6 +126,9 @@ module.exports = [
         'content-width': {
           score: 1,
         },
+        'apple-touch-icon': {
+          score: 0,
+        },
 
         // "manual" audits. Just verify in the results.
         'pwa-cross-browser': {
diff --git a/lighthouse-cli/test/smokehouse/pwa3-expectations.js b/lighthouse-cli/test/smokehouse/pwa3-expectations.js
index 9aab71218e25..d05f37387f03 100644
--- a/lighthouse-cli/test/smokehouse/pwa3-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa3-expectations.js
@@ -59,7 +59,7 @@ module.exports = [
           score: 1,
         },
         'apple-touch-icon': {
-          score: 0,
+          score: 1,
         },
 
         // "manual" audits. Just verify in the results.
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 8409e91e982d..992c1863ed84 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -6,7 +6,6 @@
 'use strict';
 
 const Audit = require('./audit.js');
-const URL = require('../lib/url-shim');
 const i18n = require('../lib/i18n/i18n.js');
 
 /**
@@ -25,13 +24,11 @@ const UIStrings = {
   /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attributes and should not be translated. */
   precomposedWarning: '`apple-touch-icon-precomposed` is out of date, ' +
   '`apple-touch-icon` is preferred.',
-  /** Explanatory message stating that there was a failure in an audit caused by the page's `apple-touch-icon` having an invalide `href` attribute. `apple-touch-icon` and `href` are HTML tag values and should not be translated. */
-  explanation: '`apple-touch-icon`\'s `href` attribute is not valid',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
-class IosPwaIcon extends Audit {
+class AppleTouchIcon extends Audit {
   /**
    * @return {LH.Audit.Meta}
    */
@@ -50,22 +47,9 @@ class IosPwaIcon extends Audit {
    * @return {LH.Audit.Product}
    */
   static audit(artifacts) {
-    let explanation;
     const appleTouchIcons = artifacts.LinkElements
       .filter(el => el.rel === 'apple-touch-icon' || el.rel === 'apple-touch-icon-precomposed')
-      .filter(el => {
-        if (!el.href) {
-          return false;
-        }
-        // Check that the href is valid
-        try {
-          new URL(el.href, artifacts.URL.finalUrl);
-          return true;
-        } catch (e) {
-          explanation = str_(UIStrings.explanation);
-          return false;
-        }
-      });
+      .filter(el => !!el.href);
 
     // Audit passes if an `apple-touch-icon` exists.
     const passed = appleTouchIcons.length !== 0;
@@ -78,10 +62,9 @@ class IosPwaIcon extends Audit {
     return {
       score: passed ? 1 : 0,
       warnings,
-      explanation,
     };
   }
 }
 
-module.exports = IosPwaIcon;
+module.exports = AppleTouchIcon;
 module.exports.UIStrings = UIStrings;
diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index 37e684915814..17c728be5394 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -427,10 +427,6 @@
     "message": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
     "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. \"apple-touch-icon\" is an HTML attribute and should not be translated."
   },
-  "lighthouse-core/audits/apple-touch-icon.js | explanation": {
-    "message": "`apple-touch-icon`'s `href` attribute is not valid",
-    "description": "Explanatory message stating that there was a failure in an audit caused by the page's `apple-touch-icon` having an invalide `href` attribute. `apple-touch-icon` and `href` are HTML tag values and should not be translated."
-  },
   "lighthouse-core/audits/apple-touch-icon.js | failureTitle": {
     "message": "Does not provide a valid apple-touch-icon",
     "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon."
diff --git a/lighthouse-core/test/audits/apple-touch-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
index 74e6674fedca..0dfb16f807bb 100644
--- a/lighthouse-core/test/audits/apple-touch-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -32,18 +32,6 @@ describe('PWA: apple-touch-icon audit', () => {
     expect(score).toBe(0);
   });
 
-  it(`fails when apple-touch-icon href is invalid`, async () => {
-    const artifacts = {
-      URL: {finalUrl: 'not-a-base-url'},
-      LinkElements: [{rel: 'apple-touch-icon', href: 'not-a-url'}],
-    };
-
-    const {score, explanation} = AppleTouchIcon.audit(artifacts);
-
-    expect(score).toBe(0);
-    expect(explanation).toBeDisplayString('`apple-touch-icon`\'s `href` attribute is not valid');
-  });
-
   it(`warns when apple-touch-icon-precomposed exists`, async () => {
     const artifacts = {
       URL: {finalUrl: 'https://example.com/'},

From fe0e3feb2e0775902629faddb1f12fd936a76dff Mon Sep 17 00:00:00 2001
From: Paul Irish <paulirish@google.com>
Date: Mon, 6 May 2019 12:42:40 -0700
Subject: [PATCH 13/15] description whitespace

---
 lighthouse-core/audits/apple-touch-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 992c1863ed84..839eb071e5e0 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -19,7 +19,7 @@ const UIStrings = {
   failureTitle: 'Does not provide a valid apple-touch-icon',
   /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. "apple-touch-icon" is an HTML attribute and should not be translated. */
   description: 'For ideal appearance on iOS when users add to the home screen, define an ' +
-  '`apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.' +
+  'apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. ' +
   '[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).',
   /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attributes and should not be translated. */
   precomposedWarning: '`apple-touch-icon-precomposed` is out of date, ' +

From 35542b78ffc429fd8cc2d3c59756dcb3e678e762 Mon Sep 17 00:00:00 2001
From: Paul Irish <paulirish@google.com>
Date: Mon, 6 May 2019 13:08:01 -0700
Subject: [PATCH 14/15] sample json

---
 lighthouse-core/lib/i18n/en-US.json         | 2 +-
 lighthouse-core/test/results/sample_v2.json | 2 +-
 proto/sample_v2_round_trip.json             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index 17c728be5394..ab0a3a5f3eff 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -424,7 +424,7 @@
     "description": "Title of an accesibility audit that evaluates if all video elements have child track elements that contain a description of the video content. This title is descriptive of the successful state and is shown to users when no user action is required."
   },
   "lighthouse-core/audits/apple-touch-icon.js | description": {
-    "message": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+    "message": "For ideal appearance on iOS when users add to the home screen, define an apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
     "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. \"apple-touch-icon\" is an HTML attribute and should not be translated."
   },
   "lighthouse-core/audits/apple-touch-icon.js | failureTitle": {
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index cc0f115eeb93..01a3e79dad89 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -479,7 +479,7 @@
     "apple-touch-icon": {
       "id": "apple-touch-icon",
       "title": "Does not provide a valid apple-touch-icon",
-      "description": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+      "description": "For ideal appearance on iOS when users add to the home screen, define an apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
       "score": 0,
       "scoreDisplayMode": "binary",
       "warnings": []
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index fc352df5f20d..df149e460671 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -21,7 +21,7 @@
             "title": "Uses Application Cache"
         },
         "apple-touch-icon": {
-            "description": "For ideal appearance on iOS when users add to the home screen, define an `apple-touch-icon`. It must point to a non-transparent 192px (or 180px) square PNG.[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
+            "description": "For ideal appearance on iOS when users add to the home screen, define an apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
             "id": "apple-touch-icon",
             "score": 0.0,
             "scoreDisplayMode": "binary",

From 698e0c0a793d3b2b43264d0b022db5b445b471f1 Mon Sep 17 00:00:00 2001
From: Shane Exterkamp <shaneexterkamp5@gmail.com>
Date: Mon, 6 May 2019 15:27:16 -0700
Subject: [PATCH 15/15] more tests. updates

---
 .../test/smokehouse/pwa2-expectations.js      |  3 +
 lighthouse-core/audits/apple-touch-icon.js    | 19 ++++---
 lighthouse-core/lib/i18n/en-US.json           | 14 ++---
 .../test/audits/apple-touch-icon-test.js      | 55 ++++++++++++++-----
 lighthouse-core/test/results/sample_v2.json   |  2 +-
 proto/sample_v2_round_trip.json               |  2 +-
 6 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/lighthouse-cli/test/smokehouse/pwa2-expectations.js b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
index c26fd00fc680..b8b93d09b62d 100644
--- a/lighthouse-cli/test/smokehouse/pwa2-expectations.js
+++ b/lighthouse-cli/test/smokehouse/pwa2-expectations.js
@@ -63,6 +63,9 @@ module.exports = [
         },
         'apple-touch-icon': {
           score: 1,
+          warnings: [
+            /apple-touch-icon-precomposed/,
+          ],
         },
 
         // "manual" audits. Just verify in the results.
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 839eb071e5e0..46313a29e1e6 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -9,20 +9,20 @@ const Audit = require('./audit.js');
 const i18n = require('../lib/i18n/i18n.js');
 
 /**
- * @fileoverview Audits if a page's web app has an icon link for iOS installability.
+ * @fileoverview Audits if a page has an `apple-touch-icon` link element with a valid href.
  */
 
 const UIStrings = {
-  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. */
-  title: 'Provides a valid apple-touch-icon',
-  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. */
-  failureTitle: 'Does not provide a valid apple-touch-icon',
-  /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. "apple-touch-icon" is an HTML attribute and should not be translated. */
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. "apple-touch-icon" is an HTML attribute value and should not be translated. */
+  title: 'Provides a valid `apple-touch-icon`',
+  /** Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. "apple-touch-icon" is an HTML attribute value and should not be translated. */
+  failureTitle: 'Does not provide a valid `apple-touch-icon`',
+  /** Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. "apple-touch-icon" is an HTML attribute value and should not be translated. */
   description: 'For ideal appearance on iOS when users add to the home screen, define an ' +
   'apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. ' +
   '[Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).',
-  /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attributes and should not be translated. */
-  precomposedWarning: '`apple-touch-icon-precomposed` is out of date, ' +
+  /** Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  "apple-touch-icon-precomposed" and "apple-touch-icon" are HTML attribute values and should not be translated. */
+  precomposedWarning: '`apple-touch-icon-precomposed` is out of date; ' +
   '`apple-touch-icon` is preferred.',
 };
 
@@ -55,7 +55,8 @@ class AppleTouchIcon extends Audit {
     const passed = appleTouchIcons.length !== 0;
 
     const warnings = [];
-    if (appleTouchIcons.filter(el => el.rel === 'apple-touch-icon-precomposed').length !== 0) {
+    if (appleTouchIcons.filter(el => el.rel === 'apple-touch-icon-precomposed').length !== 0
+      && appleTouchIcons.filter(el => el.rel === 'apple-touch-icon').length === 0) {
       warnings.push(str_(UIStrings.precomposedWarning));
     }
 
diff --git a/lighthouse-core/lib/i18n/en-US.json b/lighthouse-core/lib/i18n/en-US.json
index ab0a3a5f3eff..b2d17c82babd 100644
--- a/lighthouse-core/lib/i18n/en-US.json
+++ b/lighthouse-core/lib/i18n/en-US.json
@@ -425,19 +425,19 @@
   },
   "lighthouse-core/audits/apple-touch-icon.js | description": {
     "message": "For ideal appearance on iOS when users add to the home screen, define an apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
-    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. \"apple-touch-icon\" is an HTML attribute and should not be translated."
+    "description": "Description of a Lighthouse audit that tells the user what having a valid apple-touch-icon does. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. \"apple-touch-icon\" is an HTML attribute value and should not be translated."
   },
   "lighthouse-core/audits/apple-touch-icon.js | failureTitle": {
-    "message": "Does not provide a valid apple-touch-icon",
-    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon."
+    "message": "Does not provide a valid `apple-touch-icon`",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page does not contain a valid iOS touch icon. \"apple-touch-icon\" is an HTML attribute value and should not be translated."
   },
   "lighthouse-core/audits/apple-touch-icon.js | precomposedWarning": {
-    "message": "`apple-touch-icon-precomposed` is out of date, `apple-touch-icon` is preferred.",
-    "description": "Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  \"apple-touch-icon-precomposed\" and \"apple-touch-icon\" are HTML attributes and should not be translated."
+    "message": "`apple-touch-icon-precomposed` is out of date; `apple-touch-icon` is preferred.",
+    "description": "Warning that HTML attribute `apple-touch-icon-precomposed` should not be used in favor of `apple-touch-icon`.  \"apple-touch-icon-precomposed\" and \"apple-touch-icon\" are HTML attribute values and should not be translated."
   },
   "lighthouse-core/audits/apple-touch-icon.js | title": {
-    "message": "Provides a valid apple-touch-icon",
-    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon."
+    "message": "Provides a valid `apple-touch-icon`",
+    "description": "Title of a Lighthouse audit that tells the user that their site contains a vaild touch icon. This descriptive title is shown when the page contains a valid iOS touch icon. \"apple-touch-icon\" is an HTML attribute value and should not be translated."
   },
   "lighthouse-core/audits/bootup-time.js | chromeExtensionsWarning": {
     "message": "Chrome extensions negatively affected this page's load performance. Try auditing the page in incognito mode or from a Chrome profile without extensions.",
diff --git a/lighthouse-core/test/audits/apple-touch-icon-test.js b/lighthouse-core/test/audits/apple-touch-icon-test.js
index 0dfb16f807bb..39ce2a1b0ade 100644
--- a/lighthouse-core/test/audits/apple-touch-icon-test.js
+++ b/lighthouse-core/test/audits/apple-touch-icon-test.js
@@ -10,10 +10,12 @@ const AppleTouchIcon = require('../../audits/apple-touch-icon.js');
 /* eslint-env jest */
 
 describe('PWA: apple-touch-icon audit', () => {
-  it(`fails when apple-touch-icon is not present`, async () => {
+  it(`fails when apple-touch-icon is not present`, () => {
     const artifacts = {
-      URL: {finalUrl: 'https://example.com/'},
-      LinkElements: [],
+      LinkElements: [
+        {rel: 'iOS-touch-thing', href: 'https://example.com/else.png'},
+        {rel: 'something else', href: 'https://example.com/else.png'},
+      ],
     };
 
     const {score} = AppleTouchIcon.audit(artifacts);
@@ -21,9 +23,8 @@ describe('PWA: apple-touch-icon audit', () => {
     expect(score).toBe(0);
   });
 
-  it(`fails when apple-touch-icon does not have an href`, async () => {
+  it(`fails when apple-touch-icon does not have an href`, () => {
     const artifacts = {
-      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon'}],
     };
 
@@ -32,9 +33,8 @@ describe('PWA: apple-touch-icon audit', () => {
     expect(score).toBe(0);
   });
 
-  it(`warns when apple-touch-icon-precomposed exists`, async () => {
+  it(`passes but warns when apple-touch-icon-precomposed only`, () => {
     const artifacts = {
-      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon-precomposed', href: 'https://example.com/touch-icon.png'}],
     };
 
@@ -42,12 +42,25 @@ describe('PWA: apple-touch-icon audit', () => {
 
     expect(score).toBe(1);
     expect(warnings[0]).toBeDisplayString('`apple-touch-icon-precomposed` is ' +
-      'out of date, `apple-touch-icon` is preferred.');
+      'out of date; `apple-touch-icon` is preferred.');
   });
 
-  it(`passes when apple-touch-icon is on page`, async () => {
+  it(`passes with no warning when precomposed with normal`, () => {
+    const artifacts = {
+      LinkElements: [
+        {rel: 'apple-touch-icon', href: 'https://example.com/touch-icon.png'},
+        {rel: 'apple-touch-icon-precomposed', href: 'https://example.com/touch-icon.png'},
+      ],
+    };
+
+    const {score, warnings} = AppleTouchIcon.audit(artifacts);
+
+    expect(score).toBe(1);
+    expect(warnings).toEqual([]);
+  });
+
+  it(`passes when apple-touch-icon is on page`, () => {
     const artifacts = {
-      URL: {finalUrl: 'https://example.com/'},
       LinkElements: [{rel: 'apple-touch-icon', href: 'https://example.com/touch-icon.png'}],
     };
 
@@ -56,10 +69,26 @@ describe('PWA: apple-touch-icon audit', () => {
     expect(score).toBe(1);
   });
 
-  it(`passes when apple-touch-icon is on page with href requiring base_url`, async () => {
+  it(`passes with multiple apple-touch-icons on page`, () => {
+    const artifacts = {
+      LinkElements: [
+        {rel: 'apple-touch-icon', sizes: '152x152', href: 'https://example.com/touch-icon.png'},
+        {rel: 'apple-touch-icon', sizes: '180x180', href: 'https://example.com/touch-icon.png'},
+      ],
+    };
+
+    const {score} = AppleTouchIcon.audit(artifacts);
+
+    expect(score).toBe(1);
+  });
+
+  it(`passes when lots of LinkElements`, () => {
     const artifacts = {
-      URL: {finalUrl: 'https://example.com/'},
-      LinkElements: [{rel: 'apple-touch-icon', href: 'touch-icon.png'}],
+      LinkElements: [
+        {rel: 'iOS-touch-thing', href: 'https://example.com/else.png'},
+        {rel: 'apple-touch-icon', href: 'https://example.com/touch-icon.png'},
+        {rel: 'something else', href: 'https://example.com/else.png'},
+      ],
     };
 
     const {score} = AppleTouchIcon.audit(artifacts);
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index 01a3e79dad89..a3b5c917258e 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -478,7 +478,7 @@
     },
     "apple-touch-icon": {
       "id": "apple-touch-icon",
-      "title": "Does not provide a valid apple-touch-icon",
+      "title": "Does not provide a valid `apple-touch-icon`",
       "description": "For ideal appearance on iOS when users add to the home screen, define an apple-touch-icon. It must point to a non-transparent 192px (or 180px) square PNG. [Learn More](https://developers.google.com/web/fundamentals/design-and-ux/browser-customization/).",
       "score": 0,
       "scoreDisplayMode": "binary",
diff --git a/proto/sample_v2_round_trip.json b/proto/sample_v2_round_trip.json
index df149e460671..9119e8a83416 100644
--- a/proto/sample_v2_round_trip.json
+++ b/proto/sample_v2_round_trip.json
@@ -25,7 +25,7 @@
             "id": "apple-touch-icon",
             "score": 0.0,
             "scoreDisplayMode": "binary",
-            "title": "Does not provide a valid apple-touch-icon",
+            "title": "Does not provide a valid `apple-touch-icon`",
             "warnings": []
         },
         "aria-allowed-attr": {