Skip to content

Commit

Permalink
Merge branch 'hotfix/od4b-node-log-paths'
Browse files Browse the repository at this point in the history
  • Loading branch information
@felliott
felliott committed Sep 14, 2021
2 parents 16acb56 + e90efd6 commit 5c57ead
Show file tree
Hide file tree
Showing 8 changed files with 881 additions and 122 deletions.
24 changes: 16 additions & 8 deletions tests/providers/onedrive/fixtures/download.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"id" : "F4D50E400DFE7D4E!103",
"name" : "root:",
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"lastModifiedBy" : {
"user" : {
Expand Down Expand Up @@ -81,7 +82,8 @@
"parentReference" : {
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:",
"id" : "F4D50E400DFE7D4E!103"
"id" : "F4D50E400DFE7D4E!103",
"driveType": "personal"
},
"@odata.context" : "https://api.onedrive.com/v1.0/$metadata#drives('me')/items/$entity",
"@microsoft.graph.downloadUrl" : "https://public.bn1303.livefilestore.com/y4mB8JhDUWbofzVglNap3rO5i6R7jOQyJAz995dPlkrOiQeOV2jgK-EOf916z8YHi9A42WCTMVfNmHjJliYLccUFzJgsEK3j3cviT2YLlZBMRVN-sC0mfvZz_ZeDgiLzfSChMmNXkRoq6Ymh_F8r8jRAvZTzJOgyX3F7jdw4qcY27tz95Rutrl68W0Z8ntuh3bVoPIDHC5kckF8sSWoyv5j4BfRQCckjyrmaV8F1BM5Cb1x10WNdE7CP_X1bBFqY7ZTJzYcsQcDR07BdalvRTDp-A",
Expand Down Expand Up @@ -142,7 +144,8 @@
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!154",
"name" : "foo",
"path" : "/drive/root:/onenote/foo"
"path" : "/drive/root:/onenote/foo",
"driveType" : "personal"
},
"size" : 25474,
"webUrl" : "https://1drv.ms/o/s!AE59_g1ADtX0gR0"
Expand Down Expand Up @@ -177,7 +180,8 @@
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!154",
"name" : "foo",
"path" : "/drive/root:/onenote/foo"
"path" : "/drive/root:/onenote/foo",
"driveType" : "personal"
},
"size" : 2885,
"webUrl" : "https://1drv.ms/o/s!AE59_g1ADtX0gR4"
Expand Down Expand Up @@ -216,7 +220,8 @@
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!289",
"name" : "onenote",
"path" : "/drive/root:/onenote"
"path" : "/drive/root:/onenote",
"driveType" : "personal"
},
"size" : 28359,
"webUrl" : "https://1drv.ms/o/s!AE59_g1ADtX0gRo"
Expand All @@ -232,7 +237,8 @@
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:/onenote",
"id" : "F4D50E400DFE7D4E!289",
"name" : "onenote"
"name" : "onenote",
"driveType" : "personal"
},
"webUrl" : "https://1drv.ms/o/s!AE59_g1ADtX0gRo",
"size" : 28359,
Expand Down Expand Up @@ -278,7 +284,8 @@
"name" : "foo",
"path" : "/drive/root:/onenote/foo",
"id" : "F4D50E400DFE7D4E!154",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"size" : 2885,
"createdDateTime" : "2017-02-23T07:28:17.623Z",
Expand Down Expand Up @@ -313,7 +320,8 @@
"path" : "/drive/root:/onenote/foo",
"id" : "F4D50E400DFE7D4E!154",
"name" : "foo",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"size" : 25474,
"createdBy" : {
Expand Down
593 changes: 592 additions & 1 deletion tests/providers/onedrive/fixtures/paths.json
View file

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions tests/providers/onedrive/fixtures/readwrite.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"name" : "elect-a (1).jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand Down Expand Up @@ -67,6 +68,7 @@
"name" : "elect-a.jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:"
},
Expand All @@ -88,6 +90,7 @@
"name" : "hello.jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!103",
"path" : "/drive/root:/ryan-test1"
},
Expand Down Expand Up @@ -122,6 +125,7 @@
"name" : "elect-a.jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand All @@ -147,6 +151,7 @@
"name" : "test6",
"parentReference" : {
"driveId" : "9b83ff45f3386a10",
"driveType" : "personal",
"id" : "9B83FF45F3386A10!103",
"path" : "/drive/root:"
},
Expand All @@ -170,6 +175,7 @@
"name" : "googledrive-archive.zip",
"parentReference" : {
"driveId" : "9b83ff45f3386a10",
"driveType" : "personal",
"id" : "9B83FF45F3386A10!103",
"path" : "/drive/root:"
},
Expand Down Expand Up @@ -210,6 +216,7 @@
"name" : "sub1-b",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand All @@ -232,6 +239,7 @@
"name" : "sub1-z",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand Down Expand Up @@ -263,6 +271,7 @@
"name" : "elect-a.jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand All @@ -288,6 +297,7 @@
"name" : "ryan-test1",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!103",
"path" : "/drive/root:"
},
Expand All @@ -314,6 +324,7 @@
"name" : "sub1-b",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1/sub1"
},
Expand All @@ -336,6 +347,7 @@
"name" : "sub1-z",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1/sub1"
},
Expand All @@ -362,6 +374,7 @@
"name" : "elect-a.jpg",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1/sub1"
},
Expand All @@ -379,6 +392,7 @@
"name" : "sub1-b",
"parentReference" : {
"driveId" : "75bfe374ebeb1211",
"driveType" : "personal",
"id" : "75BFE374EBEB1211!107",
"path" : "/drive/root:/ryan-test1"
},
Expand Down
27 changes: 18 additions & 9 deletions tests/providers/onedrive/fixtures/root_provider.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"id" : "F4D50E400DFE7D4E!290",
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:/teeth",
"name" : "teeth"
"name" : "teeth",
"driveType" : "personal"
}
},
"folder_metadata" : {
Expand Down Expand Up @@ -123,7 +124,8 @@
"id" : "F4D50E400DFE7D4E!290",
"path" : "/drive/root:/teeth",
"driveId" : "f4d50e400dfe7d4e",
"name" : "teeth"
"name" : "teeth",
"driveType" : "personal"
},
"lastModifiedDateTime" : "2017-08-17T17:53:21.13Z",
"webUrl" : "https://1drv.ms/t/s!AE59_g1ADtX0giQ",
Expand All @@ -135,7 +137,8 @@
"parentReference" : {
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!103"
"id" : "F4D50E400DFE7D4E!103",
"driveType" : "personal"
},
"folder" : {
"folderView" : {
Expand Down Expand Up @@ -201,7 +204,8 @@
"parentReference" : {
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!103"
"id" : "F4D50E400DFE7D4E!103",
"driveType" : "personal"
},
"cTag" : "adDpGNEQ1MEU0MDBERkU3RDRFITI5MC42MzYzODU4OTIwMTEzMDAwMDA",
"lastModifiedBy" : {
Expand Down Expand Up @@ -232,7 +236,8 @@
"parentReference" : {
"id" : "F4D50E400DFE7D4E!103",
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"fileSystemInfo" : {
"lastModifiedDateTime" : "2017-08-17T17:49:50.363Z",
Expand Down Expand Up @@ -298,7 +303,8 @@
"parentReference" : {
"id" : "F4D50E400DFE7D4E!103",
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"cTag" : "aYzpGNEQ1MEU0MDBERkU3RDRFITI5MS4yNTg",
"file" : {
Expand Down Expand Up @@ -383,7 +389,8 @@
"id" : "F4D50E400DFE7D4E!290",
"path" : "/drive/root:/teeth",
"driveId" : "f4d50e400dfe7d4e",
"name" : "teeth"
"name" : "teeth",
"driveType" : "personal"
},
"lastModifiedDateTime" : "2017-08-17T17:53:21.13Z",
"webUrl" : "https://1drv.ms/t/s!AE59_g1ADtX0giQ",
Expand Down Expand Up @@ -416,7 +423,8 @@
"parentReference" : {
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e",
"id" : "F4D50E400DFE7D4E!103"
"id" : "F4D50E400DFE7D4E!103",
"driveType" : "personal"
},
"cTag" : "adDpGNEQ1MEU0MDBERkU3RDRFITI5MC42MzYzODU4OTIwMTEzMDAwMDA",
"lastModifiedBy" : {
Expand Down Expand Up @@ -447,7 +455,8 @@
"parentReference" : {
"id" : "F4D50E400DFE7D4E!103",
"path" : "/drive/root:",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"fileSystemInfo" : {
"lastModifiedDateTime" : "2017-08-17T17:49:50.363Z",
Expand Down
16 changes: 12 additions & 4 deletions tests/providers/onedrive/fixtures/subfolder_provider.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"parentReference" : {
"path" : "/drive/root:",
"id" : "F4D50E400DFE7D4E!103",
"driveId" : "f4d50e400dfe7d4e"
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal"
},
"@odata.context" : "https://api.onedrive.com/v1.0/$metadata#drives('me')/items/$entity",
"children@odata.context" : "https://api.onedrive.com/v1.0/$metadata#drives('me')/items('F4D50E400DFE7D4E%21290')/children",
Expand Down Expand Up @@ -72,7 +73,8 @@
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:/teeth",
"id" : "F4D50E400DFE7D4E!290",
"name" : "teeth"
"name" : "teeth",
"driveType" : "personal"
},
"webUrl" : "https://1drv.ms/f/s!AE59_g1ADtX0giU",
"lastModifiedDateTime" : "2017-08-17T19:08:30.337Z",
Expand Down Expand Up @@ -104,7 +106,8 @@
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:/teeth",
"id" : "F4D50E400DFE7D4E!290",
"name" : "teeth"
"name" : "teeth",
"driveType" : "personal"
},
"webUrl" : "https://1drv.ms/t/s!AE59_g1ADtX0giQ",
"createdBy" : {
Expand Down Expand Up @@ -176,7 +179,8 @@
"driveId" : "f4d50e400dfe7d4e",
"path" : "/drive/root:/teeth",
"name" : "teeth",
"id" : "F4D50E400DFE7D4E!290"
"id" : "F4D50E400DFE7D4E!290",
"driveType" : "personal"
},
"@odata.context" : "https://api.onedrive.com/v1.0/$metadata#drives('me')/items/$entity",
"lastModifiedDateTime" : "2017-08-17T17:53:21.13Z",
Expand Down Expand Up @@ -220,6 +224,7 @@
"id" : "F4D50E400DFE7D4E!290",
"name" : "teeth",
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal",
"path" : "/drive/root:/teeth"
},
"@odata.context" : "https://api.onedrive.com/v1.0/$metadata#drives('me')/items/$entity",
Expand All @@ -233,6 +238,7 @@
"id" : "F4D50E400DFE7D4E!293",
"name" : "crushers",
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal",
"path" : "/drive/root:/teeth/crushers"
},
"name" : "molars.txt",
Expand Down Expand Up @@ -324,6 +330,7 @@
"parentReference" : {
"path" : "/drive/root:/teeth/crushers",
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal",
"name" : "crushers",
"id" : "F4D50E400DFE7D4E!293"
},
Expand Down Expand Up @@ -371,6 +378,7 @@
"name" : "toes.txt",
"parentReference" : {
"driveId" : "f4d50e400dfe7d4e",
"driveType" : "personal",
"path" : "/drive/root:",
"id" : "F4D50E400DFE7D4E!103"
},
Expand Down
Loading

0 comments on commit 5c57ead

Please sign in to comment.