Merge pull request #1582 from nextcloud/refactor/neon_framework/dedup…

…licate-mock-server-implementations
nextcloud · Feb 6, 2024 · 7850338 · 7850338
2 parents 8c48281 + dacc15b
commit 7850338
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 44 deletions.
diff --git a/packages/neon_framework/lib/src/testing/mock_server.dart b/packages/neon_framework/lib/src/testing/mock_server.dart
@@ -0,0 +1,28 @@
+import 'package:http/http.dart';
+import 'package:http/testing.dart';
+import 'package:neon_framework/src/models/account.dart';
+
+/// Creates an [Account] connected to a fake server defined by [requests].
+///
+/// To be used for end-to-end testing `Bloc`s.
+Account mockServer(
+  Map<RegExp, Map<String, Response Function(RegExpMatch match, Map<String, String> queryParameters)>> requests,
+) =>
+    Account(
+      serverURL: Uri.parse('https://example.com'),
+      username: 'test',
+      password: 'test',
+      httpClient: MockClient((request) async {
+        for (final entry in requests.entries) {
+          final match = entry.key.firstMatch(request.url.path);
+          if (match != null) {
+            final call = entry.value[request.method];
+            if (call != null) {
+              return call(match, request.url.queryParameters);
+            }
+          }
+        }
+
+        throw Exception(request);
+      }),
+    );
diff --git a/packages/neon_framework/lib/testing.dart b/packages/neon_framework/lib/testing.dart
@@ -7,5 +7,6 @@ library;
 
 import 'package:flutter/material.dart';
 
+export 'package:neon_framework/src/testing/mock_server.dart';
 export 'package:neon_framework/src/testing/mocks.dart';
 export 'package:neon_framework/src/testing/utils.dart';
diff --git a/packages/neon_framework/test/user_status_bloc_test.dart b/packages/neon_framework/test/user_status_bloc_test.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart';
-import 'package:http/testing.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:neon_framework/blocs.dart';
 import 'package:neon_framework/platform.dart';
@@ -69,7 +68,7 @@ Account mockUserStatusAccount() {
         200,
       );
 
-  final requests = <RegExp, Map<String, Response Function(RegExpMatch match, Map<String, String> queryParameters)>>{
+  return mockServer({
     RegExp(r'/ocs/v2\.php/apps/user_status/api/v1/predefined_statuses'): {
       'get': (match, queryParameters) => predefinedStatusesResponse(),
     },
@@ -125,26 +124,7 @@ Account mockUserStatusAccount() {
         return statusResponse();
       },
     },
-  };
-
-  return Account(
-    serverURL: Uri.parse('https://example.com'),
-    username: 'test',
-    password: 'test',
-    httpClient: MockClient((request) async {
-      for (final entry in requests.entries) {
-        final match = entry.key.firstMatch(request.url.path);
-        if (match != null) {
-          final call = entry.value[request.method];
-          if (call != null) {
-            return call(match, request.url.queryParameters);
-          }
-        }
-      }
-
-      throw Exception(request);
-    }),
-  );
+  });
 }
 
 void main() {

diff --git a/packages/neon_framework/test/weather_status_bloc_test.dart b/packages/neon_framework/test/weather_status_bloc_test.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart';
-import 'package:http/testing.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:neon_framework/blocs.dart';
 import 'package:neon_framework/src/models/account.dart';
@@ -31,7 +30,7 @@ Account mockWeatherStatusAccount() {
         200,
       );
 
-  final requests = <RegExp, Map<String, Response Function(RegExpMatch match, Map<String, String> queryParameters)>>{
+  return mockServer({
     RegExp(r'/ocs/v2\.php/apps/weather_status/api/v1/location'): {
       'get': (match, queryParameters) => locationResponse(),
       'put': (match, queryParameters) {
@@ -92,26 +91,7 @@ Account mockWeatherStatusAccount() {
             200,
           ),
     },
-  };
-
-  return Account(
-    serverURL: Uri.parse('https://example.com'),
-    username: 'test',
-    password: 'test',
-    httpClient: MockClient((request) async {
-      for (final entry in requests.entries) {
-        final match = entry.key.firstMatch(request.url.path);
-        if (match != null) {
-          final call = entry.value[request.method];
-          if (call != null) {
-            return call(match, request.url.queryParameters);
-          }
-        }
-      }
-
-      throw Exception(request);
-    }),
-  );
+  });
 }
 
 core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data buildCapabilities({required bool enabled}) =>