core/modules/node/src/Tests/NodeTranslationUITest.php | 6 ++++-- core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php | 3 +++ core/modules/system/src/Tests/Installer/StandardInstallerTest.php | 7 ++----- core/profiles/standard/standard.info.yml | 1 + core/profiles/standard/tests/src/Functional/StandardTest.php | 7 ++++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php index 063469d..4727ce3 100644 --- a/core/modules/node/src/Tests/NodeTranslationUITest.php +++ b/core/modules/node/src/Tests/NodeTranslationUITest.php @@ -21,13 +21,15 @@ class NodeTranslationUITest extends ContentTranslationUITestBase { */ protected $defaultCacheContexts = [ 'languages:language_interface', - 'session', 'theme', 'route', 'timezone', 'url.path.parent', 'url.query_args:_wrapper_format', - 'user' + 'user.roles', + // These two cache contexts are added by BigPipe. + 'cookies:big_pipe_nojs', + 'session.exists', ]; /** diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php index 2c945fd..669d424 100644 --- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php +++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php @@ -76,6 +76,9 @@ function testPageCacheTags() { // condition. 'url.path', 'url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT, + // These two cache contexts are added by BigPipe. + 'cookies:big_pipe_nojs', + 'session.exists', ]; // Full node page 1. diff --git a/core/modules/system/src/Tests/Installer/StandardInstallerTest.php b/core/modules/system/src/Tests/Installer/StandardInstallerTest.php index 61e7c84..3132be2 100644 --- a/core/modules/system/src/Tests/Installer/StandardInstallerTest.php +++ b/core/modules/system/src/Tests/Installer/StandardInstallerTest.php @@ -18,11 +18,8 @@ class StandardInstallerTest extends ConfigAfterInstallerTestBase { * Ensures that the user page is available after installation. */ public function testInstaller() { - // Verify that the confirmation message appears. - require_once \Drupal::root() . '/core/includes/install.inc'; - $this->assertRaw(t('Congratulations, you installed @drupal!', array( - '@drupal' => drupal_install_profile_distribution_name(), - ))); + // Verify that the Standard install profile's default frontpage appears. + $this->assertRaw('No front page content has been created yet.'); } /** diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index 82af32e..7fbaec6 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -26,6 +26,7 @@ dependencies: - path - page_cache - dynamic_page_cache + - big_pipe - taxonomy - dblog - search diff --git a/core/profiles/standard/tests/src/Functional/StandardTest.php b/core/profiles/standard/tests/src/Functional/StandardTest.php index 6416368..d2dd2fe 100644 --- a/core/profiles/standard/tests/src/Functional/StandardTest.php +++ b/core/profiles/standard/tests/src/Functional/StandardTest.php @@ -2,12 +2,12 @@ namespace Drupal\Tests\standard\Functional; +use Drupal\FunctionalJavascriptTests\JavascriptTestBase; use Drupal\Tests\SchemaCheckTestTrait; use Drupal\contact\Entity\ContactForm; use Drupal\Core\Url; use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber; use Drupal\filter\Entity\FilterFormat; -use Drupal\Tests\BrowserTestBase; use Drupal\user\Entity\Role; /** @@ -15,7 +15,7 @@ * * @group standard */ -class StandardTest extends BrowserTestBase { +class StandardTest extends JavascriptTestBase { use SchemaCheckTestTrait; @@ -90,7 +90,8 @@ function testStandard() { // Add a comment. $this->drupalLogin($this->adminUser); $this->drupalGet('node/1'); - $this->assertRaw('Then she picked out two somebodies,
Sally and me', 'Found a line break.'); + $this->assertJsCondition('document.querySelectorAll(\'script[data-big-pipe-event="stop"]\').length === 1'); + $this->assertRaw('Then she picked out two somebodies,
Sally and me', 'Found a line break.'); $this->drupalPostForm(NULL, array( 'subject[0][value]' => 'Barfoo', 'comment_body[0][value]' => 'Then she picked out two somebodies, Sally and me',