test: run all tests on Windows (#342)

invertase · Jul 5, 2022 · 44ba1e3 · 44ba1e3
1 parent 0c64d61
commit 44ba1e3
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 209 deletions.
diff --git a/packages/melos/test/commands/exec_test.dart b/packages/melos/test/commands/exec_test.dart
@@ -1,6 +1,5 @@
 import 'package:melos/melos.dart';
 import 'package:melos/src/common/io.dart';
-import 'package:melos/src/common/platform.dart';
 import 'package:melos/src/common/utils.dart';
 import 'package:path/path.dart';
 import 'package:pubspec/pubspec.dart';
@@ -11,47 +10,45 @@ import '../utils.dart';
 
 void main() {
   group('exec', () {
-    test(
-      'supports package filter',
-      () async {
-        final workspaceDir = createTemporaryWorkspaceDirectory();
+    test('supports package filter', () async {
+      final workspaceDir = createTemporaryWorkspaceDirectory();
 
-        final aDir = await createProject(
-          workspaceDir,
-          const PubSpec(name: 'a'),
-        );
-        writeTextFile(join(aDir.path, 'log.txt'), '');
+      final aDir = await createProject(
+        workspaceDir,
+        const PubSpec(name: 'a'),
+      );
+      writeTextFile(join(aDir.path, 'log.txt'), '');
 
-        final bDir = await createProject(
-          workspaceDir,
-          const PubSpec(name: 'b'),
-        );
-        writeTextFile(join(bDir.path, 'log.txt'), '');
+      final bDir = await createProject(
+        workspaceDir,
+        const PubSpec(name: 'b'),
+      );
+      writeTextFile(join(bDir.path, 'log.txt'), '');
 
-        await createProject(
-          workspaceDir,
-          const PubSpec(name: 'c'),
-        );
+      await createProject(
+        workspaceDir,
+        const PubSpec(name: 'c'),
+      );
 
-        final logger = TestLogger();
-        final config = await MelosWorkspaceConfig.fromDirectory(workspaceDir);
-        final melos = Melos(
-          logger: logger,
-          config: config,
-        );
+      final logger = TestLogger();
+      final config = await MelosWorkspaceConfig.fromDirectory(workspaceDir);
+      final melos = Melos(
+        logger: logger,
+        config: config,
+      );
 
-        await melos.exec(
-          ['echo', 'hello', 'world'],
-          concurrency: 1,
-          filter: PackageFilter(
-            fileExists: ['log.txt'],
-          ),
-        );
+      await melos.exec(
+        ['echo', 'hello', 'world'],
+        concurrency: 1,
+        filter: PackageFilter(
+          fileExists: ['log.txt'],
+        ),
+      );
 
-        expect(
-          logger.output,
-          ignoringAnsii(
-            '''
+      expect(
+        logger.output.normalizeNewLines(),
+        ignoringAnsii(
+          '''
 \$ melos exec
   └> echo hello world
      └> RUNNING (in 2 packages)
@@ -70,14 +67,9 @@ ${'-' * terminalWidth}
   └> echo hello world
      └> SUCCESS
 ''',
-          ),
-        );
-      },
-      // TODO test is not compatible with Windows (windows prints
-      // `hello world\r\n` for carriage returns, whereas here they
-      // appear as `hello world\n`)
-      skip: currentPlatform.isWindows,
-    );
+        ),
+      );
+    });
 
     // TODO test that environemnt variables are injected
   });

diff --git a/packages/melos/test/commands/list_test.dart b/packages/melos/test/commands/list_test.dart
@@ -2,9 +2,9 @@ import 'dart:convert';
 
 import 'package:melos/src/commands/runner.dart';
 import 'package:melos/src/common/glob.dart';
-import 'package:melos/src/common/platform.dart';
 import 'package:melos/src/package.dart';
 import 'package:melos/src/workspace_configs.dart';
+import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 
@@ -184,13 +184,16 @@ packages/c
       test(
         'full package path is printed by default if relativePaths is false or not set',
         withMockFs(() async {
+          final packages = [
+            MockPackageFs(name: 'a'),
+            MockPackageFs(name: 'b'),
+            MockPackageFs(name: 'c'),
+          ];
           final workspaceDir = createMockWorkspaceFs(
-            packages: [
-              MockPackageFs(name: 'a'),
-              MockPackageFs(name: 'b'),
-              MockPackageFs(name: 'c'),
-            ],
+            packages: packages,
           );
+          final packagePaths = packages
+              .map((package) => p.join(workspaceDir.path, package.path));
 
           final config = await MelosWorkspaceConfig.fromDirectory(workspaceDir);
           final melos = Melos(logger: logger, config: config);
@@ -202,15 +205,11 @@ packages/c
             logger.output,
             ignoringAnsii(
               '''
-/melos_workspace/packages/a
-/melos_workspace/packages/b
-/melos_workspace/packages/c
+${packagePaths.join('\n')}
 ''',
             ),
           );
         }),
-        // TODO test output is not compatible with windows
-        skip: currentPlatform.isWindows,
       );
     });