refactor(nextcloud): Reuse containers in tests

Signed-off-by: jld3103 <[email protected]>
nextcloud · Dec 20, 2023 · f2f236b · f2f236b
1 parent 0a8d488
commit f2f236b
Show file tree

Hide file tree

Showing 52 changed files with 530 additions and 317 deletions.
diff --git a/packages/nextcloud/test/core_test.dart b/packages/nextcloud/test/core_test.dart
@@ -12,11 +12,11 @@ void main() {
     (final preset) {
       late DockerContainer container;
       late NextcloudClient client;
-      setUp(() async {
+      setUpAll(() async {
         container = await DockerContainer.create(preset);
         client = await TestNextcloudClient.create(container);
       });
-      tearDown(() async {
+      tearDownAll(() async {
         if (Invoker.current!.liveTest.errors.isNotEmpty) {
           print(await container.allLogs());
         }
@@ -145,6 +145,9 @@ void main() {
 
       group('App password', () {
         test('Delete', () async {
+          // Separate client to not break other tests
+          final client = await TestNextcloudClient.create(container);
+
           await client.core.appPassword.deleteAppPassword();
           await expectLater(
             () => client.core.appPassword.deleteAppPassword(),

diff --git a/packages/nextcloud/test/dashboard_test.dart b/packages/nextcloud/test/dashboard_test.dart
@@ -12,11 +12,11 @@ void main() {
     (final preset) {
       late DockerContainer container;
       late NextcloudClient client;
-      setUp(() async {
+      setUpAll(() async {
         container = await DockerContainer.create(preset);
         client = await TestNextcloudClient.create(container);
       });
-      tearDown(() async {
+      tearDownAll(() async {
         if (Invoker.current!.liveTest.errors.isNotEmpty) {
           print(await container.allLogs());
         }

diff --git a/packages/nextcloud/test/fixtures/notes/create_note_favorite.regexp b/packages/nextcloud/test/fixtures/notes/create_note_favorite.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=c&title=a&content=b&modified=0&favorite=1
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/create_note_not_favorite.regexp b/packages/nextcloud/test/fixtures/notes/create_note_not_favorite.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=c&title=a&content=b&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/delete_note.regexp b/packages/nextcloud/test/fixtures/notes/delete_note.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=&title=a&content=&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/...est/fixtures/notes/update_settings.regexp → ...ures/notes/get_and_update_settings.regexp b/...est/fixtures/notes/update_settings.regexp → ...ures/notes/get_and_update_settings.regexp
@@ -1,3 +1,9 @@
+GET http://localhost/index\.php/apps/notes/api/v1/settings
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock
 PUT http://localhost/index\.php/apps/notes/api/v1/settings
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/get_note.regexp b/packages/nextcloud/test/fixtures/notes/get_note.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=&title=a&content=&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/get_notes.regexp b/packages/nextcloud/test/fixtures/notes/get_notes.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=&title=a&content=&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/get_settings.regexp b/packages/nextcloud/test/fixtures/notes/get_settings.regexp
diff --git a/packages/nextcloud/test/fixtures/notes/update_note.regexp b/packages/nextcloud/test/fixtures/notes/update_note.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=&title=a&content=&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notes/update_note_fail_changed_on_server.regexp b/packages/nextcloud/test/fixtures/notes/update_note_fail_changed_on_server.regexp
@@ -1,3 +1,15 @@
+GET http://localhost/index\.php/apps/notes/api/v1/notes\?exclude=&pruneBefore=0&chunkSize=0
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Basic mock(
+DELETE http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Basic mock)*
 POST http://localhost/index\.php/apps/notes/api/v1/notes\?category=&title=a&content=&modified=0&favorite=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notifications/endpoint/delete_all_notifications.regexp b/packages/nextcloud/test/fixtures/notifications/endpoint/delete_all_notifications.regexp
@@ -1,3 +1,10 @@
+DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 POST http://localhost/ocs/v2\.php/apps/notifications/api/v2/admin_notifications/admin\?shortMessage=123&longMessage=456
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/notifications/endpoint/delete_notification.regexp b/packages/nextcloud/test/fixtures/notifications/endpoint/delete_notification.regexp
@@ -1,11 +1,25 @@
+DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 POST http://localhost/ocs/v2\.php/apps/notifications/api/v2/admin_notifications/admin\?shortMessage=123&longMessage=456
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
-DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications/2
+GET http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Bearer mock
+ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications/[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/fixtures/notifications/endpoint/get_notification.regexp b/packages/nextcloud/test/fixtures/notifications/endpoint/get_notification.regexp
@@ -1,11 +1,25 @@
+DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 POST http://localhost/ocs/v2\.php/apps/notifications/api/v2/admin_notifications/admin\?shortMessage=123&longMessage=456
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
-GET http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications/2
+GET http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+accept-encoding: gzip
+content-length: 0
+authorization: Bearer mock
+ocs-apirequest: true
+GET http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications/[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 accept-encoding: gzip

diff --git a/packages/nextcloud/test/fixtures/notifications/endpoint/list_notifications.regexp b/packages/nextcloud/test/fixtures/notifications/endpoint/list_notifications.regexp
@@ -1,3 +1,10 @@
+DELETE http://localhost/ocs/v2\.php/apps/notifications/api/v2/notifications
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 POST http://localhost/ocs/v2\.php/apps/notifications/api/v2/admin_notifications/admin\?shortMessage=123&longMessage=456
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/spreed/chat/get_messages/directly.regexp b/packages/nextcloud/test/fixtures/spreed/chat/get_messages/directly.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=1&invite=user2&roomName=&source=&objectType=&objectId=
+POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=3&invite=&roomName=Test&source=&objectType=&objectId=
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked
@@ -12,7 +12,7 @@ transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
-POST http://localhost/ocs/v2\.php/apps/spreed/api/v1/chat/[a-z0-9]{8}\?message=123&actorDisplayName=&referenceId=&replyTo=2&silent=0
+POST http://localhost/ocs/v2\.php/apps/spreed/api/v1/chat/[a-z0-9]{8}\?message=123&actorDisplayName=&referenceId=&replyTo=[0-9]+&silent=0
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/fixtures/spreed/chat/get_messages/polling.regexp b/packages/nextcloud/test/fixtures/spreed/chat/get_messages/polling.regexp
@@ -12,7 +12,7 @@ transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
-GET http://localhost/ocs/v2\.php/apps/spreed/api/v1/chat/[a-z0-9]{8}\?lookIntoFuture=1&limit=100&lastKnownMessageId=2&lastCommonReadId=0&timeout=3&setReadMarker=1&includeLastKnown=0&noStatusUpdate=0&markNotificationsAsRead=1
+GET http://localhost/ocs/v2\.php/apps/spreed/api/v1/chat/[a-z0-9]{8}\?lookIntoFuture=1&limit=100&lastKnownMessageId=[0-9]+&lastCommonReadId=0&timeout=3&setReadMarker=1&includeLastKnown=0&noStatusUpdate=0&markNotificationsAsRead=1
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 accept-encoding: gzip

diff --git a/packages/nextcloud/test/fixtures/spreed/chat/send_message.regexp b/packages/nextcloud/test/fixtures/spreed/chat/send_message.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=1&invite=user2&roomName=&source=&objectType=&objectId=
+POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=3&invite=&roomName=Test&source=&objectType=&objectId=
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/fixtures/spreed/signaling/send_and_receive_messages.regexp b/packages/nextcloud/test/fixtures/spreed/signaling/send_and_receive_messages.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=1&invite=user2&roomName=&source=&objectType=&objectId=
+POST http://localhost/ocs/v2\.php/apps/spreed/api/v4/room\?roomType=3&invite=&roomName=Test&source=&objectType=&objectId=
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/fixtures/user_status/heartbeat/heartbeat.regexp b/packages/nextcloud/test/fixtures/user_status/heartbeat/heartbeat.regexp
@@ -1,3 +1,17 @@
+PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/heartbeat\?status=online
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/user_status/statuses/find_all.regexp b/packages/nextcloud/test/fixtures/user_status/statuses/find_all.regexp
@@ -1,11 +1,11 @@
-GET http://localhost/ocs/v2\.php/apps/user_status/api/v1/statuses
+PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
+transfer-encoding: chunked
 accept-encoding: gzip
-content-length: 0
 authorization: Bearer mock
 ocs-apirequest: true
-PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/fixtures/user_status/user_status/clear_message.regexp b/packages/nextcloud/test/fixtures/user_status/user_status/clear_message.regexp
@@ -1,3 +1,17 @@
+PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message/custom\?statusIcon=%F0%9F%98%80&message=bla&clearAt=[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/user_status/user_status/find.regexp b/packages/nextcloud/test/fixtures/user_status/user_status/find.regexp
@@ -5,6 +5,13 @@ transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 GET http://localhost/ocs/v2\.php/apps/user_status/api/v1/statuses/user1
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/user_status/user_status/get.regexp b/packages/nextcloud/test/fixtures/user_status/user_status/get.regexp
@@ -5,6 +5,13 @@ transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
 ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 GET http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json

diff --git a/packages/nextcloud/test/fixtures/user_status/user_status/set.regexp b/packages/nextcloud/test/fixtures/user_status/user_status/set.regexp
@@ -4,4 +4,18 @@ accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Bearer mock
+ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
+PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/user_status/user_status/set_custom_message.regexp b/packages/nextcloud/test/fixtures/user_status/user_status/set_custom_message.regexp
@@ -1,3 +1,17 @@
+PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/status\?statusType=online
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
+DELETE http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message
+user-agent: Dart/3\.2 \(dart:io\)
+accept: application/json
+transfer-encoding: chunked
+accept-encoding: gzip
+authorization: Bearer mock
+ocs-apirequest: true
 PUT http://localhost/ocs/v2\.php/apps/user_status/api/v1/user_status/message/custom\?statusIcon=%F0%9F%98%80&message=bla&clearAt=[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json