✨Add a hash parameter to integrate WebAssembly Validator (#33941)

* Add hash parameter `#validate=wasm` * Lint
ampproject · Apr 22, 2021 · f72e31c · f72e31c
1 parent 5c5a5cf
commit f72e31c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/src/validator-integration.js b/src/validator-integration.js
@@ -32,16 +32,20 @@ export function maybeValidate(win) {
     // Should only happen in tests.
     return;
   }
-  let validator = false;
+  let validatorUrl = null;
   if (getMode().development) {
     const hash = parseQueryString(
       win.location['originalHash'] || win.location.hash
     );
-    validator = hash['validate'] !== '0';
+    if (hash['validate'] === 'wasm') {
+      validatorUrl = `${urls.cdn}/v0/validator_wasm.js`;
+    } else if (hash['validate'] !== '0') {
+      validatorUrl = `${urls.cdn}/v0/validator.js`;
+    }
   }
 
-  if (validator) {
-    loadScript(win.document, `${urls.cdn}/v0/validator.js`).then(() => {
+  if (validatorUrl) {
+    loadScript(win.document, validatorUrl).then(() => {
       /* global amp: false */
       amp.validator.validateUrlAndLog(filename, win.document);
     });

diff --git a/test/unit/test-validator-integration.js b/test/unit/test-validator-integration.js
@@ -28,7 +28,9 @@ describes.fakeWin('validator-integration', {}, (env) => {
   describe('maybeValidate', () => {
     beforeEach(() => {
       win = env.win;
-      loadScriptStub = env.sandbox.stub(eventHelper, 'loadPromise');
+      loadScriptStub = env.sandbox
+        .stub(eventHelper, 'loadPromise')
+        .returns(Promise.resolve());
       modeStub = env.sandbox.stub(mode, 'getMode');
     });
 
@@ -51,6 +53,32 @@ describes.fakeWin('validator-integration', {}, (env) => {
       maybeValidate(win);
       expect(loadScriptStub).to.have.been.called;
     });
+
+    it('should load JavaScript validator by default', () => {
+      modeStub.returns({development: true, test: true});
+      win.location = 'https://www.example.com/#development=1';
+      maybeValidate(win);
+      expect(loadScriptStub).to.have.been.calledWith(
+        env.sandbox.match(
+          (el) =>
+            el.getAttribute('src') ===
+            'https://cdn.ampproject.org/v0/validator.js'
+        )
+      );
+    });
+
+    it('should load WebAssembly validator when specified', () => {
+      modeStub.returns({development: true, test: true});
+      win.location = 'https://www.example.com/#development=1&validate=wasm';
+      maybeValidate(win);
+      expect(loadScriptStub).to.have.been.calledWith(
+        env.sandbox.match(
+          (el) =>
+            el.getAttribute('src') ===
+            'https://cdn.ampproject.org/v0/validator_wasm.js'
+        )
+      );
+    });
   });
 
   describe('loadScript', () => {