Merge pull request #1302 from nextcloud/feat/nextcloud_test/server-28

nextcloud · Dec 15, 2023 · 1ad7663 · 1ad7663
2 parents 999d805 + f314317
commit 1ad7663
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 25 deletions.
diff --git a/packages/nextcloud/lib/src/helpers/core.dart b/packages/nextcloud/lib/src/helpers/core.dart
@@ -8,7 +8,7 @@ import 'package:version/version.dart';
 final minVersion = Version(26, 0, 0);
 
 /// Maximum major of core/Server supported
-const maxMajor = 27;
+const maxMajor = 28;
 
 extension CoreVersionCheck on core.Client {
   /// Check if the core/Server version is supported by this client

diff --git a/packages/nextcloud/lib/src/helpers/spreed.dart b/packages/nextcloud/lib/src/helpers/spreed.dart
@@ -7,7 +7,7 @@ import 'package:version/version.dart';
 final minVersion = Version(16, 0, 0);
 
 /// Maximum major of spreed supported
-const maxMajor = 17;
+const maxMajor = 18;
 
 /// Extension for checking whether spreed is supported.
 extension SpreedVersionCheck on spreed.Client {

diff --git a/packages/nextcloud/test/fixtures/notes/delete_note.regexp b/packages/nextcloud/test/fixtures/notes/delete_note.regexp
@@ -10,7 +10,7 @@ accept: application/json
 accept-encoding: gzip
 content-length: 0
 authorization: Basic mock
-DELETE http://localhost/index\.php/apps/notes/api/v1/notes/182
+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

diff --git a/packages/nextcloud/test/fixtures/notes/get_note.regexp b/packages/nextcloud/test/fixtures/notes/get_note.regexp
@@ -4,7 +4,7 @@ accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Basic mock
-GET http://localhost/index\.php/apps/notes/api/v1/notes/182
+GET http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 accept-encoding: gzip

diff --git a/packages/nextcloud/test/fixtures/notes/update_note.regexp b/packages/nextcloud/test/fixtures/notes/update_note.regexp
@@ -4,13 +4,13 @@ accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Basic mock
-PUT http://localhost/index\.php/apps/notes/api/v1/notes/182\?title=b
+PUT http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+\?title=b
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Basic mock
-GET http://localhost/index\.php/apps/notes/api/v1/notes/182
+GET http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 accept-encoding: gzip

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
@@ -4,14 +4,14 @@ accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Basic mock
-PUT http://localhost/index\.php/apps/notes/api/v1/notes/182\?title=b
+PUT http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+\?title=b
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked
 accept-encoding: gzip
 authorization: Basic mock
 if-match: "[a-z0-9]{32}"
-PUT http://localhost/index\.php/apps/notes/api/v1/notes/182\?title=c
+PUT http://localhost/index\.php/apps/notes/api/v1/notes/[0-9]+\?title=c
 user-agent: Dart/3\.2 \(dart:io\)
 accept: application/json
 transfer-encoding: chunked

diff --git a/packages/nextcloud/test/spreed_test.dart b/packages/nextcloud/test/spreed_test.dart
@@ -71,7 +71,7 @@ void main() {
       group('Room', () {
         test('Get rooms', () async {
           final response = await client1.spreed.room.getRooms();
-          expect(response.body.ocs.data, hasLength(1));
+          expect(response.body.ocs.data, isNotEmpty);
           expect(response.body.ocs.data[0].id, 1);
           expect(response.body.ocs.data[0].token, isNotEmpty);
           expect(response.body.ocs.data[0].type, spreed.RoomType.changelog.value);

diff --git a/packages/nextcloud_test/bin/generate_presets.dart b/packages/nextcloud_test/bin/generate_presets.dart
@@ -32,10 +32,14 @@ Future<void> main() async {
       final buffer = StringBuffer()..writeln('SERVER_VERSION=$serverVersion');
 
       for (final a in apps) {
+        buffer
+          ..write(a.id.toUpperCase())
+          ..write('_URL=');
         if (a == app) {
-          buffer.writeln('${a.id.toUpperCase()}_URL=${release.url}');
+          buffer.writeln(release.url);
         } else {
-          buffer.writeln('${a.id.toUpperCase()}_URL=${a.findLatestRelease(serverVersion).url}');
+          final release = a.findLatestCompatibleRelease(serverVersion) ?? a.findLatestRelease();
+          buffer.writeln(release.url);
         }
       }
 
@@ -53,7 +57,8 @@ Future<void> main() async {
     final buffer = StringBuffer()..writeln('SERVER_VERSION=$serverVersion');
 
     for (final app in apps) {
-      buffer.writeln('${app.id.toUpperCase()}_URL=${app.findLatestRelease(serverVersion).url}');
+      final release = app.findLatestCompatibleRelease(serverVersion) ?? app.findLatestRelease();
+      buffer.writeln('${app.id.toUpperCase()}_URL=${release.url}');
     }
 
     File('${serverPresetsDir.path}/${serverVersion.withoutPatch()}').writeAsStringSync(buffer.toString());

diff --git a/packages/nextcloud_test/docker/Dockerfile b/packages/nextcloud_test/docker/Dockerfile
@@ -45,7 +45,7 @@ RUN curl -L "$SPREED_URL" | tar -xz -C /
 FROM nextcloud
 
 COPY --from=news /news /usr/src/nextcloud/apps/news
-RUN ./occ app:enable news
+RUN ./occ app:enable news --force # TODO remove once news supports server 28
 
 COPY --from=notes /notes /usr/src/nextcloud/apps/notes
 RUN ./occ app:enable notes

diff --git a/packages/nextcloud_test/docker/presets/latest b/packages/nextcloud_test/docker/presets/latest
@@ -1 +1 @@
-server/27.1
+server/28.0
diff --git a/packages/nextcloud_test/docker/presets/notes/4.8 b/packages/nextcloud_test/docker/presets/notes/4.8
@@ -1,5 +1,5 @@
-SERVER_VERSION=27.1.4
+SERVER_VERSION=28.0.0
 NEWS_URL=https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v17.1.3/spreed-v17.1.3.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.4.1.tar.gz
diff --git a/packages/nextcloud_test/docker/presets/notes/4.9 b/packages/nextcloud_test/docker/presets/notes/4.9
@@ -1,5 +1,5 @@
-SERVER_VERSION=27.1.4
+SERVER_VERSION=28.0.0
 NEWS_URL=https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v17.1.3/spreed-v17.1.3.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.4.1.tar.gz
diff --git a/packages/nextcloud_test/docker/presets/server/28.0 b/packages/nextcloud_test/docker/presets/server/28.0
@@ -0,0 +1,5 @@
+SERVER_VERSION=28.0.0
+NEWS_URL=https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
+NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz
+UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.4.1.tar.gz
diff --git a/packages/nextcloud_test/docker/presets/spreed/18.0 b/packages/nextcloud_test/docker/presets/spreed/18.0
@@ -0,0 +1,5 @@
+SERVER_VERSION=28.0.0
+NEWS_URL=https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
+NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz
+UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.4.1.tar.gz
diff --git a/packages/nextcloud_test/docker/presets/uppush/1.4 b/packages/nextcloud_test/docker/presets/uppush/1.4
@@ -1,5 +1,5 @@
-SERVER_VERSION=27.1.4
+SERVER_VERSION=28.0.0
 NEWS_URL=https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
 NOTES_URL=https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz
-SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v17.1.3/spreed-v17.1.3.tar.gz
+SPREED_URL=https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz
 UPPUSH_URL=https://codeberg.org/NextPush/uppush/archive/1.4.1.tar.gz
diff --git a/packages/nextcloud_test/lib/src/app.dart b/packages/nextcloud_test/lib/src/app.dart
@@ -19,18 +19,20 @@ typedef App = ({
 
 @internal
 extension AppFindLatestRelease on App {
-  AppRelease findLatestRelease(final ExtendedVersion serverVersion) {
+  AppRelease? findLatestCompatibleRelease(final ExtendedVersion serverVersion) {
     final compatibleReleases = releases
         .where(
           (final release) =>
               serverVersion >= release.minimumServerVersion && serverVersion <= release.maximumServerVersion,
         )
         .toList()
       ..sort((final a, final b) => b.version.compareTo(a.version));
-    if (compatibleReleases.isEmpty) {
-      throw Exception('App $id has no compatible release with server $serverVersion.');
-    }
-    return compatibleReleases.first;
+    return compatibleReleases.firstOrNull;
+  }
+
+  AppRelease findLatestRelease() {
+    final sortedReleases = releases..sort((final a, final b) => b.version.compareTo(a.version));
+    return sortedReleases.first;
   }
 }