refactor: Remove common test

conduit-dart · Mar 1, 2023 · cebcc41 · cebcc41
1 parent 496d1c9
commit cebcc41
Show file tree

Hide file tree

Showing 88 changed files with 1,037 additions and 204 deletions.
diff --git a/packages/cli/lib/src/commands/create.dart b/packages/cli/lib/src/commands/create.dart
@@ -60,7 +60,6 @@ class CLITemplateCreator extends CLICommand {
         if (!addDependencyOverridesToPackage(destDirectory.path, {
           "conduit_codable": _packageUri(conduitLocation, 'codable'),
           "conduit_common": _packageUri(conduitLocation, 'common'),
-          "conduit_common_test": _packageUri(conduitLocation, 'common_test'),
           "conduit_config": _packageUri(conduitLocation, 'config'),
           "conduit_core": _packageUri(conduitLocation, 'core'),
           "conduit_isolate_exec": _packageUri(conduitLocation, 'isolate_exec'),

diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml
@@ -25,8 +25,6 @@ dependencies:
   pub_semver: ^2.0.0
   yaml: ^3.1.0
 dev_dependencies:
-  conduit_common_test:
-    path: ../common_test
   conduit_test:
     path: ../test_harness
   fs_test_agent:

diff --git a/packages/cli/pubspec_overrides.yaml b/packages/cli/pubspec_overrides.yaml
@@ -1,11 +1,9 @@
-# melos_managed_dependency_overrides: conduit_common_test,fs_test_agent
+# melos_managed_dependency_overrides: fs_test_agent
 dependency_overrides:
   conduit_codable:
     path: ../codable
   conduit_common:
     path: ../common
-  conduit_common_test:
-    path: ../common_test
   conduit_config:
     path: ../config
   conduit_core:

diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.19.2 <4.0.0"
 
 dependencies:
-  conduit: ^4.3.6
+  conduit: ^4.3.7
   conduit_core: ^4.3.6
   conduit_postgresql: ^4.3.6
 

diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.19.2 <4.0.0"
 
 dependencies:
-  conduit: ^4.3.6
+  conduit: ^4.3.7
   conduit_core: ^4.3.6
   conduit_postgresql: ^4.3.6
 

diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.19.2 <4.0.0"
 
 dependencies:
-  conduit: ^4.3.6
+  conduit: ^4.3.7
   conduit_core: ^4.3.6
 
 dev_dependencies:

diff --git a/packages/cli/test/auth_test.dart b/packages/cli/test/auth_test.dart
@@ -1,12 +1,12 @@
 @Timeout(Duration(seconds: 120))
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_core/managed_auth.dart';
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:path/path.dart';
 import 'package:test/test.dart';
 
 import 'not_tests/cli_helpers.dart';
+import 'not_tests/postgres_test_config.dart';
 
 void main() {
   final dataModel = ManagedDataModel.fromCurrentMirrorSystem();

diff --git a/packages/cli/test/migration_execution_test.dart b/packages/cli/test/migration_execution_test.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:conduit/src/migration_source.dart';
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_postgresql/conduit_postgresql.dart';
 import 'package:conduit_runtime/src/analyzer.dart';
@@ -12,6 +11,7 @@ import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:test/test.dart';
 
 import 'not_tests/cli_helpers.dart';
+import 'not_tests/postgres_test_config.dart';
 
 late CLIClient cli;
 DatabaseConfiguration connectInfo =

diff --git a/packages/cli/test/migration_test.dart b/packages/cli/test/migration_test.dart
@@ -4,10 +4,11 @@ import 'dart:io';
 import 'package:conduit/src/command.dart';
 import 'package:conduit/src/mixins/database_managing.dart';
 import 'package:conduit/src/mixins/project.dart';
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 
+import 'not_tests/postgres_test_config.dart';
+
 void main() {
   group("Cooperation", () {
     late PersistentStore store;

diff --git a/packages/cli/test/not_tests/cli_helpers.dart b/packages/cli/test/not_tests/cli_helpers.dart
@@ -5,11 +5,12 @@ import 'dart:io';
 
 import 'package:conduit/src/runner.dart';
 import 'package:conduit/src/running_process.dart';
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:path/path.dart';
 
+import 'postgres_test_config.dart';
+
 class CLIClient {
   CLIClient(this.agent);
 

diff --git a/...src/db/postgres/postgres_test_config.dart → .../test/not_tests/postgres_test_config.dart b/...src/db/postgres/postgres_test_config.dart → .../test/not_tests/postgres_test_config.dart
diff --git a/packages/common_test/.gitignore b/packages/common_test/.gitignore
diff --git a/packages/common_test/CHANGELOG.md b/packages/common_test/CHANGELOG.md
diff --git a/packages/common_test/LICENSE b/packages/common_test/LICENSE
diff --git a/packages/common_test/README.md b/packages/common_test/README.md
diff --git a/packages/common_test/analysis_options.yaml b/packages/common_test/analysis_options.yaml
diff --git a/packages/common_test/lib/conduit_common_test.dart b/packages/common_test/lib/conduit_common_test.dart
diff --git a/packages/common_test/pubspec.yaml b/packages/common_test/pubspec.yaml
diff --git a/packages/common_test/pubspec_overrides.yaml b/packages/common_test/pubspec_overrides.yaml
diff --git a/packages/core/lib/src/runtime/compiler.dart b/packages/core/lib/src/runtime/compiler.dart
@@ -69,7 +69,6 @@ class ConduitCompiler extends Compiler {
     if (context.forTests) {
       final devPackages = [
         {'name': 'fs_test_agent', 'path': 'fs_test_agent'},
-        {'name': 'conduit_common_test', 'path': 'common_test'},
         {'name': 'conduit_test', 'path': 'test_harness'},
       ];
       final targetPubspecFile =

diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml
@@ -24,8 +24,8 @@ dependencies:
   recase: ^4.1.0
   yaml: ^3.1.0
 dev_dependencies:
-  conduit_common_test:
-    path: ../common_test
+  conduit_postgresql:
+    path: ../postgresql
   conduit_test:
     path: ../test_harness
   fs_test_agent:

diff --git a/packages/core/pubspec_overrides.yaml b/packages/core/pubspec_overrides.yaml
@@ -1,4 +1,4 @@
-# melos_managed_dependency_overrides: conduit_common_test,fs_test_agent
+# melos_managed_dependency_overrides: fs_test_agent
 dependency_overrides:
   conduit_codable:
     path: ../codable

diff --git a/packages/core/test/auth/auth_controller_test.dart b/packages/core/test/auth/auth_controller_test.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_test/conduit_test.dart';
 import 'package:test/test.dart';

diff --git a/packages/core/test/auth/auth_documentation_test.dart b/packages/core/test/auth/auth_documentation_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:conduit_common/conduit_common.dart';
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_open_api/v3.dart';
 import 'package:test/test.dart';

diff --git a/packages/core/test/auth/auth_redirect_controller_test.dart b/packages/core/test/auth/auth_redirect_controller_test.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_test/conduit_test.dart';
 import 'package:test/test.dart';

diff --git a/packages/core/test/auth/authenticate_test.dart b/packages/core/test/auth/authenticate_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_test/conduit_test.dart';
 import 'package:test/test.dart';

diff --git a/packages/core/test/auth/authorizer_test.dart b/packages/core/test/auth/authorizer_test.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';

diff --git a/packages/core/test/db/context_test.dart b/packages/core/test/db/context_test.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 
+import '../not_tests/postgres_test_config.dart';
+
 void main() {
   group("Multiple contexts, same data model", () {
     final dm = ManagedDataModel([T, U]);

diff --git a/packages/core/test/db/data_model_manager_test.dart b/packages/core/test/db/data_model_manager_test.dart
@@ -1,4 +1,4 @@
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 

diff --git a/packages/core/test/db/data_model_test.dart b/packages/core/test/db/data_model_test.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: avoid_setters_without_getters
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_test/conduit_test.dart';
 import 'package:test/test.dart';

diff --git a/packages/core/test/db/data_model_type_search_test.dart b/packages/core/test/db/data_model_type_search_test.dart
@@ -1,4 +1,4 @@
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 

diff --git a/packages/core/test/db/model_controller_test.dart b/packages/core/test/db/model_controller_test.dart
@@ -4,11 +4,12 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
+import '../not_tests/postgres_test_config.dart';
+
 void main() {
   Controller.letUncaughtExceptionsEscape = true;
   late ManagedContext context;

diff --git a/packages/core/test/db/model_test.dart b/packages/core/test/db/model_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 

diff --git a/packages/core/test/db/query_test.dart b/packages/core/test/db/query_test.dart
@@ -1,7 +1,8 @@
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 
+import '../not_tests/postgres_test_config.dart';
+
 void main() {
   late ManagedContext ctx;
   setUpAll(() async {

diff --git a/packages/core/test/db/tracking_test.dart b/packages/core/test/db/tracking_test.dart
@@ -1,7 +1,8 @@
-import 'package:conduit_common_test/conduit_common_test.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';
 
+import '../not_tests/postgres_test_config.dart';
+
 void main() {
   ManagedContext? context;
   setUp(() async {

diff --git a/packages/core/test/db/validate_value_test.dart b/packages/core/test/db/validate_value_test.dart
@@ -1,4 +1,4 @@
-import 'package:conduit_common_test/conduit_common_test.dart';
+import '../not_tests/helpers.dart';
 import 'package:conduit_core/conduit_core.dart';
 import 'package:test/test.dart';