Fix tests so we use the branch's code

Lullabot · Sep 4, 2024 · 2a58096 · 2a58096
1 parent f0e57ca
commit 2a58096
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/.github/workflows/TestBinaryInstaller.yml b/.github/workflows/TestBinaryInstaller.yml
@@ -79,9 +79,12 @@ jobs:
 
       - name: Prove we can upgrade task within task
         run: |
-          cd drainpipe/tests/fixtures/drainpipe-task-upgrade
+          cp -a drainpipe/tests/fixtures/drainpipe-task-upgrade .
+          cp -a drainpipe drainpipe-task-upgrade
+          cd drainpipe-task-upgrade
           ddev start
           ddev composer install
           ddev task drupal:composer:development
+          cp composer-upgraded.json composer.json
           cp composer-upgraded.lock composer.lock
           ddev task drupal:composer:development
diff --git a/tests/fixtures/drainpipe-task-upgrade/composer-upgraded.json b/tests/fixtures/drainpipe-task-upgrade/composer-upgraded.json
@@ -0,0 +1,20 @@
+{
+  "name": "lullabot/drainpipe-test-project",
+  "type": "project",
+  "repositories": [
+    {
+      "type": "path",
+      "url": "drainpipe"
+    }
+  ],
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "require": {
+    "lullabot/drainpipe": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "lullabot/drainpipe": true
+    }
+  }
+}
diff --git a/tests/fixtures/drainpipe-task-upgrade/composer-upgraded.lock b/tests/fixtures/drainpipe-task-upgrade/composer-upgraded.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c6f1302d1410e73a58cac7d306845a17",
+    "content-hash": "24595b49511e28a509041b3f2656e0e7",
     "packages": [
         {
             "name": "chi-teck/drupal-code-generator",
@@ -1663,17 +1663,11 @@
         },
         {
             "name": "lullabot/drainpipe",
-            "version": "v3.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Lullabot/drainpipe.git",
-                "reference": "b89fbd53d9d1e9dcf78de9fa8496083e26c34399"
-            },
+            "version": "dev-fix-upgrading-task-in-task",
             "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Lullabot/drainpipe/zipball/b89fbd53d9d1e9dcf78de9fa8496083e26c34399",
-                "reference": "b89fbd53d9d1e9dcf78de9fa8496083e26c34399",
-                "shasum": ""
+                "type": "path",
+                "url": "drainpipe",
+                "reference": "f0e57ca248270e96b8e95df2a5b4787ccd091822"
             },
             "require": {
                 "composer-plugin-api": "^2.0",
@@ -1710,16 +1704,26 @@
                     "Lullabot\\Drainpipe\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "Lullabot\\Drainpipe\\Tests\\Functional\\": "tests/src/functional/"
+                }
+            },
+            "archive": {
+                "exclude": [
+                    "/.github",
+                    "/.yarn",
+                    "/drainpipe-dev",
+                    "/metapackages"
+                ]
+            },
             "license": [
                 "GPL-2.0-or-later"
             ],
             "description": "An automated build tool to allow projects to have a set standardized operations scripts.",
-            "support": {
-                "issues": "https://github.com/Lullabot/drainpipe/issues",
-                "source": "https://github.com/Lullabot/drainpipe/tree/v3.11.0"
-            },
-            "time": "2024-08-29T13:42:45+00:00"
+            "transport-options": {
+                "relative": true
+            }
         },
         {
             "name": "nikic/php-parser",
@@ -4124,9 +4128,9 @@
     ],
     "packages-dev": [],
     "aliases": [],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": [],
-    "prefer-stable": false,
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],