Improve test coverage (#43)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: jackton1

.github/workflows/migrations.yml

@@ -20,6 +20,8 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
+        with:
+          submodules: migration_fixer/tests/demo
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/[email protected]

.github/workflows/test.yml

@@ -0,0 +1,3 @@
+[submodule "migration_fixer/tests/demo"]
+	path = migration_fixer/tests/demo
+	url = [email protected]:tj-django/demo.git

.gitmodules

@@ -75,34 +75,32 @@ increase-version: guard-PART  ## Increase project version
 	@bump2version $(PART)
 	@git switch -c main
 
-install-wheel:  ## Install wheel
+install-wheel: clean  ## Install wheel
 	@echo "Installing wheel..."
 	@pip install wheel
 
-install: clean requirements.txt install-wheel  ## install the package to the active Python's site-packages
+install: requirements.txt install-wheel  ## install the package to the active Python's site-packages
 	@pip install -r requirements.txt
 
-install-dev: clean requirements_dev.txt install-wheel  ## Install local dev packages
+install-dev: requirements_dev.txt install-wheel  ## Install local dev packages
 	@pip install -e .'[development]' -r requirements_dev.txt
 
-install-docs: clean install-wheel
+install-docs: install-wheel
 	@pip install -e .'[docs]'
 
-install-test: clean install-wheel
+install-test: install-wheel
 	@pip install -e .'[test]'
 
-install-lint: clean install-wheel
+install-lint: install-wheel
 	@pip install -e .'[lint]'
 
-install-deploy: clean install-wheel
+install-deploy: install-wheel
 	@pip install -e .'[deploy]'
 
-migrations:  ## Run django migrations without user input.
-	@echo "Generating migrations..."
-	@python manage.py makemigrations --fix --no-input
+test: install-test
+	@pytest --basetemp={envtmpdir}
 
-migrate:  ## Run django migrate without user input
-	@echo "Applying migrations..."
-	@python manage.py migrate --no-input
+migrations:
+	@python manage.py makemigrations
 
 .PHONY: clean clean-test clean-pyc clean-build docs help install-wheel install-docs install-dev install install-lint install-test install-deploy migrations

Makefile

@@ -45,7 +45,7 @@
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "migration_fixer",
-    "demo",
+    "migration_fixer.tests.demo",
 ]
 
 # Database

demo/apps.py

@@ -7,15 +7,22 @@
 
 from django.apps import apps
 from django.conf import settings
-from django.core.management.base import CommandError, no_translations
+from django.core.management.base import CommandError
 from django.core.management.commands.makemigrations import Command as BaseCommand
 from django.db import DEFAULT_DB_ALIAS, connections, router
 from django.db.migrations.loader import MigrationLoader
 
-from migration_fixer.utils import fix_migration, fix_numbered_migration, run_command
+from migration_fixer.utils import (
+    fix_migration,
+    fix_numbered_migration,
+    no_translations,
+    run_command,
+)
 
 
 class Command(BaseCommand):
+    success_msg = "Successfully fixed migrations."
+
     def add_arguments(self, parser):
         parser.add_argument(
             "--fix",
@@ -199,25 +206,30 @@ def handle(self, *app_labels, **options):
 
                             seed_split = last_remote_filename.split("_")
 
-                            if (
-                                seed_split
-                                and len(seed_split) > 1
-                                and str(seed_split[0]).isdigit()
-                            ):
-                                fix_numbered_migration(
-                                    app_label=app_label,
-                                    migration_path=migration_path,
-                                    seed=int(seed_split[0]),
-                                    start_name=last_remote_filename,
-                                    changed_files=changed_files,
-                                )
+                            try:
+                                if (
+                                    seed_split
+                                    and len(seed_split) > 1
+                                    and str(seed_split[0]).isdigit()
+                                ):
+                                    fix_numbered_migration(
+                                        app_label=app_label,
+                                        migration_path=migration_path,
+                                        seed=int(seed_split[0]),
+                                        start_name=last_remote_filename,
+                                        changed_files=changed_files,
+                                    )
+                                else:
+                                    fix_migration(
+                                        app_label=app_label,
+                                        migration_path=migration_path,
+                                        start_name=last_remote_filename,
+                                        changed_files=changed_files,
+                                    )
+                            except (ValueError, IndexError, TypeError) as e:
+                                self.stderr.write(f"Error: {e}")
                             else:
-                                fix_migration(
-                                    app_label=app_label,
-                                    migration_path=migration_path,
-                                    start_name=last_remote_filename,
-                                    changed_files=changed_files,
-                                )
+                                self.stdout.write(self.success_msg)
 
         else:
             return super(Command, self).handle(*app_labels, **options)

demo/migrations/0001_initial.py

@@ -9,33 +9,23 @@
 
 class BaseCommandTestCase(with_metaclass(abc.ABCMeta, TestCase)):
     cmd_class: Type[BaseCommand]
-    cmd_name = None
     expected_output: str
     base_kwargs = {"verbosity": 0}
 
-    @classmethod
-    @abc.abstractmethod
-    def setup_command_data(cls, *arg, **kwargs):
-        pass
-
     @classmethod
     def setup_command(cls, *args, **kwargs):
-        cmd = cls.cmd_name
-
-        if cls.cmd_class is not None and issubclass(cls.cmd_class, BaseCommand):
-            cmd = cls.cmd_class()
+        cmd = cls.cmd_class()
 
-        if cmd is not None:
-            out = StringIO()
+        out = StringIO()
 
-            kwargs["stdout"] = out
-            kwargs.update(cls.base_kwargs)
+        kwargs["stdout"] = out
+        kwargs.update(cls.base_kwargs)
 
-            call_command(cmd, *args, **kwargs)
+        call_command(cmd, *args, **kwargs)
 
-            output = out.getvalue()
+        output = out.getvalue()
 
-            if cls.expected_output is not None and cls.expected_output not in output:
-                raise AssertionError(
-                    f"Expected: {repr(cls.expected_output)} != {repr(output)}",
-                )
+        if cls.expected_output is not None and cls.expected_output not in output:
+            raise AssertionError(
+                f"Expected: {repr(cls.expected_output)} != {repr(output)}",
+            )