Tidy up store tests

Author: mnrx

packages/svelte/tests/store/test.ts

@@ -41,7 +41,7 @@ describe('writable', () => {
 
 		const store = writable(0, () => {
 			called += 1;
-			return () => (called -= 1);
+			return () => { called -= 1 };
 		});
 
 		const unsubscribe1 = store.subscribe(() => {});
@@ -81,10 +81,10 @@ describe('writable', () => {
 		let count1 = 0;
 		let count2 = 0;
 
-		store.subscribe(() => (count1 += 1))();
+		store.subscribe(() => { count1 += 1 })();
 		assert.equal(count1, 1);
 
-		const unsubscribe = store.subscribe(() => (count2 += 1));
+		const unsubscribe = store.subscribe(() => { count2 += 1 });
 		assert.equal(count2, 1);
 
 		unsubscribe();
@@ -270,7 +270,44 @@ describe('derived', () => {
 		assert.deepEqual(values, [6, 12, 20]);
 	});
 
-	it('passes optional set function', () => {
+	it('allows derived with different types', () => {
+		const a = writable('one');
+		const b = writable(1);
+
+		// @ts-expect-error TODO feels like inference should work here
+		const c = derived([a, b], ([a, b]) => `${a} ${b}`);
+
+		assert.deepEqual(get(c), 'one 1');
+
+		a.set('two');
+		b.set(2);
+		assert.deepEqual(get(c), 'two 2');
+	});
+
+	it('errors on undefined stores #1', () => {
+		assert.throws(() => {
+			// @ts-expect-error TODO feels like inference should work here
+			derived(null, (n) => n);
+		});
+	});
+
+	it('errors on undefined stores #2', () => {
+		assert.throws(() => {
+			const a = writable(1);
+			// @ts-expect-error TODO feels like inference should work here
+			derived([a, null, undefined], ([n]) => {
+				return n * 2;
+			});
+		});
+	});
+
+	it('works with RxJS-style observables', () => {
+		// @ts-expect-error TODO feels like inference should work here
+		const d = derived(fake_observable, (_) => _);
+		assert.equal(get(d), 42);
+	});
+
+	it('passes optional `set` function', () => {
 		const number = writable(1);
 		const evens = derived(
 			number,
@@ -301,9 +338,9 @@ describe('derived', () => {
 		assert.deepEqual(values, [0, 2, 4]);
 	});
 
-	it('passes optional set and update functions', () => {
+	it('passes optional `set` and `update` functions', () => {
 		const number = writable(1);
-		const evensAndSquaresOf4 = derived(
+		const evens_and_squares_of_4 = derived(
 			number,
 			// @ts-expect-error TODO feels like inference should work here
 			(n, set, update) => {
@@ -316,7 +353,7 @@ describe('derived', () => {
 
 		const values: number[] = [];
 
-		const unsubscribe = evensAndSquaresOf4.subscribe((value) => {
+		const unsubscribe = evens_and_squares_of_4.subscribe((value) => {
 			values.push(value);
 		});
 
@@ -341,21 +378,20 @@ describe('derived', () => {
 	});
 
 	it('prevents glitches', () => {
-		const lastname = writable('Jekyll');
-
+		const last_name = writable('Jekyll');
 		// @ts-expect-error TODO feels like inference should work here
-		const firstname = derived(lastname, (n) => (n === 'Jekyll' ? 'Henry' : 'Edward'));
+		const first_name = derived(last_name, (n) => (n === 'Jekyll' ? 'Henry' : 'Edward'));
 
 		// @ts-expect-error TODO feels like inference should work here
-		const fullname = derived([firstname, lastname], (names) => names.join(' '));
+		const full_name = derived([first_name, last_name], (names) => names.join(' '));
 
 		const values: string[] = [];
 
-		const unsubscribe = fullname.subscribe((value) => {
+		const unsubscribe = full_name.subscribe((value) => {
 			values.push(value as string);
 		});
 
-		lastname.set('Hyde');
+		last_name.set('Hyde');
 
 		assert.deepEqual(values, ['Henry Jekyll', 'Edward Hyde']);
 
@@ -421,7 +457,7 @@ describe('derived', () => {
 		unsubscribe();
 	});
 
-	it('is updated with safe_not_equal logic', () => {
+	it('is updated with `safe_not_equal` logic', () => {
 		const arr = [0];
 
 		const number = writable(1);
@@ -446,7 +482,7 @@ describe('derived', () => {
 		unsubscribe();
 	});
 
-	it('calls a cleanup function', () => {
+	it('calls a `cleanup` function', () => {
 		const num = writable(1);
 
 		const values: number[] = [];
@@ -503,26 +539,6 @@ describe('derived', () => {
 		unsubscribe();
 	});
 
-	it('allows derived with different types', () => {
-		const a = writable('one');
-		const b = writable(1);
-
-		// @ts-expect-error TODO feels like inference should work here
-		const c = derived([a, b], ([a, b]) => `${a} ${b}`);
-
-		assert.deepEqual(get(c), 'one 1');
-
-		a.set('two');
-		b.set(2);
-		assert.deepEqual(get(c), 'two 2');
-	});
-
-	it('works with RxJS-style observables', () => {
-		// @ts-expect-error TODO feels like inference should work here
-		const d = derived(fake_observable, (_) => _);
-		assert.equal(get(d), 42);
-	});
-
 	it("doesn't restart when unsubscribed from another store with a shared ancestor", () => {
 		const a = writable(true);
 		let b_started = false;
@@ -545,23 +561,6 @@ describe('derived', () => {
 		a.set(false);
 		assert.equal(b_started, false);
 	});
-
-	it('errors on undefined stores #1', () => {
-		assert.throws(() => {
-			// @ts-expect-error TODO feels like inference should work here
-			derived(null, (n) => n);
-		});
-	});
-
-	it('errors on undefined stores #2', () => {
-		assert.throws(() => {
-			const a = writable(1);
-			// @ts-expect-error TODO feels like inference should work here
-			derived([a, null, undefined], ([n]) => {
-				return n * 2;
-			});
-		});
-	});
 });
 
 describe('get', () => {
@@ -577,17 +576,17 @@ describe('get', () => {
 
 describe('readonly', () => {
 	it('makes a store readonly', () => {
-		const writableStore = writable(1);
-		const readableStore = readonly(writableStore);
+		const writable_store = writable(1);
+		const readable_store = readonly(writable_store);
 
-		assert.equal(get(readableStore), get(writableStore));
+		assert.equal(get(readable_store), get(writable_store));
 
-		writableStore.set(2);
+		writable_store.set(2);
 
-		assert.equal(get(readableStore), 2);
-		assert.equal(get(readableStore), get(writableStore));
+		assert.equal(get(readable_store), 2);
+		assert.equal(get(readable_store), get(writable_store));
 
 		// @ts-ignore
-		assert.throws(() => readableStore.set(3));
+		assert.throws(() => readable_store.set(3));
 	});
 });