RepoAuditor 0.3.1__tar.gz → 0.4.1__tar.gz

{repoauditor-0.3.1 → repoauditor-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RepoAuditor
-Version: 0.3.1
+Version: 0.4.1
 Summary: Add your description here
 Project-URL: Homepage, https://github.com/gt-sse-center/RepoAuditor
 Project-URL: Documentation, https://github.com/gt-sse-center/RepoAuditor

{repoauditor-0.3.1 → repoauditor-0.4.1}/docs/DEVELOPMENT.md

@@ -107,7 +107,7 @@ Please follow the steps below to complete the configuration.
   - Enable `Require status checks to pass`.
     - Enable `Require branches to be up to date before merging`.
     - Set the `CI+CD Workflow / Validate (ubuntu-latest, 3.12)` or an equivalent check.
-  - Disable `Block force pushes`.
+  - Enable `Block force pushes`.
   - Be sure to hit `Save changes` at the end.
 
 ### Development Activities

{repoauditor-0.3.1 → repoauditor-0.4.1}/pyproject.toml

@@ -41,6 +41,7 @@ repoauditor = "RepoAuditor:EntryPoint.app"
 [project.entry-points.RepoAuditor]
 GitHubPlugin = "RepoAuditor.Plugins.GitHubPlugin"
 CommunityStandardsPlugin = "RepoAuditor.Plugins.CommunityStandardsPlugin"
+ScientificSoftwarePlugin = "RepoAuditor.Plugins.ScientificSoftwarePlugin"
 
 [build-system]
 requires = ["hatchling"]

{repoauditor-0.3.1 → repoauditor-0.4.1}/src/RepoAuditor/Plugins/CommunityStandards/CommunityStandardsQuery.py

@@ -23,24 +23,8 @@ from RepoAuditor.Plugins.CommunityStandards.Requirements.SecurityPolicy import S
 from RepoAuditor.Query import ExecutionStyle, Query
 
 
-class CommunityStandardsQuery(Query):
-    """Query with requirements that check for repository Community Standards files."""
-
-    def __init__(self) -> None:
-        super().__init__(
-            "CommunityStandardsQuery",
-            ExecutionStyle.Parallel,
-            [
-                ReadMe(),
-                CodeOfConduct(),
-                Contributing(),
-                LicenseFile(),
-                SecurityPolicy(),
-                IssueTemplates(),
-                PullRequestTemplate(),
-                CodeOwners(),
-            ],
-        )
+class CloneRepositoryMixin:
+    """A mixin class to clone a repository to a temporary directory."""
 
     # ----------------------------------------------------------------------
     @override
@@ -84,9 +68,30 @@ class CommunityStandardsQuery(Query):
 
         return module_data
 
+    # ----------------------------------------------------------------------
     @override
     def Cleanup(self, module_data: dict[str, Any]) -> None:
         """Clean up the cloned repository."""
         repo_dir = module_data["repo_dir"]
         repo_dir.cleanup()
         del module_data
+
+
+class CommunityStandardsQuery(CloneRepositoryMixin, Query):
+    """Query with requirements that check for repository Community Standards files."""
+
+    def __init__(self) -> None:
+        super().__init__(
+            "CommunityStandardsQuery",
+            ExecutionStyle.Parallel,
+            [
+                ReadMe(),
+                CodeOfConduct(),
+                Contributing(),
+                LicenseFile(),
+                SecurityPolicy(),
+                IssueTemplates(),
+                PullRequestTemplate(),
+                CodeOwners(),
+            ],
+        )

{repoauditor-0.3.1 → repoauditor-0.4.1}/src/RepoAuditor/Plugins/GitHub/RulesetQuery.py

@@ -11,8 +11,8 @@ from typing import Any, Optional
 from dbrownell_Common.Types import override
 
 from RepoAuditor.Impl.ParallelSequentialProcessor import ExecutionStyle
-from RepoAuditor.Plugins.GitHub.RulesetRequirements.AllowMainlineForcePushes import (
-    AllowMainlineForcePushesRule,
+from RepoAuditor.Plugins.GitHub.RulesetRequirements.BlockMainlineForcePushes import (
+    BlockMainlineForcePushesRule,
 )
 from RepoAuditor.Plugins.GitHub.RulesetRequirements.DismissStalePullRequestApprovals import (
     DismissStalePullRequestApprovalsRule,
@@ -68,7 +68,7 @@ class RulesetQuery(Query):
                 RequireStatusChecksToPassRule(),
                 RequireUpToDateBranchesRule(),
                 EnsureStatusChecksRule(),
-                AllowMainlineForcePushesRule(),
+                BlockMainlineForcePushesRule(),
                 RequireCodeScanningResultsRule(),
             ],
         )

repoauditor-0.3.1/src/RepoAuditor/Plugins/GitHub/RulesetRequirements/AllowMainlineForcePushes.py → repoauditor-0.4.1/src/RepoAuditor/Plugins/GitHub/RulesetRequirements/BlockMainlineForcePushes.py

@@ -4,21 +4,21 @@
 # |  Distributed under the MIT License.
 # |
 # -------------------------------------------------------------------------------
-"""Contains the AllowMainlineForcePushesRule requirement."""
+"""Contains the BlockMainlineForcePushesRule requirement."""
 
 import textwrap
 
 from RepoAuditor.Plugins.GitHub.Impl.EnableRulesetRequirementImpl import EnableRulesetRequirementImpl
 
 
-class AllowMainlineForcePushesRule(EnableRulesetRequirementImpl):
-    """Requirement for rule to allow force pushes to the matching branch."""
+class BlockMainlineForcePushesRule(EnableRulesetRequirementImpl):
+    """Requirement for rule to block force pushes to the mainline branch."""
 
     def __init__(self) -> None:
         super().__init__(
-            name="AllowMainlineForcePushesRule",
-            enabled_by_default=False,
-            dynamic_arg_name="yes",
+            name="BlockMainlineForcePushesRule",
+            enabled_by_default=True,
+            dynamic_arg_name="no",
             github_ruleset_type="non_fast_forward",
             github_ruleset_value="Block force pushes",
             get_configuration_value_func=self._GetValue,
@@ -34,7 +34,7 @@ class AllowMainlineForcePushesRule(EnableRulesetRequirementImpl):
 
                 Reasons to Override this Default
                 --------------------------------
-                <unknown>
+                - If the repository only has a single developer or if is private.
                 """,
             ),
         )

{repoauditor-0.3.1 → repoauditor-0.4.1}/src/RepoAuditor/Plugins/GitHubPlugin.py

@@ -14,7 +14,7 @@ from RepoAuditor.Plugins.GitHub.Module import GitHubModule
 
 
 # ----------------------------------------------------------------------
-@pluggy.HookimplMarker(APP_NAME)
+@pluggy.HookimplMarker(APP_NAME)(tryfirst=True)
 def GetModule() -> Module:
     """Return GitHub Module."""
     return GitHubModule()

repoauditor-0.4.1/src/RepoAuditor/Plugins/ScientificSoftware/Module.py

@@ -0,0 +1,26 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""Contains the ScientificSoftwareModule object."""
+
+from RepoAuditor.Module import ExecutionStyle
+from RepoAuditor.Plugins.GitHubBase.Module import GitHubBaseModule
+from RepoAuditor.Plugins.ScientificSoftware.ScientificSoftwareQuery import ScientificSoftwareQuery
+
+
+class ScientificSoftwareModule(GitHubBaseModule):
+    """Module that validates existence of repository files for Scientific Software."""
+
+    def __init__(self) -> None:
+        super().__init__(
+            "ScientificSoftware",
+            "Validates existence of repository files for Scientific Software.",
+            ExecutionStyle.Parallel,
+            [
+                ScientificSoftwareQuery(),
+            ],
+            requires_explicit_include=True,
+        )

repoauditor-0.4.1/src/RepoAuditor/Plugins/ScientificSoftware/Requirements/Citation.py

@@ -0,0 +1,63 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""Contains the Citation requirement."""
+
+import textwrap
+
+from RepoAuditor.Plugins.CommunityStandards.Impl.ExistsRequirementImpl import ExistsRequirementImpl
+
+
+class Citation(ExistsRequirementImpl):
+    """Validates that a CITATION file is present which is used to make the repository citable.
+
+    Details of how GitHub looks for citation files can be found here: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files
+    """
+
+    def __init__(self) -> None:
+        super().__init__(
+            "Citation",
+            filename="CITATION",
+            possible_locations=[
+                # GitHub requires the citation file be in the root directory
+                "CITATION.cff",
+                "CITATION",
+                "CITATIONS",
+                "CITATION.bib",
+                "CITATIONS.bib",
+                "CITATION.md",
+                "CITATIONS.md",
+                "citation.cff",
+                "citation",
+                "citations",
+                "citation.bib",
+                "citations.bib",
+                "citation.md",
+                "citations.md",
+                # R packages are located in the `inst` directory
+                "inst/CITATION",
+            ],
+            resolution=textwrap.dedent(
+                """\
+                1) Create a CITATION/CITATIONS file in in the root directory.
+
+                2) It can have any of the following extensions:
+                   - [blank] e.g. `CITATION`
+                   - CITATION.cff
+                   - CITATION.md
+                   - CITATION.bib
+                """
+            ),
+            rationale=textwrap.dedent(
+                """\
+                A citation file helps users correctly cite your software.
+
+                For more details, please see
+                https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files
+                """
+            ),
+            dynamic_arg_name="unrequired",
+        )

repoauditor-0.4.1/src/RepoAuditor/Plugins/ScientificSoftware/ScientificSoftwareQuery.py

@@ -0,0 +1,24 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""Contains the ScientificSoftwareQuery object."""
+
+from RepoAuditor.Plugins.CommunityStandards.CommunityStandardsQuery import CloneRepositoryMixin
+from RepoAuditor.Plugins.ScientificSoftware.Requirements.Citation import Citation
+from RepoAuditor.Query import ExecutionStyle, Query
+
+
+class ScientificSoftwareQuery(CloneRepositoryMixin, Query):
+    """Query with requirements that check the repository for Scientific Software specific files."""
+
+    def __init__(self) -> None:
+        super().__init__(
+            "ScientificSoftwareQuery",
+            ExecutionStyle.Parallel,
+            [
+                Citation(),
+            ],
+        )

repoauditor-0.4.1/src/RepoAuditor/Plugins/ScientificSoftwarePlugin.py

@@ -0,0 +1,20 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""Contains Plugin functionality."""
+
+import pluggy
+
+from RepoAuditor import APP_NAME
+from RepoAuditor.Module import Module
+from RepoAuditor.Plugins.ScientificSoftware.Module import ScientificSoftwareModule
+
+
+# ----------------------------------------------------------------------
+@pluggy.HookimplMarker(APP_NAME)
+def GetModule() -> Module:
+    """Return Scientific Software Module."""
+    return ScientificSoftwareModule()

{repoauditor-0.3.1 → repoauditor-0.4.1}/src/RepoAuditor/Query.py

@@ -8,6 +8,7 @@
 
 import threading
 from abc import ABC, abstractmethod
+from collections.abc import Sequence
 from dataclasses import dataclass
 from typing import Any, Optional, Protocol
 
@@ -53,7 +54,7 @@ class Query(ABC):
         self,
         name: str,
         style: ExecutionStyle,
-        requirements: list[Requirement],
+        requirements: Sequence[Requirement],
     ) -> None:
         self.name = name
         self.style = style
@@ -75,7 +76,7 @@ class Query(ABC):
         status_func: OnStatusFunc,
         *,
         max_num_threads: Optional[int] = None,
-    ) -> list["Query.EvaluateInfo"]:
+    ) -> Sequence["Query.EvaluateInfo"]:
         """Evaluate the Query given the query data and the data from the requirements."""
         status_info = StatusInfo()
         status_info_lock = threading.Lock()

{repoauditor-0.3.1 → repoauditor-0.4.1}/src/RepoAuditor/__init__.py

@@ -2,4 +2,4 @@ APP_NAME = "RepoAuditor"
 
 # Note that the default value below will be used until the value
 # here is explicitly updated by the Continuous Integration system.
-__version__ = "0.3.1"
+__version__ = "0.4.1"

{repoauditor-0.3.1 → repoauditor-0.4.1}/tests/Plugins/CommunityStandards/CommunityStandardsQuery_UnitTest.py

@@ -36,6 +36,8 @@ def patch_temp_directory(monkeypatch):
 class TestCommunityStandardsQuery:
     """Tests for CommunityStandardsQuery class."""
 
+    query = CommunityStandardsQuery()
+
     def test_GetData(self, module_data, monkeypatch):
         """Test the GetData method."""
         monkeypatch.setattr(
@@ -53,8 +55,7 @@ class TestCommunityStandardsQuery:
             mock_clone_from,
         )
 
-        query = CommunityStandardsQuery()
-        query_data = query.GetData(module_data)
+        query_data = self.query.GetData(module_data)
 
         assert query_data["repo_dir"].name == "test_temp_directory"
 
@@ -77,8 +78,7 @@ class TestCommunityStandardsQuery:
 
         monkeypatch.setattr(Repo, "clone_from", mock_clone_from)
 
-        query = CommunityStandardsQuery()
-        _ = query.GetData(module_data)
+        _ = self.query.GetData(module_data)
 
     def test_GetData_does_not_add_pat(self, module_data, monkeypatch):
         """Test the GetData method preserves the URL when no PAT is provided"""
@@ -97,8 +97,7 @@ class TestCommunityStandardsQuery:
 
         monkeypatch.setattr(Repo, "clone_from", mock_clone_from)
 
-        query = CommunityStandardsQuery()
-        _ = query.GetData(module_data)
+        _ = self.query.GetData(module_data)
 
     def test_GetData_handles_gitpython_errors(self, module_data, monkeypatch):
         """Test the GetData method handles errors raised by the gitpyhon module"""
@@ -115,15 +114,13 @@ class TestCommunityStandardsQuery:
 
         monkeypatch.setattr(Repo, "clone_from", mock_clone_from)
 
-        query = CommunityStandardsQuery()
         with pytest.raises(RuntimeError) as e_info:
-            _ = query.GetData(module_data)
+            _ = self.query.GetData(module_data)
         assert gitpython_error_msg in str(e_info)
 
     def test_Cleanup(self, module_data):
         """Test the Cleanup method."""
-        query = CommunityStandardsQuery()
         module_data["repo_dir"] = MockTemporaryDirectory()
-        result = query.Cleanup(module_data)
+        result = self.query.Cleanup(module_data)
 
         assert result is None

{repoauditor-0.3.1 → repoauditor-0.4.1}/tests/Plugins/GitHubEnterprise_EndToEndTest.py

@@ -538,9 +538,9 @@ class TestRulesets:
         assert result.exit_code == -1, result.output
         assert ScrubDurationGithuburlAndSpaces(result.stdout) == snapshot
 
-    def test_AllowMainlineForcePushesRule(self, pat_args, snapshot):
-        """Test for requirement `Block force pushes to the specified branch` is enabled in the ruleset for the `main` branch."""
-        result = CliRunner().invoke(app, pat_args + ["--GitHub-AllowMainlineForcePushesRule"])
+    def test_NoBlockMainlineForcePushesRule(self, pat_args, snapshot):
+        """Test for requirement `Block force pushes to the specified branch` is disabled in the ruleset for the `main` branch."""
+        result = CliRunner().invoke(app, pat_args + ["--GitHub-no-BlockMainlineForcePushesRule"])
 
         # Since the repo ruleset has the requirement disabled,
         # we should get an error.

repoauditor-0.3.1/tests/Plugins/GitHubModule/RulesetRequirements/AllowMainlineForcePushesRule_UnitTest.py → repoauditor-0.4.1/tests/Plugins/GitHubModule/RulesetRequirements/BlockMainlineForcePushesRule_UnitTest.py

@@ -4,22 +4,22 @@
 # |  Distributed under the MIT License.
 # |
 # -------------------------------------------------------------------------------
-"""Unit tests for AllowMainlineForcePushesRule.py"""
+"""Unit tests for BlockMainlineForcePushesRule.py"""
 
-from RepoAuditor.Plugins.GitHub.RulesetRequirements.AllowMainlineForcePushes import (
-    AllowMainlineForcePushesRule,
+from RepoAuditor.Plugins.GitHub.RulesetRequirements.BlockMainlineForcePushes import (
+    BlockMainlineForcePushesRule,
 )
 from RepoAuditor.Requirement import EvaluateResult
 
 from . import create_rule
 
 
-class TestAllowMainlineForcePushesRule:
-    """Unit tests for the AllowMainlineForcePushesRule requirement."""
+class TestBlockMainlineForcePushesRule:
+    """Unit tests for the BlockMainlineForcePushesRule requirement."""
 
     def test_Enabled(self, query_data):
         """Test if the rule is enabled on the main branch."""
-        requirement = AllowMainlineForcePushesRule()
+        requirement = BlockMainlineForcePushesRule()
 
         query_data["rules"].append(
             create_rule(
@@ -36,7 +36,7 @@ class TestAllowMainlineForcePushesRule:
 
     def test_Disabled(self, query_data):
         """Test if the rule is disabled by not providing the appropriate rule within the ruleset."""
-        requirement = AllowMainlineForcePushesRule()
+        requirement = BlockMainlineForcePushesRule()
 
         query_data["rules"].append(
             create_rule(

{repoauditor-0.3.1 → repoauditor-0.4.1}/tests/Plugins/GitHubModule/RulesetRequirements/RequireUpToDateBranchesRule_UnitTest.py

@@ -4,7 +4,7 @@
 # |  Distributed under the MIT License.
 # |
 # -------------------------------------------------------------------------------
-"""Unit tests for AllowMainlineForcePushesRule.py"""
+"""Unit tests for RequireUpToDateBranchesRule.py"""
 
 from RepoAuditor.Plugins.GitHub.RulesetRequirements.RequireUpToDateBranches import (
     RequireUpToDateBranchesRule,

{repoauditor-0.3.1 → repoauditor-0.4.1}/tests/Plugins/GitHub_EndToEndTest.py

@@ -568,9 +568,9 @@ class TestRulesets:
         assert result.exit_code == -1, result.output
         assert ScrubDurationGithuburlAndSpaces(result.stdout) == snapshot
 
-    def test_AllowMainlineForcePushesRule(self, pat_args, snapshot):
-        """Test for requirement `Block force pushes to the specified branch` is enabled in the ruleset for the `main` branch."""
-        result = CliRunner().invoke(app, pat_args + ["--GitHub-AllowMainlineForcePushesRule"])
+    def test_NoBlockMainlineForcePushesRule(self, pat_args, snapshot):
+        """Test for requirement `Block force pushes to the specified branch` is disabled in the ruleset for the `main` branch."""
+        result = CliRunner().invoke(app, pat_args + ["--GitHub-no-BlockMainlineForcePushesRule"])
 
         # Since the repo ruleset has the requirement disabled,
         # we should get an error.

repoauditor-0.4.1/tests/Plugins/ScientificSoftware/ScientificSoftwareQuery_UnitTest.py

@@ -0,0 +1,16 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""Unit tests for ScientificSoftwareQuery.py"""
+
+from RepoAuditor.Plugins.ScientificSoftware.ScientificSoftwareQuery import ScientificSoftwareQuery
+from CommunityStandards.CommunityStandardsQuery_UnitTest import TestCommunityStandardsQuery
+
+
+class TestScientificSoftwareQuery(TestCommunityStandardsQuery):
+    """Tests for ScientificSoftwareQuery class."""
+
+    query = ScientificSoftwareQuery()

repoauditor-0.4.1/tests/Plugins/ScientificSoftware_EndToEndTest.py

@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------
+# |
+# |  Copyright (c) 2024 Scientific Software Engineering Center at Georgia Tech
+# |  Distributed under the MIT License.
+# |
+# -------------------------------------------------------------------------------
+"""End-to-end tests for the ScientificSoftware plugin."""
+
+import pytest
+from dbrownell_Common.TestHelpers.StreamTestHelpers import (
+    InitializeStreamCapabilities,
+)
+from typer.testing import CliRunner
+from utilities import ScrubDurationGithuburlAndSpaces
+
+from RepoAuditor.EntryPoint import app
+
+# ----------------------------------------------------------------------
+pytest.fixture(InitializeStreamCapabilities(), scope="session", autouse=True)
+
+
+# ----------------------------------------------------------------------
+class TestScientificSoftware:
+    """End-to-end tests for files in a GitHub repository which implements scientific software."""
+
+    # ----------------------------------------------------------------------
+    def test_NoCitation(self, pat_args, snapshot):
+        """Test if no CITATION file exists in the repository."""
+        result = CliRunner().invoke(
+            app,
+            pat_args,
+        )
+
+        assert result.exit_code == -1, result.output
+        assert ScrubDurationGithuburlAndSpaces(result.stdout) == snapshot

{repoauditor-0.3.1 → repoauditor-0.4.1}/tests/Plugins/__snapshots__/GitHubEnterprise_EndToEndTest.ambr

@@ -23,7 +23,7 @@
   │                                                                                                                      │
   │ ╭─ [Error] AllowDeletions ─────────────────────────────────────────────────────────────────────────────────────────╮ │
   │ │                                                                                                                  │ │
-  │ │ Validates that 'Allow deletions' is set to True.                                                                 │ │
+  │ │ Validates that 'Allow deletions' is set to False.                                                                │ │
   │ │                                                                                                                  │ │
   │ │ ERROR: 'Allow deletions' must be set to 'True' (it is currently set to 'False').                                 │ │
   │ │                                                                                                                  │ │
@@ -712,7 +712,24 @@
   
   '''
 # ---
-# name: TestRulesets.test_AllowMainlineForcePushesRule
+# name: TestRulesets.test_Default
+  '''
+  Processing 1 module...
+    Processing 'GitHub' (1 of 1)...
+  
+  
+  
+  
+    DONE! (-1, <scrubbed duration>)
+  DONE! (-1, <scrubbed duration>)
+  ERROR: 'branch'
+  
+  Results: DONE! (-1, <scrubbed duration>)
+  
+  
+  '''
+# ---
+# name: TestRulesets.test_DismissStalePullRequestApprovalsRule
   '''
   Processing 1 module...
     Processing 'GitHub' (1 of 1)...
@@ -734,18 +751,21 @@
   │ Errors:         1 (1.89%)                                                                                            │
   │ Skipped:        5 (9.43%)                                                                                            │
   │                                                                                                                      │
-  │ ╭─ [Error] AllowMainlineForcePushesRule ───────────────────────────────────────────────────────────────────────────╮ │
+  │ ╭─ [Error] DismissStalePullRequestApprovalsRule ───────────────────────────────────────────────────────────────────╮ │
   │ │                                                                                                                  │ │
-  │ │ Validates that 'Block force pushes' is set to True.                                                              │ │
+  │ │ Validates that 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits   │ │
+  │ │ are pushed' is set to False.                                                                                     │ │
   │ │                                                                                                                  │ │
-  │ │ ERROR: No active branch ruleset with 'Block force pushes' found                                                  │ │
+  │ │ ERROR: 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits are       │ │
+  │ │ pushed' rule active in ruleset 'main'. It should be set to False.                                                │ │
   │ │                                                                                                                  │ │
   │ │ Resolution                                                                                                       │ │
   │ │ ----------                                                                                                       │ │
   │ │   1) Visit '<scrubbed-github-url>'.                                                                              │ │
   │ │   2) Find or create a ruleset on the branch 'main'.                                                              │ │
-  │ │   3) Go to 'Block force pushes'.                                                                                 │ │
-  │ │   4) Enable the rule.                                                                                            │ │
+  │ │   3) Go to 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits are   │ │
+  │ │ pushed'.                                                                                                         │ │
+  │ │   4) Disable the rule.                                                                                           │ │
   │ │                                                                                                                  │ │
   │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ │
   │ ╭─ Metrics ────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │
@@ -765,24 +785,7 @@
   
   '''
 # ---
-# name: TestRulesets.test_Default
-  '''
-  Processing 1 module...
-    Processing 'GitHub' (1 of 1)...
-  
-  
-  
-  
-    DONE! (-1, <scrubbed duration>)
-  DONE! (-1, <scrubbed duration>)
-  ERROR: 'branch'
-  
-  Results: DONE! (-1, <scrubbed duration>)
-  
-  
-  '''
-# ---
-# name: TestRulesets.test_DismissStalePullRequestApprovalsRule
+# name: TestRulesets.test_NoBlockMainlineForcePushesRule
   '''
   Processing 1 module...
     Processing 'GitHub' (1 of 1)...
@@ -804,20 +807,17 @@
   │ Errors:         1 (1.89%)                                                                                            │
   │ Skipped:        5 (9.43%)                                                                                            │
   │                                                                                                                      │
-  │ ╭─ [Error] DismissStalePullRequestApprovalsRule ───────────────────────────────────────────────────────────────────╮ │
+  │ ╭─ [Error] BlockMainlineForcePushesRule ───────────────────────────────────────────────────────────────────────────╮ │
   │ │                                                                                                                  │ │
-  │ │ Validates that 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits   │ │
-  │ │ are pushed' is set to False.                                                                                     │ │
+  │ │ Validates that 'Block force pushes' is set to False.                                                             │ │
   │ │                                                                                                                  │ │
-  │ │ ERROR: 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits are       │ │
-  │ │ pushed' rule active in ruleset 'main'. It should be set to False.                                                │ │
+  │ │ ERROR: 'Block force pushes' rule active in ruleset 'main'. It should be set to False.                            │ │
   │ │                                                                                                                  │ │
   │ │ Resolution                                                                                                       │ │
   │ │ ----------                                                                                                       │ │
   │ │   1) Visit '<scrubbed-github-url>'.                                                                              │ │
   │ │   2) Find or create a ruleset on the branch 'main'.                                                              │ │
-  │ │   3) Go to 'Require a pull request before merging -> Dismiss stale pull request approvals when new commits are   │ │
-  │ │ pushed'.                                                                                                         │ │
+  │ │   3) Go to 'Block force pushes'.                                                                                 │ │
   │ │   4) Disable the rule.                                                                                           │ │
   │ │                                                                                                                  │ │
   │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ │