Increased test coverage. (#88)

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

Author: jackton1

.github/workflows/test.yml

@@ -51,6 +51,7 @@ jobs:
           git fetch origin feature/migration-test-02:feature/migration-test-02
           git fetch origin feature/migration-test-03:feature/migration-test-03
           git fetch origin feature/migration-test-04:feature/migration-test-04
+          git fetch origin feature/migration-test-05:feature/migration-test-05
         working-directory: migration_fixer/tests/demo
 
       - name: Install dependencies

migration_fixer/tests/demo

@@ -7,3 +7,5 @@
 TEST_03_MIGRATION_BRANCH = "feature/migration-test-03"
 # Single merge to main after 01 is merged (named module)
 TEST_04_MIGRATION_BRANCH = "feature/migration-test-04"
+# Multiple migrations with a named migration file
+TEST_05_MIGRATION_BRANCH = "feature/migration-test-05"

migration_fixer/tests/management/commands/_constants.py

@@ -9,6 +9,7 @@
     TEST_02_MIGRATION_BRANCH,
     TEST_03_MIGRATION_BRANCH,
     TEST_04_MIGRATION_BRANCH,
+    TEST_05_MIGRATION_BRANCH,
 )
 from migration_fixer.tests.management.commands._utils import (
     execute_command,
@@ -164,7 +165,7 @@ def test_run_makemigrations_with_fix_is_valid_for_multiple_file_conflicts_verbos
 
 @pytest.mark.env("test_04")
 @pytest.mark.django_db
-def test_run_makemigrations_fix_with_invlaid_module(git_repo):
+def test_run_makemigrations_fix_with_an_invalid_module(git_repo):
     expected_output = """Error: Unable to fix migration for "demo" app: testmodel_dob.py
 NOTE: It needs to begin with a number. eg. 0001_*
 """
@@ -179,3 +180,22 @@ def test_run_makemigrations_fix_with_invlaid_module(git_repo):
 
     assert target_branch.name == TEST_04_MIGRATION_BRANCH
     assert expected_output == output
+
+
+@pytest.mark.env("test_05")
+@pytest.mark.django_db
+def test_run_makemigrations_fix_with_mixed_invalid_modules(git_repo):
+    expected_output = """Error: Unable to fix migration for "demo" app: custom_migration.py
+NOTE: It needs to begin with a number. eg. 0001_*
+"""
+    cmd = Command(repo=git_repo.api)
+
+    with temporary_checkout(
+        git_repo,
+        default_branch_name=TEST_01_MIGRATION_BRANCH,
+        target_branch_name=TEST_05_MIGRATION_BRANCH,
+    ) as target_branch:
+        output = execute_command(cmd, default_branch=TEST_01_MIGRATION_BRANCH, fix=True)
+
+    assert target_branch.name == TEST_05_MIGRATION_BRANCH
+    assert expected_output == output

migration_fixer/tests/management/commands/test_makemigrations.py

@@ -83,13 +83,7 @@ def fix_numbered_migration(
         conflict_path = migration_path / basename
         conflict_parts = basename.split("_")
 
-        if str(conflict_parts[0]).isdigit():
-            conflict_parts[0] = next_
-        else:
-            raise ValueError(
-                f'Unable to fix migration: "{conflict_path.name}"\n'
-                f"NOTE: It needs to begin with a number. eg. 0001_*",
-            )
+        conflict_parts[0] = next_
 
         new_conflict_name = "_".join(conflict_parts)
 

migration_fixer/utils.py

@@ -48,6 +48,7 @@ commands =
     coverage run -a -m pytest --basetemp={envtmpdir} -E test_02
     coverage run -a -m pytest --basetemp={envtmpdir} -E test_03
     coverage run -a -m pytest --basetemp={envtmpdir} -E test_04
+    coverage run -a -m pytest --basetemp={envtmpdir} -E test_05
     coverage xml
 
 [testenv:flake8]