Some light refactoring before test is added

eiriksm · Jul 28, 2023 · 1a3046b · 1a3046b
1 parent 778cce4
commit 1a3046b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/test/integration/Base.php b/test/integration/Base.php
@@ -11,10 +11,12 @@
 use eiriksm\CosyComposerTest\GetExecuterTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputDefinition;
-use Violinist\Slug\Slug;
 
 abstract class Base extends TestCase
 {
+    use GetCosyTrait;
+    use GetExecuterTrait;
+
     protected $usesDirect = true;
 
     protected $defaultSha = 123;
@@ -47,9 +49,6 @@ public function setUp() : void
         $this->cosy = $c;
     }
 
-    use GetCosyTrait;
-    use GetExecuterTrait;
-
     protected function createExpectedCommandForPackage($package)
     {
         return ["composer", 'update', '-n', '--no-ansi', $package, '--with-dependencies'];
@@ -182,9 +181,6 @@ protected function getMockProviderFactory()
     protected function setDummyGithubProvider()
     {
         $mock_provider = $this->getMockProvider();
-        $slug = new Slug();
-        $slug->setProvider('github.com');
-        $slug->setSlug('a/b');
         $mock_provider->method('repoIsPrivate')
             ->willReturn(true);
         $mock_provider->method('getDefaultBranch')

diff --git a/test/integration/ComposerUpdateIntegrationBase.php b/test/integration/ComposerUpdateIntegrationBase.php
@@ -55,10 +55,12 @@ function ($cmd) {
         $this->setDummyGithubProvider();
         $this->placeInitialComposerLock();
         $this->mockProvider = $mock_provider;
-        $this->mockProvider->method('createPullRequest')
-            ->willReturnCallback(function (Slug $slug, array $params) {
-                return $this->createPullRequest($slug, $params);
-            });
+        if (method_exists($this->mockProvider, 'method')) {
+            $this->mockProvider->method('createPullRequest')
+                ->willReturnCallback(function (Slug $slug, array $params) {
+                    return $this->createPullRequest($slug, $params);
+                });
+        }
     }
 
     protected function createPullRequest(Slug $slug, array $params)