Skip to content

Commit 618a1ed

Browse files
saw-jansaw-jan
authored
Merge pull request #11285 from owncloud/test/assert-datetime-json
[full-ci][tests-only] Check datetime format in json response
2 parents 540c2bf + ee9a796 commit 618a1ed

13 files changed

+153
-267
lines changed

‎tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md

+48-38
Large diffs are not rendered by default.

‎tests/acceptance/expected-failures-without-remotephp.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@
208208
- [apiLocks/unlockFiles.feature:321](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiLocks/unlockFiles.feature#L321)
209209
- [apiLocks/unlockFiles.feature:322](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiLocks/unlockFiles.feature#L322)
210210
- [apiLocks/unlockFiles.feature:323](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiLocks/unlockFiles.feature#L323)
211-
- [apiActivities/shareActivities.feature:1956](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/shareActivities.feature#L1956)
212-
- [apiActivities/shareActivities.feature:2095](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/shareActivities.feature#L2095)
211+
- [apiActivities/shareActivities.feature:1929](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/shareActivities.feature#L1929)
212+
- [apiActivities/shareActivities.feature:2065](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/shareActivities.feature#L2065)
213213
- [apiAntivirus/antivirus.feature:114](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAntivirus/antivirus.feature#L114)
214214
- [apiAntivirus/antivirus.feature:115](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAntivirus/antivirus.feature#L115)
215215
- [apiAntivirus/antivirus.feature:116](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiAntivirus/antivirus.feature#L116)

‎tests/acceptance/features/apiActivities/activities.feature

+22-88
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ Feature: check activities
8484
"type": "object",
8585
"required": ["recordedTime"],
8686
"properties": {
87-
"recordedTime": {
88-
"type": "string",
89-
"format": "date-time"
90-
}
87+
"recordedTime": { "format": "date-time" }
9188
}
9289
}
9390
}
@@ -170,10 +167,7 @@ Feature: check activities
170167
"type": "object",
171168
"required": ["recordedTime"],
172169
"properties": {
173-
"recordedTime": {
174-
"type": "string",
175-
"format": "date-time"
176-
}
170+
"recordedTime": { "format": "date-time" }
177171
}
178172
}
179173
}
@@ -431,10 +425,7 @@ Feature: check activities
431425
"type": "object",
432426
"required": ["recordedTime"],
433427
"properties": {
434-
"recordedTime": {
435-
"type": "string",
436-
"format": "date-time"
437-
}
428+
"recordedTime": { "format": "date-time" }
438429
}
439430
}
440431
}
@@ -501,10 +492,7 @@ Feature: check activities
501492
"type": "object",
502493
"required": ["recordedTime"],
503494
"properties": {
504-
"recordedTime": {
505-
"type": "string",
506-
"format": "date-time"
507-
}
495+
"recordedTime": { "format": "date-time" }
508496
}
509497
}
510498
}
@@ -650,10 +638,7 @@ Feature: check activities
650638
"type": "object",
651639
"required": ["recordedTime"],
652640
"properties": {
653-
"recordedTime": {
654-
"type": "string",
655-
"format": "date-time"
656-
}
641+
"recordedTime": { "format": "date-time" }
657642
}
658643
}
659644
}
@@ -799,10 +784,7 @@ Feature: check activities
799784
"type": "object",
800785
"required": ["recordedTime"],
801786
"properties": {
802-
"recordedTime": {
803-
"type": "string",
804-
"format": "date-time"
805-
}
787+
"recordedTime": { "format": "date-time" }
806788
}
807789
}
808790
}
@@ -905,10 +887,7 @@ Feature: check activities
905887
"type": "object",
906888
"required": ["recordedTime"],
907889
"properties": {
908-
"recordedTime": {
909-
"type": "string",
910-
"format": "date-time"
911-
}
890+
"recordedTime": { "format": "date-time" }
912891
}
913892
}
914893
}
@@ -1017,10 +996,7 @@ Feature: check activities
1017996
"type": "object",
1018997
"required": ["recordedTime"],
1019998
"properties": {
1020-
"recordedTime": {
1021-
"type": "string",
1022-
"format": "date-time"
1023-
}
999+
"recordedTime": { "format": "date-time" }
10241000
}
10251001
}
10261002
}
@@ -1123,10 +1099,7 @@ Feature: check activities
11231099
"type": "object",
11241100
"required": ["recordedTime"],
11251101
"properties": {
1126-
"recordedTime": {
1127-
"type": "string",
1128-
"format": "date-time"
1129-
}
1102+
"recordedTime": { "format": "date-time" }
11301103
}
11311104
}
11321105
}
@@ -1244,10 +1217,7 @@ Feature: check activities
12441217
"type": "object",
12451218
"required": ["recordedTime"],
12461219
"properties": {
1247-
"recordedTime": {
1248-
"type": "string",
1249-
"format": "date-time"
1250-
}
1220+
"recordedTime": { "format": "date-time" }
12511221
}
12521222
}
12531223
}
@@ -1359,10 +1329,7 @@ Feature: check activities
13591329
"type": "object",
13601330
"required": ["recordedTime"],
13611331
"properties": {
1362-
"recordedTime": {
1363-
"type": "string",
1364-
"format": "date-time"
1365-
}
1332+
"recordedTime": { "format": "date-time" }
13661333
}
13671334
}
13681335
}
@@ -1480,10 +1447,7 @@ Feature: check activities
14801447
"type": "object",
14811448
"required": ["recordedTime"],
14821449
"properties": {
1483-
"recordedTime": {
1484-
"type": "string",
1485-
"format": "date-time"
1486-
}
1450+
"recordedTime": { "format": "date-time" }
14871451
}
14881452
}
14891453
}
@@ -1595,10 +1559,7 @@ Feature: check activities
15951559
"type": "object",
15961560
"required": ["recordedTime"],
15971561
"properties": {
1598-
"recordedTime": {
1599-
"type": "string",
1600-
"format": "date-time"
1601-
}
1562+
"recordedTime": { "format": "date-time" }
16021563
}
16031564
}
16041565
}
@@ -1711,10 +1672,7 @@ Feature: check activities
17111672
"type": "object",
17121673
"required": ["recordedTime"],
17131674
"properties": {
1714-
"recordedTime": {
1715-
"type": "string",
1716-
"format": "date-time"
1717-
}
1675+
"recordedTime": { "format": "date-time" }
17181676
}
17191677
}
17201678
}
@@ -1820,10 +1778,7 @@ Feature: check activities
18201778
"type": "object",
18211779
"required": ["recordedTime"],
18221780
"properties": {
1823-
"recordedTime": {
1824-
"type": "string",
1825-
"format": "date-time"
1826-
}
1781+
"recordedTime": { "format": "date-time" }
18271782
}
18281783
}
18291784
}
@@ -2579,10 +2534,7 @@ Feature: check activities
25792534
"type": "object",
25802535
"required": ["recordedTime"],
25812536
"properties": {
2582-
"recordedTime": {
2583-
"type": "string",
2584-
"format": "date-time"
2585-
}
2537+
"recordedTime": { "format": "date-time" }
25862538
}
25872539
}
25882540
}
@@ -2676,10 +2628,7 @@ Feature: check activities
26762628
"type": "object",
26772629
"required": ["recordedTime"],
26782630
"properties": {
2679-
"recordedTime": {
2680-
"type": "string",
2681-
"format": "date-time"
2682-
}
2631+
"recordedTime": { "format": "date-time" }
26832632
}
26842633
}
26852634
}
@@ -3291,10 +3240,7 @@ Feature: check activities
32913240
"type": "object",
32923241
"required": ["recordedTime"],
32933242
"properties": {
3294-
"recordedTime": {
3295-
"type": "string",
3296-
"format": "date-time"
3297-
}
3243+
"recordedTime": { "format": "date-time" }
32983244
}
32993245
}
33003246
}
@@ -3416,10 +3362,7 @@ Feature: check activities
34163362
"type": "object",
34173363
"required": ["recordedTime"],
34183364
"properties": {
3419-
"recordedTime": {
3420-
"type": "string",
3421-
"format": "date-time"
3422-
}
3365+
"recordedTime": { "format": "date-time" }
34233366
}
34243367
}
34253368
}
@@ -3513,10 +3456,7 @@ Feature: check activities
35133456
"type": "object",
35143457
"required": ["recordedTime"],
35153458
"properties": {
3516-
"recordedTime": {
3517-
"type": "string",
3518-
"format": "date-time"
3519-
}
3459+
"recordedTime": { "format": "date-time" }
35203460
}
35213461
}
35223462
}
@@ -3638,10 +3578,7 @@ Feature: check activities
36383578
"type": "object",
36393579
"required": ["recordedTime"],
36403580
"properties": {
3641-
"recordedTime": {
3642-
"type": "string",
3643-
"format": "date-time"
3644-
}
3581+
"recordedTime": { "format": "date-time" }
36453582
}
36463583
}
36473584
}
@@ -3735,10 +3672,7 @@ Feature: check activities
37353672
"type": "object",
37363673
"required": ["recordedTime"],
37373674
"properties": {
3738-
"recordedTime": {
3739-
"type": "string",
3740-
"format": "date-time"
3741-
}
3675+
"recordedTime": { "format": "date-time" }
37423676
}
37433677
}
37443678
}

0 commit comments

Comments
 (0)