Commit 43f455cf authored by Jacob Rockowitz's avatar Jacob Rockowitz Committed by Jacob Rockowitz
Browse files

Issue #3255999 by jrockowitz: assertFileNotExists() is deprecated

parent 1d7eb74d

tests/src/Functional/Element/WebformElementManagedFileTest.php

+3 −3
Changes for tests/src/Functional/Element/WebformElementManagedFileTest.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ class WebformElementManagedFileTest extends WebformElementManagedFileTestBase { 
    $this->assertEquals($submission->getElementData($key), $second, 'Test new file was upload to the current submission');



    // Check that test file was deleted from the disk and database.

    $this->assertFileNotExists($file->getFileUri(), 'Test file deleted from disk');

    $this->assertFileDoesNotExist($file->getFileUri(), 'Test file deleted from disk');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_managed} WHERE fid = :fid', [':fid' => $fid])->fetchField(), 'Test file 0 deleted from database');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_usage} WHERE fid = :fid', [':fid' => $fid])->fetchField(), 'Test file 0 deleted from database');
@@ -402,11 +402,11 @@ class WebformElementManagedFileTest extends WebformElementManagedFileTestBase { 
    $submission->delete();



    // Check that test file 1 was deleted from the disk and database.

    $this->assertFileNotExists($new_file->getFileUri(), 'Test new file deleted from disk');

    $this->assertFileDoesNotExist($new_file->getFileUri(), 'Test new file deleted from disk');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_managed} WHERE fid = :fid', [':fid' => $new_fid])->fetchField(), 'Test new file deleted from database');



    // Check that empty file directory was deleted.

    $this->assertFileNotExists('private://webform/test_element_managed_file/' . $sid . '/');

    $this->assertFileDoesNotExist('private://webform/test_element_managed_file/' . $sid . '/');

  }



}

tests/src/Functional/Element/WebformElementMediaFileTest.php

+2 −2
Changes for tests/src/Functional/Element/WebformElementMediaFileTest.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class WebformElementMediaFileTest extends WebformElementManagedFileTestBase { 
    $this->assertEquals($submission->getElementData($key), $second, 'Test new file was upload to the current submission');



    // Check that test file was deleted from the disk and database.

    $this->assertFileNotExists($file->getFileUri(), 'Test file deleted from disk');

    $this->assertFileDoesNotExist($file->getFileUri(), 'Test file deleted from disk');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_managed} WHERE fid = :fid', [':fid' => $fid])->fetchField(), 'Test file 0 deleted from database');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_usage} WHERE fid = :fid', [':fid' => $fid])->fetchField(), 'Test file 0 deleted from database');
@@ -169,7 +169,7 @@ class WebformElementMediaFileTest extends WebformElementManagedFileTestBase { 
    $submission->delete();



    // Check that test file 1 was deleted from the disk and database.

    $this->assertFileNotExists($new_file->getFileUri(), 'Test new file deleted from disk');

    $this->assertFileDoesNotExist($new_file->getFileUri(), 'Test new file deleted from disk');

    $this->assertEquals(0, \Drupal::database()->query('SELECT COUNT(fid) AS total FROM {file_managed} WHERE fid = :fid', [':fid' => $new_fid])->fetchField(), 'Test new file deleted from database');

  }

tests/src/Functional/WebformBlockCacheTest.php

+9 −6
Changes for tests/src/Functional/WebformBlockCacheTest.php: 9 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -55,34 +55,37 @@ class WebformBlockCacheTest extends WebformBrowserTestBase { 
   * Test that an anonymous can visit the webform block and the page is cacheable.

   */

  public function testAnonymousVisitIsCacheable() {

    $session = $this->getSession();

    $assert_session = $this->assertSession();



    $this->drupalGet('/node/1');

    $assert_session->responseContains('Contact');

    $this->assertEquals('MISS', $this->drupalGetHeader('X-Drupal-Cache'));

    $this->assertEquals('MISS', $session->getResponseHeader('X-Drupal-Cache'));

    $this->drupalGet('/node/1');

    $this->assertEquals('HIT', $this->drupalGetHeader('X-Drupal-Cache'));

    $this->assertEquals('HIT', $session->getResponseHeader('X-Drupal-Cache'));

  }



  /**

   * Test that admin user can visit the page and the it is cacheable.

   */

  public function testAuthenticatedVisitIsCacheable() {

    $session = $this->getSession();

    $assert_session = $this->assertSession();



    $this->drupalLogin($this->authenticatedUser);



    $this->drupalGet('/node/1');

    $assert_session->responseContains('Contact');

    $this->assertEquals('MISS', $this->drupalGetHeader('X-Drupal-Dynamic-Cache'));

    $this->assertEquals('MISS', $session->getResponseHeader('X-Drupal-Dynamic-Cache'));

    $this->drupalGet('/node/1');

    $this->assertEquals('HIT', $this->drupalGetHeader('X-Drupal-Dynamic-Cache'));

    $this->assertEquals('HIT', $session->getResponseHeader('X-Drupal-Dynamic-Cache'));

  }



  /**

   * Test that if an Webform is access restricted the page can still be cached.

   */

  public function testAuthenticatedAndRestrictedVisitIsCacheable() {

    $session = $this->getSession();

    $assert_session = $this->assertSession();



    /** @var \Drupal\webform\WebformAccessRulesManagerInterface $access_rules_manager */
@@ -103,9 +106,9 @@ class WebformBlockCacheTest extends WebformBrowserTestBase { 


    $this->drupalGet('/node/1');

    $assert_session->responseContains('Contact');

    $this->assertEquals('MISS', $this->drupalGetHeader('X-Drupal-Dynamic-Cache'));

    $this->assertEquals('MISS', $session->getResponseHeader('X-Drupal-Dynamic-Cache'));

    $this->drupalGet('/node/1');

    $this->assertEquals('HIT', $this->drupalGetHeader('X-Drupal-Dynamic-Cache'));

    $this->assertEquals('HIT', $session->getResponseHeader('X-Drupal-Dynamic-Cache'));

  }



}