♻️ Refactor to use chaining

percy · Aug 17, 2022 · 347dfae · 347dfae
1 parent 397d42c
commit 347dfae
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 63 deletions.
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
@@ -14,12 +14,7 @@ module.exports = {
   test_settings: {
     default: {
       desiredCapabilities: {
-        browserName: 'firefox',
-        alwaysMatch: {
-          'moz:firefoxOptions': {
-            args: ['-headless']
-          }
-        }
+        browserName: 'firefox'
       }
     }
   }

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "expect": "^27.0.2",
     "geckodriver": "^3.0.1",
     "mocha": "^10.0.0",
-    "nightwatch": "^2.1.3",
+    "nightwatch": "^2.3.0",
     "nyc": "^15.1.0",
     "tsd": "^0.22.0"
   }

diff --git a/test/percySnapshot.test.js b/test/percySnapshot.test.js
@@ -4,59 +4,56 @@ const helpers = require('@percy/sdk-utils/test/helpers');
 module.exports = {
   async beforeEach(browser) {
     await helpers.setupTest();
-    await browser.url(helpers.testSnapshotURL);
-  },
-
-  after(browser) {
-    browser.end();
   },
 
   'disables snapshots when the healthcheck fails': async browser => {
     await helpers.test('error', '/percy/healthcheck');
 
-    await browser.percySnapshot();
-    await browser.percySnapshot('Snapshot 2');
+    await browser
+      .navigateTo(helpers.testSnapshotURL)
+      .percySnapshot()
+      .percySnapshot('Snapshot 2');
 
     expect(await helpers.get('logs')).toEqual(expect.arrayContaining([
       'Percy is not running, disabling snapshots'
     ]));
 
-    browser.assert.ok(true);
-  },
-
-  'uses test name for snapshot name when percySnapshot is blank': async browser => {
-    await browser.percySnapshot();
-
-    expect(await helpers.get('logs')).toEqual(expect.arrayContaining([
-      'Snapshot found: uses test name for snapshot name when percySnapshot is blank'
-    ]));
-
-    browser.assert.ok(true);
+    await browser
+      .assert.ok(true)
+      .end();
   },
 
-  'posts snapshots to the local percy server': async function(browser) {
-    await browser.percySnapshot('Snapshot 1');
-    await browser.percySnapshot('Snapshot 2');
+  'posts snapshots to the local percy server': async browser => {
+    await browser
+      .navigateTo(helpers.testSnapshotURL)
+      .percySnapshot()
+      .percySnapshot('Snapshot 2');
 
     expect(await helpers.get('logs')).toEqual(expect.arrayContaining([
-      'Snapshot found: Snapshot 1',
+      'Snapshot found: posts snapshots to the local percy server',
       'Snapshot found: Snapshot 2',
       `- url: ${helpers.testSnapshotURL}`,
       expect.stringMatching(/clientInfo: @percy\/nightwatch\/.+/),
       expect.stringMatching(/environmentInfo: nightwatch\/.+/)
     ]));
 
-    browser.assert.ok(true);
+    await browser
+      .assert.ok(true)
+      .end();
   },
 
   'handles snapshot failures': async browser => {
     await helpers.test('error', '/percy/snapshot');
-    await browser.percySnapshot('Snapshot 1');
+    await browser
+      .navigateTo(helpers.testSnapshotURL)
+      .percySnapshot('Snapshot 1');
 
     expect(await helpers.get('logs')).toEqual(expect.arrayContaining([
       'Could not take DOM snapshot "Snapshot 1"'
     ]));
 
-    browser.assert.ok(true);
+    await browser
+      .assert.ok(true)
+      .end();
   }
 };