Skip to content

Commit 01867d8

Browse files
shunjizhanshunjizhan
committed
fixed tests related to chaning id to _id
1 parent ac03316 commit 01867d8

File tree

2 files changed

+96
-96
lines changed

2 files changed

+96
-96
lines changed

‎src/utils/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export const deleteNode = (rootNode, path) => {
130130

131131
export const findMaxId = rootNode => {
132132
const { children } = rootNode;
133-
const curId = rootNode.id;
133+
const curId = rootNode._id;
134134

135135
return children
136136
? Math.max(...[curId, ...children.map(findMaxId)])

‎src/utils/utils.test.js‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -746,32 +746,32 @@ describe('deleteNode', () => {
746746
describe('findMaxId', () => {
747747
it('finds correct max id', () => {
748748
const node = {
749-
id: 1,
749+
_id: 1,
750750
children: [
751-
{ id: 2 },
752-
{ id: 3 },
751+
{ _id: 2 },
752+
{ _id: 3 },
753753
{
754-
id: 4,
754+
_id: 4,
755755
children: [
756-
{ id: 5 },
757-
{ id: 6 },
758-
{ id: 7 },
756+
{ _id: 5 },
757+
{ _id: 6 },
758+
{ _id: 7 },
759759
],
760760
},
761761
],
762762
};
763763
expect(findMaxId(node)).toEqual(7);
764764

765-
node.id = 15;
765+
node._id = 15;
766766
expect(findMaxId(node)).toEqual(15);
767767

768-
node.children[1].id = 18;
768+
node.children[1]._id = 18;
769769
expect(findMaxId(node)).toEqual(18);
770770

771-
node.children[2].children[1].id = 27;
771+
node.children[2].children[1]._id = 27;
772772
expect(findMaxId(node)).toEqual(27);
773773

774-
node.children.push({ id: 30 });
774+
node.children.push({ _id: 30 });
775775
expect(findMaxId(node)).toEqual(30);
776776

777777
node.children.pop();
@@ -786,72 +786,72 @@ describe('addNode', () => {
786786
describe('when parent folder is checked', () => {
787787
const node = {
788788
checked: 0.5,
789-
id: 1,
789+
_id: 1,
790790
children: [
791-
{ checked: 0, id: 2 },
791+
{ checked: 0, _id: 2 },
792792
{
793793
checked: 1,
794-
id: 3,
794+
_id: 3,
795795
children: [
796-
{ checked: 1, id: 100 },
796+
{ checked: 1, _id: 100 },
797797
],
798798
}, {
799799
checked: 0.5,
800-
id: 9,
800+
_id: 9,
801801
children: [
802-
{ checked: 0, id: 11 },
803-
{ checked: 1, id: 18 },
804-
{ checked: 0, id: 84 },
802+
{ checked: 0, _id: 11 },
803+
{ checked: 1, _id: 18 },
804+
{ checked: 0, _id: 84 },
805805
],
806806
},
807807
],
808808
};
809809

810810
const addFileExpected = {
811811
checked: 0.5,
812-
id: 1,
812+
_id: 1,
813813
children: [
814-
{ checked: 0, id: 2 },
814+
{ checked: 0, _id: 2 },
815815
{
816816
checked: 1,
817-
id: 3,
817+
_id: 3,
818818
children: [
819-
{ checked: 1, id: 101, name: 'new file' },
820-
{ checked: 1, id: 100 },
819+
{ checked: 1, _id: 101, name: 'new file' },
820+
{ checked: 1, _id: 100 },
821821
],
822822
}, {
823823
checked: 0.5,
824-
id: 9,
824+
_id: 9,
825825
children: [
826-
{ checked: 0, id: 11 },
827-
{ checked: 1, id: 18 },
828-
{ checked: 0, id: 84 },
826+
{ checked: 0, _id: 11 },
827+
{ checked: 1, _id: 18 },
828+
{ checked: 0, _id: 84 },
829829
],
830830
},
831831
],
832832
};
833833

834834
const addFolderExpected = {
835835
checked: 0.5,
836-
id: 1,
836+
_id: 1,
837837
children: [
838-
{ checked: 0, id: 2 },
838+
{ checked: 0, _id: 2 },
839839
{
840840
checked: 1,
841-
id: 3,
841+
_id: 3,
842842
children: [
843-
{ checked: 1, id: 100 },
843+
{ checked: 1, _id: 100 },
844844
{
845-
checked: 1, id: 101, name: 'new folder', children: [],
845+
checked: 1, _id: 101, name: 'new folder', children: [],
846846
},
847847
],
848848
}, {
849849
checked: 0.5,
850-
id: 9,
850+
_id: 9,
851851
children: [
852-
{ checked: 0, id: 11 },
853-
{ checked: 1, id: 18 },
854-
{ checked: 0, id: 84 },
852+
{ checked: 0, _id: 11 },
853+
{ checked: 1, _id: 18 },
854+
{ checked: 0, _id: 84 },
855855
],
856856
},
857857
],
@@ -864,75 +864,75 @@ describe('addNode', () => {
864864
describe('when parent folder is half-checked', () => {
865865
const node = {
866866
checked: 0.5,
867-
id: 1,
867+
_id: 1,
868868
children: [
869-
{ checked: 0, id: 2 },
869+
{ checked: 0, _id: 2 },
870870
{
871871
checked: 0.5,
872-
id: 3,
872+
_id: 3,
873873
children: [
874-
{ checked: 1, id: 100 },
875-
{ checked: 0, id: 101 },
874+
{ checked: 1, _id: 100 },
875+
{ checked: 0, _id: 101 },
876876
],
877877
}, {
878878
checked: 0.5,
879-
id: 9,
879+
_id: 9,
880880
children: [
881-
{ checked: 0, id: 11 },
882-
{ checked: 1, id: 18 },
883-
{ checked: 0, id: 84 },
881+
{ checked: 0, _id: 11 },
882+
{ checked: 1, _id: 18 },
883+
{ checked: 0, _id: 84 },
884884
],
885885
},
886886
],
887887
};
888888

889889
const addFileExpected = {
890890
checked: 0.5,
891-
id: 1,
891+
_id: 1,
892892
children: [
893-
{ checked: 0, id: 2 },
893+
{ checked: 0, _id: 2 },
894894
{
895895
checked: 0.5,
896-
id: 3,
896+
_id: 3,
897897
children: [
898-
{ checked: 0, id: 102, name: 'new file' },
899-
{ checked: 1, id: 100 },
900-
{ checked: 0, id: 101 },
898+
{ checked: 0, _id: 102, name: 'new file' },
899+
{ checked: 1, _id: 100 },
900+
{ checked: 0, _id: 101 },
901901
],
902902
}, {
903903
checked: 0.5,
904-
id: 9,
904+
_id: 9,
905905
children: [
906-
{ checked: 0, id: 11 },
907-
{ checked: 1, id: 18 },
908-
{ checked: 0, id: 84 },
906+
{ checked: 0, _id: 11 },
907+
{ checked: 1, _id: 18 },
908+
{ checked: 0, _id: 84 },
909909
],
910910
},
911911
],
912912
};
913913

914914
const addFolderExpected = {
915915
checked: 0.5,
916-
id: 1,
916+
_id: 1,
917917
children: [
918-
{ checked: 0, id: 2 },
918+
{ checked: 0, _id: 2 },
919919
{
920920
checked: 0.5,
921-
id: 3,
921+
_id: 3,
922922
children: [
923-
{ checked: 1, id: 100 },
924-
{ checked: 0, id: 101 },
923+
{ checked: 1, _id: 100 },
924+
{ checked: 0, _id: 101 },
925925
{
926-
checked: 0, id: 102, name: 'new folder', children: [],
926+
checked: 0, _id: 102, name: 'new folder', children: [],
927927
},
928928
],
929929
}, {
930930
checked: 0.5,
931-
id: 9,
931+
_id: 9,
932932
children: [
933-
{ checked: 0, id: 11 },
934-
{ checked: 1, id: 18 },
935-
{ checked: 0, id: 84 },
933+
{ checked: 0, _id: 11 },
934+
{ checked: 1, _id: 18 },
935+
{ checked: 0, _id: 84 },
936936
],
937937
},
938938
],
@@ -945,75 +945,75 @@ describe('addNode', () => {
945945
describe('when parent folder is unchecked', () => {
946946
const node = {
947947
checked: 0.5,
948-
id: 1,
948+
_id: 1,
949949
children: [
950-
{ checked: 0, id: 2 },
950+
{ checked: 0, _id: 2 },
951951
{
952952
checked: 0,
953-
id: 3,
953+
_id: 3,
954954
children: [
955-
{ checked: 0, id: 100 },
956-
{ checked: 0, id: 101 },
955+
{ checked: 0, _id: 100 },
956+
{ checked: 0, _id: 101 },
957957
],
958958
}, {
959959
checked: 0.5,
960-
id: 9,
960+
_id: 9,
961961
children: [
962-
{ checked: 0, id: 11 },
963-
{ checked: 1, id: 18 },
964-
{ checked: 0, id: 84 },
962+
{ checked: 0, _id: 11 },
963+
{ checked: 1, _id: 18 },
964+
{ checked: 0, _id: 84 },
965965
],
966966
},
967967
],
968968
};
969969

970970
const addFileExpected = {
971971
checked: 0.5,
972-
id: 1,
972+
_id: 1,
973973
children: [
974-
{ checked: 0, id: 2 },
974+
{ checked: 0, _id: 2 },
975975
{
976976
checked: 0,
977-
id: 3,
977+
_id: 3,
978978
children: [
979-
{ checked: 0, id: 102, name: 'new file' },
980-
{ checked: 0, id: 100 },
981-
{ checked: 0, id: 101 },
979+
{ checked: 0, _id: 102, name: 'new file' },
980+
{ checked: 0, _id: 100 },
981+
{ checked: 0, _id: 101 },
982982
],
983983
}, {
984984
checked: 0.5,
985-
id: 9,
985+
_id: 9,
986986
children: [
987-
{ checked: 0, id: 11 },
988-
{ checked: 1, id: 18 },
989-
{ checked: 0, id: 84 },
987+
{ checked: 0, _id: 11 },
988+
{ checked: 1, _id: 18 },
989+
{ checked: 0, _id: 84 },
990990
],
991991
},
992992
],
993993
};
994994

995995
const addFolderExpected = {
996996
checked: 0.5,
997-
id: 1,
997+
_id: 1,
998998
children: [
999-
{ checked: 0, id: 2 },
999+
{ checked: 0, _id: 2 },
10001000
{
10011001
checked: 0,
1002-
id: 3,
1002+
_id: 3,
10031003
children: [
1004-
{ checked: 0, id: 100 },
1005-
{ checked: 0, id: 101 },
1004+
{ checked: 0, _id: 100 },
1005+
{ checked: 0, _id: 101 },
10061006
{
1007-
checked: 0, id: 102, name: 'new folder', children: [],
1007+
checked: 0, _id: 102, name: 'new folder', children: [],
10081008
},
10091009
],
10101010
}, {
10111011
checked: 0.5,
1012-
id: 9,
1012+
_id: 9,
10131013
children: [
1014-
{ checked: 0, id: 11 },
1015-
{ checked: 1, id: 18 },
1016-
{ checked: 0, id: 84 },
1014+
{ checked: 0, _id: 11 },
1015+
{ checked: 1, _id: 18 },
1016+
{ checked: 0, _id: 84 },
10171017
],
10181018
},
10191019
],

0 commit comments

Comments
 (0)