snapshot() assertion no longer works in hooks

Fixes #2534.

Author: novemberborn

lib/assert.js

@@ -699,7 +699,7 @@ class Assertions {
 		});
 
 		this.snapshot = withSkip((expected, ...rest) => {
-			if (disableSnapshots && experiments.disableSnapshotsInHooks) {
+			if (disableSnapshots) {
 				fail(new AssertionError({
 					assertion: 'snapshot',
 					message: '`t.snapshot()` can only be used in tests',

lib/load-config.js

@@ -9,7 +9,6 @@ const pkgConf = require('pkg-conf');
 const NO_SUCH_FILE = Symbol('no ava.config.js file');
 const MISSING_DEFAULT_EXPORT = Symbol('missing default export');
 const EXPERIMENTS = new Set([
-	'disableSnapshotsInHooks',
 	'nextGenConfig',
 	'reverseTeardowns',
 	'sharedWorkers'

test/hook-restrictions/fixtures/package.json

@@ -1,10 +1,7 @@
 {
-  "ava": {
-    "files": [
-      "*.js"
-    ],
-    "nonSemVerExperiments": {
-      "disableSnapshotsInHooks": true
-    }
-  }
+	"ava": {
+		"files": [
+			"*.js"
+		]
+	}
 }

test/snapshot-order/fixtures/randomness/test.js

@@ -5,26 +5,6 @@ const randomDelay = () => new Promise(resolve => {
 	setTimeout(resolve, Math.random() * 1000);
 });
 
-test.before(async t => {
-	await randomDelay();
-	t.snapshot(id(-2), 'in a before hook');
-});
-
-test.beforeEach(async t => {
-	await randomDelay();
-	t.snapshot(id(-1.5), 'in a beforeEach hook');
-});
-
-test.afterEach(async t => {
-	await randomDelay();
-	t.snapshot(id(-1), 'in an afterEach hook');
-});
-
-test.afterEach.always(async t => {
-	await randomDelay();
-	t.snapshot(id(-0.5), 'in an afterEachAlways hook');
-});
-
 test('B - declare some snapshots', async t => {
 	await randomDelay();
 	t.snapshot(id(0));

test/snapshot-order/fixtures/randomness/test.js.md

@@ -4,102 +4,6 @@ The actual snapshot is saved in `test.js.snap`.
 
 Generated by [AVA](https://avajs.dev).
 
-## before hook
-
-> in a before hook
-
-    'index: -2'
-
-## beforeEach hook for B - declare some snapshots
-
-> in a beforeEach hook
-
-    'index: -1.5'
-
-## beforeEach hook for A - declare some more snapshots
-
-> in a beforeEach hook
-
-    'index: -1.5'
-
-## beforeEach hook for C - declare some snapshots in a try()
-
-> in a beforeEach hook
-
-    'index: -1.5'
-
-## beforeEach hook for E - discard some snapshots in a try()
-
-> in a beforeEach hook
-
-    'index: -1.5'
-
-## beforeEach hook for D - more snapshots with IDs
-
-> in a beforeEach hook
-
-    'index: -1.5'
-
-## afterEach hook for B - declare some snapshots
-
-> in an afterEach hook
-
-    'index: -1'
-
-## afterEach hook for A - declare some more snapshots
-
-> in an afterEach hook
-
-    'index: -1'
-
-## afterEach hook for C - declare some snapshots in a try()
-
-> in an afterEach hook
-
-    'index: -1'
-
-## afterEach hook for E - discard some snapshots in a try()
-
-> in an afterEach hook
-
-    'index: -1'
-
-## afterEach hook for D - more snapshots with IDs
-
-> in an afterEach hook
-
-    'index: -1'
-
-## afterEach.always hook for B - declare some snapshots
-
-> in an afterEachAlways hook
-
-    'index: -0.5'
-
-## afterEach.always hook for A - declare some more snapshots
-
-> in an afterEachAlways hook
-
-    'index: -0.5'
-
-## afterEach.always hook for C - declare some snapshots in a try()
-
-> in an afterEachAlways hook
-
-    'index: -0.5'
-
-## afterEach.always hook for E - discard some snapshots in a try()
-
-> in an afterEachAlways hook
-
-    'index: -0.5'
-
-## afterEach.always hook for D - more snapshots with IDs
-
-> in an afterEachAlways hook
-
-    'index: -0.5'
-
 ## B - declare some snapshots
 
 > Snapshot 1

test/snapshot-order/fixtures/randomness/test.js.snap

@@ -2,22 +2,6 @@ const test = require('ava');
 
 const id = index => `index: ${index}`;
 
-test.before(t => {
-	t.snapshot(id(-2), 'in a before hook');
-});
-
-test.beforeEach(t => {
-	t.snapshot(id(-1.5), 'in a beforeEach hook');
-});
-
-test.afterEach(t => {
-	t.snapshot(id(-1), 'in an afterEach hook');
-});
-
-test.afterEach.always(t => {
-	t.snapshot(id(-0.5), 'in an afterEachAlways hook');
-});
-
 test('B - declare some snapshots', t => {
 	t.snapshot(id(0));
 	t.snapshot(id(1), 'has a message');

test/snapshot-order/fixtures/report-declaration-order/test.js

@@ -9,27 +9,14 @@ Generated by [AVA](https://avajs.dev).
 > resulting snapshot in binary encoding
 
     Buffer @Uint8Array [
-      41564120 536e6170 73686f74 2076320a 020019c4 186451f5 248fc7d2 9bc1c0e4
-      9b6a1f8b 08000000 00000003 5bc6c4c0 20c1c0f0 66f53aff 9b6187ad 7ef5c6ab
-      69395f66 64000171 2096889b cea1f1e9 cc6abe6a 8e3f7d1f 986418c1 a27a402c
-      f92db345 dc7c62a0 c041a66b d91bd7ef 64048bba 02b1aac3 da1d160f fc2bce6e
-      2c0e6758 7caf8611 2c1a0792 79f85f47 95e7679d 64a4c26c 05cd09a5 8c60d152
-      20d660e4 5eb73253 60dffb96 e3159d5a 47bf3182 45fb80d8 dae87dec d21fce25
-      a16953cf ed927c7c 9f112cba 1c886d8a c3372ce4 345bbcf8 7ee9e682 a52fa731
-      82450f80 640e7f35 58673293 ad63ff91 8f6c1d69 b719c1a2 3781384c 37e7c7ff
-      f90717b9 44cd5ee3 cd709e8b 112cfa09 8823fc12 73fd7cad 27c83e5c ea6e79d9
-      df9b112c ca0d0c8a d8d04fa2 b5e55b9e dd7f7a6d 5b7b9946 22235854 1188e3d7
-      de5d29f8 9edd4fae fbdaa4dc 33acff98 c1a2e650 ec0bc5c9 409ce62a 6725c693
-      a66d716f fe29dbe3 0b0e3282 458141c3 90f9a478 bf83ee83 7ba6775e ad991632
-      e5192358 742a1097 ce5b9b6a c12dc2a7 cef5532a 8525f52a 23587435 10371dd0
-      7efe5874 b1e8c4fd cc9167de cfdcc508 163d04c4 93ac7e68 78dc5d7c c794a9d1
-      f95ba6de 0346b0e8 4d209ebc ffafc6d4 57fce1e5 e1378236 6d5c15c8 0416fd00
-      c5ecc074 70c995f9 e6ee835b 535b27ae a8dad95b a4cb0416 95856213 908a33cf
-      6d74158e 32ae2ae8 cc37f936 7d292358 d41b885f da3eac39 e977af69 a6fda7b0
-      e70a8c9e 8c60d114 20fe2230 5fdde7e0 7cfb673e 8fc5773e d0ef6006 8b5641f1
-      04285e06 c4bfbeda 79ee3a24 7cb8f998 d876d6f3 071918c1 a27b8198 99811d9c
-      22195919 04193933 f352522b ac14740d 49113634 4111e686 a936d033 c56e8c11
-      71eae112 86b82448 d741b404 0754c204 ab2876b5 665845cd 29743bcc 1c63ec81
-      4f5a5419 611736c6 6aa30576 c506c4d8 88d39f30 c30db08a 1a6215c5 ee6a5d43
-      00e09b96 2e630500 00
+      41564120 536e6170 73686f74 2076320a 02008017 6c36567a 01a19351 43f9bd06
+      d5301f8b 08000000 00000003 63636460 e06090fc 96d9226e 3e3150e0 20d3b5ec
+      8deb7702 0581401c 8863433f 89d6966f 7976ffe9 b56ded65 1a898c60 515d208e
+      5f7b77a5 e07b763f b9ee6b93 72cfb0fe 63068b3a 43712414 e70371e9 bcb5a916
+      dc227cea 5c3fa552 5852af32 82455b81 b8e980f6 f3c7a28b 4527ee67 8e3cf37e
+      e62e46b0 e81c209e bcffafc6 d457fce1 e5e13782 366d5c15 c80416dd 0cc5a780
+      f8922bf3 cddd07b7 a6b64e5c 51b5b3b7 4897092c fa008abf 03f11781 f9ea3e07
+      e7db3ff3 792cbef3 817e0733 58949711 8295a1d8 12889919 d8c13e66 64651064
+      e4cccc4b 49adb052 30344111 e6800a63 1735c52a 6a8655d4 1caba831 76471862
+      1736c22e 6c8cd568 0bec8a0d b02ac62e 6a8855d4 08002fd4 dcd73f02 0000
     ]