🐛 Fix bug when providing execute without before snapshot (#529)

percy · Aug 24, 2021 · 4d88db0 · 4d88db0
1 parent 740a335
commit 4d88db0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/packages/core/src/page.js b/packages/core/src/page.js
@@ -260,7 +260,8 @@ export default class Page extends EventEmitter {
     }
 
     // execute any javascript
-    await this.evaluate(execute?.beforeSnapshot ?? execute);
+    await this.evaluate(typeof execute === 'function'
+      ? execute : execute?.beforeSnapshot);
 
     // wait for any final network activity before capturing the dom snapshot
     await this.network.idle();

diff --git a/packages/core/test/snapshot.test.js b/packages/core/test/snapshot.test.js
@@ -530,34 +530,49 @@ describe('Snapshot', () => {
       `;
 
       await percy.snapshot({
-        name: 'test snapshot',
+        name: 'foo snapshot',
         url: 'http://localhost:8000',
         widths: [400, 800, 1200],
         execute: {
           afterNavigation: domtest('afterNavigation', () => window.location.href),
-          beforeResize: domtest('beforeResize', () => window.innerWidth),
-          afterResize: domtest('afterResize', () => window.innerWidth),
           beforeSnapshot: domtest('beforeSnapshot', () => 'done!')
         }
       });
 
+      await percy.snapshot({
+        name: 'bar snapshot',
+        url: 'http://localhost:8000',
+        widths: [400, 800, 1200],
+        execute: {
+          beforeResize: domtest('beforeResize', () => window.innerWidth),
+          afterResize: domtest('afterResize', () => window.innerWidth)
+        }
+      });
+
       await percy.idle();
 
       expect(logger.stderr).toEqual([]);
       expect(logger.stdout).toEqual([
-        '[percy] Snapshot taken: test snapshot'
+        '[percy] Snapshot taken: foo snapshot',
+        '[percy] Snapshot taken: bar snapshot'
       ]);
 
       expect(Buffer.from((
         mockAPI.requests['/builds/123/resources'][0]
           .body.data.attributes['base64-content']
       ), 'base64').toString()).toMatch([
         '<p>afterNavigation - http://localhost:8000/</p>',
+        '<p>beforeSnapshot - done!</p>'
+      ].join(''));
+
+      expect(Buffer.from((
+        mockAPI.requests['/builds/123/resources'][2]
+          .body.data.attributes['base64-content']
+      ), 'base64').toString()).toMatch([
         '<p>beforeResize - 400</p>',
         '<p>afterResize - 800</p>',
         '<p>beforeResize - 800</p>',
-        '<p>afterResize - 1200</p>',
-        '<p>beforeSnapshot - done!</p>'
+        '<p>afterResize - 1200</p>'
       ].join(''));
     });
   });