refactor(nextcloud_test): Abstract test targets

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Jul 28, 2024 · 3135832 · 3135832
1 parent 0aacd5d
commit 3135832
Show file tree

Hide file tree

Showing 35 changed files with 362 additions and 281 deletions.
diff --git a/packages/nextcloud/test/cookbook_test.dart b/packages/nextcloud/test/cookbook_test.dart
@@ -6,20 +6,21 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'cookbook',
     'cookbook',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
-
-      setUp(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(container);
+      setUpAll(() async {
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient();
       });
-
-      tearDown(() async {
-        await container.destroy();
+      tearDownAll(() async {
+        await target.destroy();
       });
 
       group('CookbookVersionCheck', () {
@@ -115,7 +116,7 @@ void main() {
 
       group('recipes', () {
         test('callImport', () async {
-          final url = cookbook.UrlBuilder()..url = 'http://localhost/static/recipe.html';
+          final url = cookbook.UrlBuilder()..url = '${target.targetURL}/static/recipe.html';
           final response = await client.cookbook.recipes.$import($body: url.build());
           addTearDown(() async {
             closeFixture();

diff --git a/packages/nextcloud/test/core_test.dart b/packages/nextcloud/test/core_test.dart
@@ -7,18 +7,21 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'server',
     'core',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(container);
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient();
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
 
       test('Is supported from capabilities', () async {
@@ -166,7 +169,7 @@ void main() {
       group('App password', () {
         test('Delete', () async {
           // Separate client to not break other tests
-          final client = await TestNextcloudClient.create(container);
+          final client = await target.createClient();
 
           await client.core.appPassword.deleteAppPassword();
           await expectLater(

diff --git a/packages/nextcloud/test/dashboard_test.dart b/packages/nextcloud/test/dashboard_test.dart
@@ -4,18 +4,21 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'server',
     'dashboard',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(container);
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient();
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
 
       test('Get widgets', () async {

diff --git a/packages/nextcloud/test/fixtures/cookbook/recipes/callimport.regexp b/packages/nextcloud/test/fixtures/cookbook/recipes/callimport.regexp
@@ -2,4 +2,4 @@ POST http://localhost/index\.php/apps/cookbook/api/v1/import
 accept: application/json
 authorization: Basic mock
 content-type: application/json; charset=utf-8
-\{"url":"http://localhost/static/recipe\.html"\}
+\{"url":"http://.*/static/recipe\.html"\}
diff --git a/packages/nextcloud/test/fixtures/news/add_feed.regexp b/packages/nextcloud/test/fixtures/news/add_feed.regexp
@@ -1,7 +1,7 @@
 GET http://localhost/index\.php/apps/news/api/v1-3/feeds
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/feeds

diff --git a/packages/nextcloud/test/fixtures/news/add_feed_to_folder.regexp b/packages/nextcloud/test/fixtures/news/add_feed_to_folder.regexp
@@ -1,6 +1,6 @@
 POST http://localhost/index\.php/apps/news/api/v1-3/folders\?name=test1
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml&folderId=[0-9]+
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml&folderId=[0-9]+
 accept: application/json
 authorization: Basic mock
diff --git a/packages/nextcloud/test/fixtures/news/delete_feed.regexp b/packages/nextcloud/test/fixtures/news/delete_feed.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 DELETE http://localhost/index\.php/apps/news/api/v1-3/feeds/[0-9]+

diff --git a/packages/nextcloud/test/fixtures/news/list_articles.regexp b/packages/nextcloud/test/fixtures/news/list_articles.regexp
@@ -1,7 +1,7 @@
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=3&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=3&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/list_updated_articles.regexp b/packages/nextcloud/test/fixtures/news/list_updated_articles.regexp
@@ -1,10 +1,10 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=3&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fnasa\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fnasa\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=3&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/mark_article_as_read.regexp b/packages/nextcloud/test/fixtures/news/mark_article_as_read.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=6&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/mark_article_as_unread.regexp b/packages/nextcloud/test/fixtures/news/mark_article_as_unread.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=6&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/mark_feed_as_read.regexp b/packages/nextcloud/test/fixtures/news/mark_feed_as_read.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=6&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/mark_folder_as_read.regexp b/packages/nextcloud/test/fixtures/news/mark_folder_as_read.regexp
@@ -1,7 +1,7 @@
 POST http://localhost/index\.php/apps/news/api/v1-3/folders\?name=test1
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml&folderId=[0-9]+
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml&folderId=[0-9]+
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=6&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/move_feed_to_folder.regexp b/packages/nextcloud/test/fixtures/news/move_feed_to_folder.regexp
@@ -1,7 +1,7 @@
 POST http://localhost/index\.php/apps/news/api/v1-3/folders\?name=test1
 accept: application/json
 authorization: Basic mock
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 POST http://localhost/index\.php/apps/news/api/v1-3/feeds/[0-9]+/move\?folderId=[0-9]+

diff --git a/packages/nextcloud/test/fixtures/news/rename_feed.regexp b/packages/nextcloud/test/fixtures/news/rename_feed.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 POST http://localhost/index\.php/apps/news/api/v1-3/feeds/[0-9]+/rename\?feedTitle=test1

diff --git a/packages/nextcloud/test/fixtures/news/star_article.regexp b/packages/nextcloud/test/fixtures/news/star_article.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=2&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/fixtures/news/unstar_article.regexp b/packages/nextcloud/test/fixtures/news/unstar_article.regexp
@@ -1,4 +1,4 @@
-POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2Flocalhost%2Fstatic%2Fwikipedia\.xml
+POST http://localhost/index\.php/apps/news/api/v1-3/feeds\?url=http%3A%2F%2F.*%2Fstatic%2Fwikipedia\.xml
 accept: application/json
 authorization: Basic mock
 GET http://localhost/index\.php/apps/news/api/v1-3/items\?type=3&id=0&getRead=1&batchSize=-1&offset=0&oldestFirst=0

diff --git a/packages/nextcloud/test/news_test.dart b/packages/nextcloud/test/news_test.dart
@@ -6,18 +6,21 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'news',
     'news',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(container);
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient();
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
       tearDown(() async {
         closeFixture();
@@ -34,12 +37,12 @@ void main() {
       });
 
       Future<DynamiteResponse<news.ListFeeds, void>> addWikipediaFeed([int? folderID]) async => client.news.addFeed(
-            url: 'http://localhost/static/wikipedia.xml',
+            url: '${target.targetURL}/static/wikipedia.xml',
             folderId: folderID,
           );
 
       Future<DynamiteResponse<news.ListFeeds, void>> addNasaFeed() async => client.news.addFeed(
-            url: 'http://localhost/static/nasa.xml',
+            url: '${target.targetURL}/static/nasa.xml',
           );
 
       test('Is supported', () async {
@@ -65,7 +68,7 @@ void main() {
         expect(response.body.starredCount, null);
         expect(response.body.newestItemId, isNotNull);
         expect(response.body.feeds, hasLength(1));
-        expect(response.body.feeds[0].url, 'http://localhost/static/wikipedia.xml');
+        expect(response.body.feeds[0].url, '${target.targetURL}/static/wikipedia.xml');
 
         response = await client.news.listFeeds();
         expect(response.statusCode, 200);
@@ -74,7 +77,7 @@ void main() {
         expect(response.body.starredCount, 0);
         expect(response.body.newestItemId, isNotNull);
         expect(response.body.feeds, hasLength(1));
-        expect(response.body.feeds[0].url, 'http://localhost/static/wikipedia.xml');
+        expect(response.body.feeds[0].url, '${target.targetURL}/static/wikipedia.xml');
       });
 
       test('Delete feed', () async {
@@ -423,7 +426,7 @@ void main() {
         expect(response.body.newestItemId, isNotNull);
         expect(response.body.feeds, hasLength(1));
         expect(response.body.feeds[0].folderId, isPositive);
-        expect(response.body.feeds[0].url, 'http://localhost/static/wikipedia.xml');
+        expect(response.body.feeds[0].url, '${target.targetURL}/static/wikipedia.xml');
       });
 
       test('Mark folder as read', () async {

diff --git a/packages/nextcloud/test/notes_test.dart b/packages/nextcloud/test/notes_test.dart
@@ -6,18 +6,21 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'notes',
     'notes',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(container);
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient();
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
       tearDown(() async {
         closeFixture();

diff --git a/packages/nextcloud/test/notifications_test.dart b/packages/nextcloud/test/notifications_test.dart
@@ -8,21 +8,23 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'server',
     'notifications',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(
-          container,
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient(
           username: 'admin',
         );
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
 
       Future<void> sendTestNotification() async {

diff --git a/packages/nextcloud/test/provisioning_api_test.dart b/packages/nextcloud/test/provisioning_api_test.dart
@@ -5,21 +5,23 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'server',
     'provisioning_api',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(
-          container,
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient(
           username: 'admin',
         );
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
 
       group('Users', () {

diff --git a/packages/nextcloud/test/settings_test.dart b/packages/nextcloud/test/settings_test.dart
@@ -6,21 +6,23 @@ import 'package:nextcloud_test/nextcloud_test.dart';
 import 'package:test/test.dart';
 
 void main() {
+  final targetFactory = TestTargetFactory.create();
+
   presets(
+    targetFactory,
     'server',
     'settings',
     (preset) {
-      late DockerContainer container;
+      late TestTargetInstance target;
       late NextcloudClient client;
       setUpAll(() async {
-        container = await DockerContainer.create(preset);
-        client = await TestNextcloudClient.create(
-          container,
+        target = await targetFactory.spawn(preset);
+        client = await target.createClient(
           username: 'admin',
         );
       });
       tearDownAll(() async {
-        await container.destroy();
+        await target.destroy();
       });
 
       group('Logs', () {