Skip to content
Snippets Groups Projects
Commit c342fe44 authored by Ted Bowman's avatar Ted Bowman Committed by Adam G-H
Browse files

Issue #3253395 by tedbow: Fix functional test deprecation notices for core

parent bff62697
No related branches found
No related tags found
1 merge request!140Issue #3253395: Fix functional test deprecation notices for core
...@@ -119,21 +119,21 @@ class ExcludedPathsTest extends BrowserTestBase { ...@@ -119,21 +119,21 @@ class ExcludedPathsTest extends BrowserTestBase {
$stage_dir = $stage::$stagingRoot . DIRECTORY_SEPARATOR . $stage->create(); $stage_dir = $stage::$stagingRoot . DIRECTORY_SEPARATOR . $stage->create();
$this->assertDirectoryExists($stage_dir); $this->assertDirectoryExists($stage_dir);
$this->assertDirectoryNotExists("$stage_dir/sites/simpletest"); $this->assertDirectoryDoesNotExist("$stage_dir/sites/simpletest");
$this->assertFileNotExists("$stage_dir/vendor/web.config"); $this->assertFileDoesNotExist("$stage_dir/vendor/web.config");
$this->assertDirectoryNotExists("$stage_dir/$site_path/files"); $this->assertDirectoryDoesNotExist("$stage_dir/$site_path/files");
$this->assertDirectoryNotExists("$stage_dir/private"); $this->assertDirectoryDoesNotExist("$stage_dir/private");
$this->assertFileNotExists("$stage_dir/$site_path/settings.php"); $this->assertFileDoesNotExist("$stage_dir/$site_path/settings.php");
$this->assertFileNotExists("$stage_dir/$site_path/settings.local.php"); $this->assertFileDoesNotExist("$stage_dir/$site_path/settings.local.php");
$this->assertFileNotExists("$stage_dir/$site_path/services.yml"); $this->assertFileDoesNotExist("$stage_dir/$site_path/services.yml");
// SQLite databases and their support files should never be staged. // SQLite databases and their support files should never be staged.
$this->assertFileNotExists("$stage_dir/$site_path/db.sqlite"); $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite");
$this->assertFileNotExists("$stage_dir/$site_path/db.sqlite-shm"); $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite-shm");
$this->assertFileNotExists("$stage_dir/$site_path/db.sqlite-wal"); $this->assertFileDoesNotExist("$stage_dir/$site_path/db.sqlite-wal");
// Default site-specific settings files should never be staged. // Default site-specific settings files should never be staged.
$this->assertFileNotExists("$stage_dir/sites/default/settings.php"); $this->assertFileDoesNotExist("$stage_dir/sites/default/settings.php");
$this->assertFileNotExists("$stage_dir/sites/default/settings.local.php"); $this->assertFileDoesNotExist("$stage_dir/sites/default/settings.local.php");
$this->assertFileNotExists("$stage_dir/sites/default/services.yml"); $this->assertFileDoesNotExist("$stage_dir/sites/default/services.yml");
// A non-excluded file in the default site directory should be staged. // A non-excluded file in the default site directory should be staged.
$this->assertFileExists("$stage_dir/sites/default/stage.txt"); $this->assertFileExists("$stage_dir/sites/default/stage.txt");
...@@ -148,7 +148,7 @@ class ExcludedPathsTest extends BrowserTestBase { ...@@ -148,7 +148,7 @@ class ExcludedPathsTest extends BrowserTestBase {
} }
$stage->apply(); $stage->apply();
foreach ($files as $file) { foreach ($files as $file) {
$this->assertFileNotExists("$active_dir/$file"); $this->assertFileDoesNotExist("$active_dir/$file");
} }
} }
......
...@@ -26,7 +26,7 @@ class ComposerUtilityTest extends KernelTestBase { ...@@ -26,7 +26,7 @@ class ComposerUtilityTest extends KernelTestBase {
file_put_contents($dir . '/composer.json', '{}'); file_put_contents($dir . '/composer.json', '{}');
ComposerUtility::createForDirectory($dir); ComposerUtility::createForDirectory($dir);
$this->assertFileNotExists($dir . '/.htaccess'); $this->assertFileDoesNotExist($dir . '/.htaccess');
} }
/** /**
......
...@@ -51,7 +51,7 @@ class CoreUpdateTest extends UpdateTestBase { ...@@ -51,7 +51,7 @@ class CoreUpdateTest extends UpdateTestBase {
// ignores .htaccess files and everything in them, so a Composer-generated // ignores .htaccess files and everything in them, so a Composer-generated
// .htaccess file won't cause this test to fail. // .htaccess file won't cause this test to fail.
if ($template === 'drupal/recommended-project') { if ($template === 'drupal/recommended-project') {
$this->assertFileNotExists($dir . '/.htaccess'); $this->assertFileDoesNotExist($dir . '/.htaccess');
} }
// Ensure that Drupal thinks we are running 9.8.0, then refresh information // Ensure that Drupal thinks we are running 9.8.0, then refresh information
......
...@@ -118,7 +118,7 @@ class FileSystemOperationsTest extends AutomaticUpdatesFunctionalTestBase { ...@@ -118,7 +118,7 @@ class FileSystemOperationsTest extends AutomaticUpdatesFunctionalTestBase {
// Make the staged site directory read-only, so we can test that it will be // Make the staged site directory read-only, so we can test that it will be
// made writable on clean-up. // made writable on clean-up.
$this->assertTrue(chmod("$this->stageDir/$stage_id/sites/default", 0400)); $this->assertTrue(chmod("$this->stageDir/$stage_id/sites/default", 0400));
$this->assertNotIsWritable("$this->stageDir/$stage_id/sites/default/staged.txt"); $this->assertIsNotWritable("$this->stageDir/$stage_id/sites/default/staged.txt");
// If the site directory is not writable, this will throw an exception. // If the site directory is not writable, this will throw an exception.
$this->updater->destroy(); $this->updater->destroy();
$this->assertDirectoryDoesNotExist($this->stageDir); $this->assertDirectoryDoesNotExist($this->stageDir);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment