diff --git a/tests/FileTest.php b/tests/FileTest.php index bf7516f..f5c7f2c 100644 --- a/tests/FileTest.php +++ b/tests/FileTest.php @@ -8,6 +8,7 @@ use SpacesAPI\Spaces; class FileTest extends TestCase { + private static $tempSpaceName; private static $space; private static $file; @@ -19,18 +20,15 @@ class FileTest extends TestCase $spaces = new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']); - try { - $spaces->space('spaces-api-test')->destroy(); - } catch (SpaceDoesntExistException $e) { - } + self::$tempSpaceName = md5(time()); - self::$space = $spaces->create('spaces-api-test'); + self::$space = $spaces->create(self::$tempSpaceName); self::$file = self::$space->uploadText('Lorem ipsum', 'lorem-ipsum.txt'); } public static function tearDownAfterClass(): void { - (new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']))->space('spaces-api-test')->destroy(); + self::$space->destroy(); } public function testCanUpdatePrivacy() diff --git a/tests/SpaceTest.php b/tests/SpaceTest.php index e6cdfaa..f416539 100644 --- a/tests/SpaceTest.php +++ b/tests/SpaceTest.php @@ -9,6 +9,7 @@ use SpacesAPI\Spaces; class SpaceTest extends TestCase { + private static $tempSpaceName; private static $space; public static function setUpBeforeClass(): void @@ -19,17 +20,14 @@ class SpaceTest extends TestCase $spaces = new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']); - try { - $spaces->space('spaces-api-test')->destroy(); - } catch (SpaceDoesntExistException $e) { - } + self::$tempSpaceName = md5(time()); - self::$space = $spaces->create('spaces-api-test'); + self::$space = $spaces->create(self::$tempSpaceName); } public static function tearDownAfterClass(): void { -// (new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']))->space('spaces-api-test')->destroy(); + self::$space->destroy(); } public function testCanUpdateSpacePrivacy() diff --git a/tests/SpacesTest.php b/tests/SpacesTest.php index 765d85f..9b9a00a 100644 --- a/tests/SpacesTest.php +++ b/tests/SpacesTest.php @@ -10,21 +10,21 @@ use SpacesAPI\Spaces; class SpacesTest extends TestCase { + private static $tempSpaceName; + public static function setUpBeforeClass(): void { $dotenv = Dotenv::createImmutable(__DIR__ . "/.."); $dotenv->load(); $dotenv->required(['SPACES_KEY', 'SPACES_SECRET']); - try { - (new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']))->space('spaces-api-test')->destroy(); - } catch (SpaceDoesntExistException $e) { - } + // This should hopefully always be unique amongst all DO spaces + self::$tempSpaceName = md5(time()); } public static function tearDownAfterClass(): void { - (new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']))->space('spaces-api-test')->destroy(); + (new Spaces($_ENV['SPACES_KEY'], $_ENV['SPACES_SECRET']))->space(self::$tempSpaceName)->destroy(); } public function testAuthenticationCanFail() @@ -53,7 +53,7 @@ class SpacesTest extends TestCase */ public function testCanCreateSpace(Spaces $spaces) { - $space = $spaces->create('spaces-api-test'); + $space = $spaces->create(self::$tempSpaceName); $this->assertInstanceOf(Space::class, $space); return $space; @@ -69,7 +69,7 @@ class SpacesTest extends TestCase $spaceFound = false; foreach ($list as $name => $space) { - if ($name == 'spaces-api-test' && $space->getName() == 'spaces-api-test') { + if ($name == self::$tempSpaceName && $space->getName() == self::$tempSpaceName) { $spaceFound = true; } }