From 0795aa121402879abd5bcd52f02baa584c5d69b8 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 25 Jul 2024 00:29:45 +0200
Subject: [PATCH] Get migrations + 5.1 tests passing locally.

---
 .github/workflows/ci.yml                                    | 1 +
 tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php | 1 +
 tests/TestCase/Command/BakeSeedCommandTest.php              | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4fd28de..5989e880 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,6 +95,7 @@ jobs:
             composer update --prefer-lowest --prefer-stable
           elif ${{ matrix.cake_version != '' }}; then
             composer require --dev "cakephp/cakephp:${{ matrix.cake_version }}"
+            composer require --dev "cakephp/bake:dev-3.next as 3.1.0"
             composer update
           else
             composer update
diff --git a/tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php b/tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php
index 500b54d0..52e437de 100644
--- a/tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php
+++ b/tests/TestCase/Command/BakeMigrationSnapshotCommandTest.php
@@ -181,6 +181,7 @@ public function testSnapshotDiffWithAutoIdIncompatibleUnsignedPrimaryKeys(): voi
      */
     public function testPluginBlog()
     {
+        $this->loadPlugins(['TestBlog']);
         $this->migrationPath = ROOT . DS . 'Plugin' . DS . 'TestBlog' . DS . 'config' . DS . 'Migrations' . DS;
 
         $this->runSnapshotTest('PluginBlog', '-p TestBlog');
diff --git a/tests/TestCase/Command/BakeSeedCommandTest.php b/tests/TestCase/Command/BakeSeedCommandTest.php
index 52ebc757..5b3731b7 100644
--- a/tests/TestCase/Command/BakeSeedCommandTest.php
+++ b/tests/TestCase/Command/BakeSeedCommandTest.php
@@ -49,7 +49,6 @@ public function setUp(): void
     {
         parent::setUp();
         $this->_compareBasePath = Plugin::path('Migrations') . 'tests' . DS . 'comparisons' . DS . 'Seeds' . DS;
-        $this->clearPlugins();
     }
 
     /**