Additional tests for getIn and hasIn (#1367)

leebyron · web-flow · commit 140c8f5abf05 · 2017-10-09T21:15:00.000-04:00
Factors some out of updateIn
diff --git a/__tests__/getIn.ts b/__tests__/getIn.ts
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+///<reference path='../resources/jest.d.ts'/>
+
+import { fromJS, List, Map, Set } from '../';
+
+describe('getIn', () => {
+
+  it('deep get', () => {
+    const m = fromJS({a: {b: {c: 10}}});
+    expect(m.getIn(['a', 'b', 'c'])).toEqual(10);
+  });
+
+  it('deep get with list as keyPath', () => {
+    const m = fromJS({a: {b: {c: 10}}});
+    expect(m.getIn(fromJS(['a', 'b', 'c']))).toEqual(10);
+  });
+
+  it('deep get throws without list or array-like', () => {
+    // need to cast these as TypeScript first prevents us from such clownery.
+    expect(() =>
+      Map().getIn(undefined as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: undefined');
+    expect(() =>
+      Map().getIn({ a: 1, b: 2 } as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: [object Object]');
+    expect(() =>
+      Map().getIn('abc' as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: abc');
+  });
+
+  it('deep get throws if non-readable path', () => {
+    const realWarn = console.warn;
+    const warnings: Array<any> = [];
+    console.warn = w => warnings.push(w);
+
+    try {
+      const deep = Map({ key: { regular: "jsobj" }, list: List([ Map({num: 10}) ]) });
+      deep.getIn(["key", "foo", "item"]);
+      expect(warnings.length).toBe(1);
+      expect(warnings[0]).toBe(
+        'Invalid keyPath: Value at ["key"] does not have a .get() method: [object Object]' +
+        '\nThis warning will throw in a future version',
+      );
+
+      warnings.length = 0;
+      deep.getIn(["list", 0, "num", "badKey"]);
+      expect(warnings.length).toBe(1);
+      expect(warnings[0]).toBe(
+        'Invalid keyPath: Value at ["list",0,"num"] does not have a .get() method: 10' +
+        '\nThis warning will throw in a future version',
+      );
+    } finally {
+      console.warn = realWarn;
+    }
+  });
+
+  it('deep get returns not found if path does not match', () => {
+    const m = fromJS({a: {b: {c: 10}}});
+    expect(m.getIn(['a', 'b', 'z'])).toEqual(undefined);
+    expect(m.getIn(['a', 'b', 'z'], 123)).toEqual(123);
+    expect(m.getIn(['a', 'y', 'z'])).toEqual(undefined);
+    expect(m.getIn(['a', 'y', 'z'], 123)).toEqual(123);
+  });
+
+  it('does not use notSetValue when path does exist but value is nullable', () => {
+    const m = fromJS({a: {b: {c: null, d: undefined}}});
+    expect(m.getIn(['a', 'b', 'c'])).toEqual(null);
+    expect(m.getIn(['a', 'b', 'd'])).toEqual(undefined);
+    expect(m.getIn(['a', 'b', 'c'], 123)).toEqual(null);
+    expect(m.getIn(['a', 'b', 'd'], 123)).toEqual(undefined);
+  });
+
+});
diff --git a/__tests__/hasIn.ts b/__tests__/hasIn.ts
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+///<reference path='../resources/jest.d.ts'/>
+
+import { fromJS, List, Map } from '../';
+
+describe('hasIn', () => {
+
+  it('deep has', () => {
+    const m = fromJS({a: {b: {c: 10}}});
+    expect(m.hasIn(['a', 'b', 'c'])).toEqual(true);
+    expect(m.hasIn(['a', 'b', 'z'])).toEqual(false);
+    expect(m.hasIn(['a', 'y', 'z'])).toEqual(false);
+  });
+
+  it('deep has with list as keyPath', () => {
+    const m = fromJS({a: {b: {c: 10}}});
+    expect(m.hasIn(fromJS(['a', 'b', 'c']))).toEqual(true);
+    expect(m.hasIn(fromJS(['a', 'b', 'z']))).toEqual(false);
+    expect(m.hasIn(fromJS(['a', 'y', 'z']))).toEqual(false);
+  });
+
+  it('deep has throws without list or array-like', () => {
+    // need to cast these as TypeScript first prevents us from such clownery.
+    expect(() =>
+      Map().hasIn(undefined as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: undefined');
+    expect(() =>
+      Map().hasIn({ a: 1, b: 2 } as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: [object Object]');
+    expect(() =>
+      Map().hasIn('abc' as any),
+    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: abc');
+  });
+
+  it('deep has does not throw if non-readable path', () => {
+    const realWarn = console.warn;
+    const warnings: Array<any> = [];
+    console.warn = w => warnings.push(w);
+
+    try {
+      const deep = Map({ key: { regular: "jsobj" }, list: List([ Map({num: 10}) ]) });
+      expect(deep.hasIn(['key', 'foo', 'item'])).toBe(false);
+      expect(warnings.length).toBe(0);
+
+      expect(deep.hasIn(['list', 0, 'num', 'badKey'])).toBe(false);
+      expect(warnings.length).toBe(0);
+    } finally {
+      console.warn = realWarn;
+    }
+  });
+
+});
diff --git a/__tests__/updateIn.ts b/__tests__/updateIn.ts
@@ -11,73 +11,6 @@ import { fromJS, List, Map, Set } from '../';
 
 describe('updateIn', () => {
 
-  it('deep get', () => {
-    const m = fromJS({a: {b: {c: 10}}});
-    expect(m.getIn(['a', 'b', 'c'])).toEqual(10);
-  });
-
-  it('deep get with list as keyPath', () => {
-    const m = fromJS({a: {b: {c: 10}}});
-    expect(m.getIn(fromJS(['a', 'b', 'c']))).toEqual(10);
-  });
-
-  it('deep get throws without list or array-like', () => {
-    // need to cast these as TypeScript first prevents us from such clownery.
-    expect(() =>
-      Map().getIn(undefined as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: undefined');
-    expect(() =>
-      Map().getIn({ a: 1, b: 2 } as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: [object Object]');
-    expect(() =>
-      Map().getIn('abc' as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: abc');
-  });
-
-  it('deep get throws if non-readable path', () => {
-    const realWarn = console.warn;
-    const warnings: Array<any> = [];
-    console.warn = w => warnings.push(w);
-
-    try {
-      const deep = Map({ key: { regular: "jsobj" }, list: List([ Map({num: 10}) ]) });
-      deep.getIn(["key", "foo", "item"]);
-      expect(warnings.length).toBe(1);
-      expect(warnings[0]).toBe(
-        'Invalid keyPath: Value at ["key"] does not have a .get() method: [object Object]' +
-        '\nThis warning will throw in a future version',
-      );
-
-      warnings.length = 0;
-      deep.getIn(["list", 0, "num", "badKey"]);
-      expect(warnings.length).toBe(1);
-      expect(warnings[0]).toBe(
-        'Invalid keyPath: Value at ["list",0,"num"] does not have a .get() method: 10' +
-        '\nThis warning will throw in a future version',
-      );
-    } finally {
-      console.warn = realWarn;
-    }
-  });
-
-  it('deep has throws without list or array-like', () => {
-    // need to cast these as TypeScript first prevents us from such clownery.
-    expect(() =>
-      Map().hasIn(undefined as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: undefined');
-    expect(() =>
-      Map().hasIn({ a: 1, b: 2 } as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: [object Object]');
-    expect(() =>
-      Map().hasIn('abc' as any),
-    ).toThrow('Invalid keyPath: expected Ordered Collection or Array: abc');
-  });
-
-  it('deep get returns not found if path does not match', () => {
-    const m = fromJS({a: {b: {c: 10}}});
-    expect(m.getIn(['a', 'b', 'z'])).toEqual(undefined);
-  });
-
   it('deep edit', () => {
     const m = fromJS({a: {b: {c: 10}}});
     expect(
