Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / drupal-composer / drupal-scaffold / tests / FetcherTest.php

diff --git a/vendor/drupal-composer/drupal-scaffold/tests/FetcherTest.php b/vendor/drupal-composer/drupal-scaffold/tests/FetcherTest.php
index 0aa59727d10ffff7ee1b8f2ca16f146d262da7a2..ea822f928e7d8e01f209d51f998cbdea9ba3c823 100644 (file)
--- a/vendor/drupal-composer/drupal-scaffold/tests/FetcherTest.php
+++ b/vendor/drupal-composer/drupal-scaffold/tests/FetcherTest.php
@@ -1,20 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \DrupalComposer\DrupalScaffold\Tests\FetcherTest.
- */
-
 namespace DrupalComposer\DrupalScaffold\Tests;
 
-use Composer\Downloader\TransportException;
 use Composer\IO\NullIO;
 use Composer\Util\Filesystem;
 use Composer\Util\RemoteFilesystem;
 use DrupalComposer\DrupalScaffold\FileFetcher;
-use DrupalComposer\DrupalScaffold\InitialFileFetcher;
+use PHPUnit\Framework\TestCase;
 
-class FetcherTest extends \PHPUnit_Framework_TestCase {
+class FetcherTest extends TestCase {
 
   /**
    * @var \Composer\Util\Filesystem
@@ -37,7 +31,7 @@ class FetcherTest extends \PHPUnit_Framework_TestCase {
   protected $tmpReleaseTag;
 
   /**
-   * SetUp test
+   * SetUp test.
    */
   public function setUp() {
     $this->rootDir = realpath(realpath(__DIR__ . '/..'));
@@ -59,19 +53,27 @@ class FetcherTest extends \PHPUnit_Framework_TestCase {
     if (is_dir($directory)) {
       $this->fs->removeDirectory($directory);
     }
-    mkdir($directory, 0777, true);
+    mkdir($directory, 0777, TRUE);
   }
 
   public function testFetch() {
-    $fetcher = new FileFetcher(new RemoteFilesystem(new NullIO()), 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}', ['.htaccess', 'sites/default/default.settings.php']);
-    $fetcher->fetch('8.1.1', $this->tmpDir);
+    $fetcher = new FileFetcher(new RemoteFilesystem(new NullIO()), 'https://cgit.drupalcode.org/drupal/plain/{path}?h={version}', new NullIO());
+    $fetcher->setFilenames([
+      '.htaccess' => '.htaccess',
+      'sites/default/default.settings.php' => 'sites/default/default.settings.php',
+    ]);
+    $fetcher->fetch('8.1.1', $this->tmpDir, TRUE);
     $this->assertFileExists($this->tmpDir . '/.htaccess');
     $this->assertFileExists($this->tmpDir . '/sites/default/default.settings.php');
   }
 
   public function testInitialFetch() {
-    $fetcher = new InitialFileFetcher(new RemoteFilesystem(new NullIO()), 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}', ['sites/default/default.settings.php' => 'sites/default/settings.php']);
-    $fetcher->fetch('8.1.1', $this->tmpDir);
+    $fetcher = new FileFetcher(new RemoteFilesystem(new NullIO()), 'https://cgit.drupalcode.org/drupal/plain/{path}?h={version}', new NullIO());
+    $fetcher->setFilenames([
+      'sites/default/default.settings.php' => 'sites/default/settings.php',
+    ]);
+    $fetcher->fetch('8.1.1', $this->tmpDir, FALSE);
     $this->assertFileExists($this->tmpDir . '/sites/default/settings.php');
   }
+
 }