Skip to content

Commit b0cca61

Browse files
anon-pradipanon-pradip
authored
Merge pull request #11501 from owncloud/test/activities-filter-limit-0-and-1
[tests-only] [full-ci] Add test for checking activities with limit filters applied
2 parents 37532f3 + 17099fa commit b0cca61

File tree

2 files changed

+237
-17
lines changed

2 files changed

+237
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ The expected failures in this file are from features in the owncloud/ocis repo.
371371

372372
#### [Activity. No activity for copying a zero byte file](https://github.com/owncloud/ocis/issues/10417)
373373

374-
- [apiActivities/activities.feature:3378](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/activities.feature#L3378)
374+
- [apiActivities/activities.feature:3598](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/activities.feature#L3598)
375375
- [apiActivities/activitiesByFileId.feature:2015](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/activitiesByFileId.feature#L2015)
376376

377377
#### [Activity. no event for deleting a file using file-id](https://github.com/owncloud/ocis/issues/10328)
@@ -388,7 +388,7 @@ The expected failures in this file are from features in the owncloud/ocis repo.
388388

389389
#### [Activities. no event for restoring file](https://github.com/owncloud/ocis/issues/10010)
390390

391-
- [apiActivities/activities.feature:3552](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/activities.feature#L3552)
391+
- [apiActivities/activities.feature:3772](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiActivities/activities.feature#L3772)
392392

393393
Note: always have an empty line at the end of this file.
394394
The bash script that processes this file requires that the last line has a newline on the end.

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

Lines changed: 235 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2444,7 +2444,7 @@ Feature: check activities
24442444
Scenario: check activity with limit filter
24452445
Given user "Alice" has created folder "/New Folder"
24462446
And user "Alice" has created folder "/New Folder/Sub Folder"
2447-
And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/New Folder/Sub Folder/textfile.txt"
2447+
And user "Alice" has created folder "/New Folder/Sub Folder/test folder"
24482448
When user "Alice" lists the activities of folder "New Folder" from space "Personal" with limit "2" using the Graph API
24492449
Then the HTTP status code should be "200"
24502450
And the JSON data of the response should match
@@ -2486,22 +2486,101 @@ Feature: check activities
24862486
"properties": {
24872487
"name": { "const": "New Folder" }
24882488
}
2489+
}
2490+
}
2491+
}
2492+
}
2493+
},
2494+
"times": {
2495+
"type": "object",
2496+
"required": ["recordedTime"]
2497+
}
2498+
}
2499+
},
2500+
{
2501+
"type": "object",
2502+
"required": ["id", "template", "times"],
2503+
"properties": {
2504+
"template": {
2505+
"type": "object",
2506+
"required": ["message", "variables"],
2507+
"properties": {
2508+
"message": { "const": "{user} added {resource} to {folder}" },
2509+
"variables": {
2510+
"type": "object",
2511+
"required": ["folder", "resource", "user"],
2512+
"properties": {
2513+
"folder": {
2514+
"type": "object",
2515+
"required": ["name"],
2516+
"properties": {
2517+
"name": { "const": "New Folder" }
2518+
}
24892519
},
2490-
"user": {
2520+
"resource": {
24912521
"type": "object",
2492-
"required": ["id","displayName"],
2522+
"required": ["id", "name"],
24932523
"properties": {
2494-
"id": { "pattern": "%user_id_pattern%" },
2495-
"displayName": { "const": "Alice Hansen" }
2524+
"name": { "const": "Sub Folder" }
24962525
}
24972526
}
24982527
}
24992528
}
25002529
}
2501-
},
2502-
"times": {
2530+
}
2531+
}
2532+
}
2533+
]
2534+
}
2535+
}
2536+
}
2537+
}
2538+
"""
2539+
When user "Alice" lists the activities of folder "New Folder" from space "Personal" with limit "-1" using the Graph API
2540+
Then the HTTP status code should be "200"
2541+
And the JSON data of the response should match
2542+
"""
2543+
{
2544+
"type": "object",
2545+
"required": ["value"],
2546+
"properties": {
2547+
"value": {
2548+
"type": "array",
2549+
"minItems": 3,
2550+
"maxItems": 3,
2551+
"uniqueItems": true,
2552+
"items": {
2553+
"oneOf": [
2554+
{
2555+
"type": "object",
2556+
"required": ["id", "template", "times"],
2557+
"properties": {
2558+
"template": {
25032559
"type": "object",
2504-
"required": ["recordedTime"]
2560+
"required": ["message", "variables"],
2561+
"properties": {
2562+
"message": { "const": "{user} added {resource} to {folder}" },
2563+
"variables": {
2564+
"type": "object",
2565+
"required": ["folder", "resource", "user"],
2566+
"properties": {
2567+
"folder": {
2568+
"type": "object",
2569+
"required": ["name"],
2570+
"properties": {
2571+
"name": { "const": "Alice Hansen" }
2572+
}
2573+
},
2574+
"resource": {
2575+
"type": "object",
2576+
"required": ["id", "name"],
2577+
"properties": {
2578+
"name": { "const": "New Folder" }
2579+
}
2580+
}
2581+
}
2582+
}
2583+
}
25052584
}
25062585
}
25072586
},
@@ -2531,22 +2610,163 @@ Feature: check activities
25312610
"properties": {
25322611
"name": { "const": "Sub Folder" }
25332612
}
2613+
}
2614+
}
2615+
}
2616+
}
2617+
}
2618+
}
2619+
},
2620+
{
2621+
"type": "object",
2622+
"required": ["id", "template", "times"],
2623+
"properties": {
2624+
"template": {
2625+
"type": "object",
2626+
"required": ["message", "variables"],
2627+
"properties": {
2628+
"message": { "const": "{user} added {resource} to {folder}" },
2629+
"variables": {
2630+
"type": "object",
2631+
"required": ["folder", "resource", "user"],
2632+
"properties": {
2633+
"folder": {
2634+
"type": "object",
2635+
"required": ["name"],
2636+
"properties": {
2637+
"name": { "const": "Sub Folder" }
2638+
}
25342639
},
2535-
"user": {
2640+
"resource": {
25362641
"type": "object",
2537-
"required": ["id","displayName"],
2642+
"required": ["id", "name"],
25382643
"properties": {
2539-
"id": { "pattern": "%user_id_pattern%" },
2540-
"displayName": { "const": "Alice Hansen" }
2644+
"name": { "const": "test folder" }
25412645
}
25422646
}
25432647
}
25442648
}
25452649
}
2546-
},
2547-
"times": {
2650+
}
2651+
}
2652+
}
2653+
]
2654+
}
2655+
}
2656+
}
2657+
}
2658+
"""
2659+
When user "Alice" lists the activities of folder "New Folder" from space "Personal" with limit "0" using the Graph API
2660+
Then the HTTP status code should be "200"
2661+
And the JSON data of the response should match
2662+
"""
2663+
{
2664+
"type": "object",
2665+
"required": ["value"],
2666+
"properties": {
2667+
"value": {
2668+
"type": "array",
2669+
"minItems": 3,
2670+
"maxItems": 3,
2671+
"uniqueItems": true,
2672+
"items": {
2673+
"oneOf": [
2674+
{
2675+
"type": "object",
2676+
"required": ["id", "template", "times"],
2677+
"properties": {
2678+
"template": {
25482679
"type": "object",
2549-
"required": ["recordedTime"]
2680+
"required": ["message", "variables"],
2681+
"properties": {
2682+
"message": { "const": "{user} added {resource} to {folder}" },
2683+
"variables": {
2684+
"type": "object",
2685+
"required": ["folder", "resource", "user"],
2686+
"properties": {
2687+
"folder": {
2688+
"type": "object",
2689+
"required": ["name"],
2690+
"properties": {
2691+
"name": { "const": "Alice Hansen" }
2692+
}
2693+
},
2694+
"resource": {
2695+
"type": "object",
2696+
"required": ["id", "name"],
2697+
"properties": {
2698+
"name": { "const": "New Folder" }
2699+
}
2700+
}
2701+
}
2702+
}
2703+
}
2704+
}
2705+
}
2706+
},
2707+
{
2708+
"type": "object",
2709+
"required": ["id", "template", "times"],
2710+
"properties": {
2711+
"template": {
2712+
"type": "object",
2713+
"required": ["message", "variables"],
2714+
"properties": {
2715+
"message": { "const": "{user} added {resource} to {folder}" },
2716+
"variables": {
2717+
"type": "object",
2718+
"required": ["folder", "resource", "user"],
2719+
"properties": {
2720+
"folder": {
2721+
"type": "object",
2722+
"required": ["name"],
2723+
"properties": {
2724+
"name": { "const": "New Folder" }
2725+
}
2726+
},
2727+
"resource": {
2728+
"type": "object",
2729+
"required": ["id", "name"],
2730+
"properties": {
2731+
"name": { "const": "Sub Folder" }
2732+
}
2733+
}
2734+
}
2735+
}
2736+
}
2737+
}
2738+
}
2739+
},
2740+
{
2741+
"type": "object",
2742+
"required": ["id", "template", "times"],
2743+
"properties": {
2744+
"template": {
2745+
"type": "object",
2746+
"required": ["message", "variables"],
2747+
"properties": {
2748+
"message": { "const": "{user} added {resource} to {folder}" },
2749+
"variables": {
2750+
"type": "object",
2751+
"required": ["folder", "resource", "user"],
2752+
"properties": {
2753+
"folder": {
2754+
"type": "object",
2755+
"required": ["name"],
2756+
"properties": {
2757+
"name": { "const": "Sub Folder" }
2758+
}
2759+
},
2760+
"resource": {
2761+
"type": "object",
2762+
"required": ["id", "name"],
2763+
"properties": {
2764+
"name": { "const": "test folder" }
2765+
}
2766+
}
2767+
}
2768+
}
2769+
}
25502770
}
25512771
}
25522772
}

0 commit comments

Comments
 (0)