Merge branch 'master' into fix/147

eiriksm · Oct 25, 2020 · 4b5222f · 4b5222f
2 parents 442930b + 966c2a2
commit 4b5222f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/CosyComposer.php b/src/CosyComposer.php
@@ -1047,7 +1047,7 @@ protected function handleIndividualUpdates($data, $lockdata, $cdata, $one_pr_per
                     $version_from = $pre_update_data->source->reference;
                     $version_to = $post_update_data->source->reference;
                 }
-                // Now, see if it the update was actually to the version we are expecting.
+                // Now, see if the update was actually to the version we are expecting.
                 // If we are updating to another dev version, composer show will tell us something like:
                 // dev-master 15eb463
                 // while the post update data version will still say:

diff --git a/test/integration/ComposerUpdateIntegrationBase.php b/test/integration/ComposerUpdateIntegrationBase.php
@@ -61,7 +61,7 @@ function ($cmd) use ($dir) {
         $mock_provider->method('getDefaultBase')
             ->willReturn($default_sha);
         $mock_provider->method('getPrsNamed')
-            ->willReturn([]);
+            ->willReturn($this->getPrsNamed());
         $mock_provider_factory->method('createFromHost')
             ->willReturn($mock_provider);
 
@@ -83,6 +83,11 @@ protected function placeUpdatedComposerLock()
     protected function handleExecutorReturnCallback($cmd, &$return)
     {
     }
+
+    protected function getPrsNamed()
+    {
+        return [];
+    }
 
     public function runtestExpectedOutput()
     {

diff --git a/test/integration/DevMasterInUpdatedPackagesTest.php b/test/integration/DevMasterInUpdatedPackagesTest.php
@@ -25,6 +25,7 @@ public function testUpdatesInPackagesUpdated()
             });
         $this->runtestExpectedOutput();
         $this->assertOutputContainsMessage($fake_pr_url, $this->cosy);
+        $this->assertNotEquals('psrlogdevmaster2b71ffbdevmaster', $pr_params["head"]);
         $this->assertEquals('If you have a high test coverage index, and your tests for this pull request are passing, it should be both safe and recommended to merge this update.
 
 ### Updated packages