updated core from 8.4 to 8.5 : bug with login_destination

2018-03-13 14:01:21 +01:00
parent 0d78da249b
commit e668535a4e
3486 changed files with 89604 additions and 33283 deletions
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests\Ajax;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests the compatibility of the ajax.es6.js file.
+ *
+ * @group Ajax
+ */
+class BackwardCompatibilityTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'js_ajax_test',
+  ];
+
+  /**
+   * Ensures Drupal.Ajax.element_settings BC layer.
+   */
+  public function testAjaxBackwardCompatibility() {
+    $this->drupalGet('/js_ajax_test');
+    $this->click('#edit-test-button');
+
+    $this->assertSession()
+      ->waitForElement('css', '#js_ajax_test_form_element');
+    $elements = $this->cssSelect('#js_ajax_test_form_element');
+    $this->assertCount(1, $elements);
+    $json = $elements[0]->getText();
+    $data = json_decode($json, TRUE);
+    $this->assertEquals([
+      'element_settings' => 'catbro',
+      'elementSettings' => 'catbro',
+    ], $data);
+  }
+
+}
@@ -0,0 +1,132 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests\Core\Installer\Form;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Session\UserSession;
+use Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use GuzzleHttp\HandlerStack;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Tests the select profile form.
+ *
+ * @group Installer
+ */
+class SelectProfileFormTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->setupBaseUrl();
+
+    $this->prepareDatabasePrefix();
+
+    // Install Drupal test site.
+    $this->prepareEnvironment();
+
+    // Define information about the user 1 account.
+    $this->rootUser = new UserSession([
+      'uid' => 1,
+      'name' => 'admin',
+      'mail' => 'admin@example.com',
+      'pass_raw' => $this->randomMachineName(),
+    ]);
+
+    // If any $settings are defined for this test, copy and prepare an actual
+    // settings.php, so as to resemble a regular installation.
+    if (!empty($this->settings)) {
+      // Not using File API; a potential error must trigger a PHP warning.
+      copy(DRUPAL_ROOT . '/sites/default/default.settings.php', DRUPAL_ROOT . '/' . $this->siteDirectory . '/settings.php');
+      $this->writeSettings($this->settings);
+    }
+
+    // Note that FunctionalTestSetupTrait::installParameters() returns form
+    // input values suitable for a programmed
+    // \Drupal::formBuilder()->submitForm().
+    // @see InstallerTestBase::translatePostValues()
+    $this->parameters = $this->installParameters();
+
+    // Set up a minimal container (required by BrowserTestBase). Set cookie and
+    // server information so that XDebug works.
+    // @see install_begin_request()
+    $request = Request::create($GLOBALS['base_url'] . '/core/install.php', 'GET', [], $_COOKIE, [], $_SERVER);
+    $this->container = new ContainerBuilder();
+    $request_stack = new RequestStack();
+    $request_stack->push($request);
+    $this->container
+      ->set('request_stack', $request_stack);
+    $this->container
+      ->setParameter('language.default_values', Language::$defaultValues);
+    $this->container
+      ->register('language.default', 'Drupal\Core\Language\LanguageDefault')
+      ->addArgument('%language.default_values%');
+    $this->container
+      ->register('string_translation', 'Drupal\Core\StringTranslation\TranslationManager')
+      ->addArgument(new Reference('language.default'));
+    $this->container
+      ->register('http_client', 'GuzzleHttp\Client')
+      ->setFactory('http_client_factory:fromOptions');
+    $this->container
+      ->register('http_client_factory', 'Drupal\Core\Http\ClientFactory')
+      ->setArguments([new Reference('http_handler_stack')]);
+    $handler_stack = HandlerStack::create();
+    $test_http_client_middleware = new TestHttpClientMiddleware();
+    $handler_stack->push($test_http_client_middleware(), 'test.http_client.middleware');
+    $this->container
+      ->set('http_handler_stack', $handler_stack);
+
+    $this->container
+      ->set('app.root', DRUPAL_ROOT);
+    \Drupal::setContainer($this->container);
+
+    // Setup Mink.
+    $this->initMink();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initMink() {
+    // The temporary files directory doesn't exist yet, as install_base_system()
+    // has not run. We need to create the template cache directory recursively.
+    $path = $this->tempFilesDirectory . DIRECTORY_SEPARATOR . 'browsertestbase-templatecache';
+    if (!file_exists($path)) {
+      mkdir($path, 0777, TRUE);
+    }
+
+    parent::initMink();
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * BrowserTestBase::refreshVariables() tries to operate on persistent storage,
+   * which is only available after the installer completed.
+   */
+  protected function refreshVariables() {
+    // Intentionally empty as the site is not yet installed.
+  }
+
+  /**
+   * Tests a warning message is displayed when the Umami profile is selected.
+   */
+  public function testUmamiProfileWarningMessage() {
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+    $edit = [
+      'langcode' => 'en',
+    ];
+    $this->drupalPostForm(NULL, $edit, 'Save and continue');
+    $page = $this->getSession()->getPage();
+    $warning_message = $page->find('css', '.description .messages--warning');
+    $this->assertFalse($warning_message->isVisible());
+    $page->selectFieldOption('profile', 'demo_umami');
+    $this->assertTrue($warning_message->isVisible());
+  }
+
+}
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests;
+
+use Behat\Mink\Driver\Selenium2Driver;
+
+/**
+ * Provides a driver for Selenium testing.
+ */
+class DrupalSelenium2Driver extends Selenium2Driver {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setCookie($name, $value = NULL) {
+    if ($value === NULL) {
+      $this->getWebDriverSession()->deleteCookie($name);
+      return;
+    }
+
+    $cookieArray = [
+      'name' => $name,
+      'value' => urlencode($value),
+      'secure' => FALSE,
+      // Unlike \Behat\Mink\Driver\Selenium2Driver::setCookie we set a domain
+      // and an expire date, as otherwise cookies leak from one test site into
+      // another.
+      'domain' => parse_url($this->getWebDriverSession()->url(), PHP_URL_HOST),
+      'expires' => time() + 80000,
+    ];
+
+    $this->getWebDriverSession()->setCookie($cookieArray);
+  }
+
+}
@@ -172,7 +172,7 @@ JS;
  }

  /**
-   * Test that a node, or it's specific corner, is visible in the viewport.
+   * Test that a node, or its specific corner, is visible in the viewport.
   *
   * Note: Always set the viewport size. This can be done with a PhantomJS
   * startup parameter or in your test with \Behat\Mink\Session->resizeWindow().
@@ -255,7 +255,7 @@ JS;
  }

  /**
-   * Check the visibility of a node, or it's specific corner.
+   * Check the visibility of a node, or its specific corner.
   *
   * @param \Behat\Mink\Element\NodeElement $node
   *   A valid node.
@@ -15,6 +15,9 @@ abstract class JavascriptTestBase extends BrowserTestBase {

  /**
   * {@inheritdoc}
+   *
+   * To use a webdriver based approach, please use DrupalSelenium2Driver::class.
+   * We will switch the default later.
   */
  protected $minkDefaultDriverClass = PhantomJSDriver::class;

@@ -22,14 +25,19 @@ abstract class JavascriptTestBase extends BrowserTestBase {
   * {@inheritdoc}
   */
  protected function initMink() {
-    // Set up the template cache used by the PhantomJS mink driver.
-    $path = $this->tempFilesDirectory . DIRECTORY_SEPARATOR . 'browsertestbase-templatecache';
-    $this->minkDefaultDriverArgs = [
-      'http://127.0.0.1:8510',
-      $path,
-    ];
-    if (!file_exists($path)) {
-      mkdir($path);
+    if ($this->minkDefaultDriverClass === DrupalSelenium2Driver::class) {
+      $this->minkDefaultDriverArgs = ['chrome', NULL, 'http://localhost:4444/'];
+    }
+    elseif ($this->minkDefaultDriverClass === PhantomJSDriver::class) {
+      // Set up the template cache used by the PhantomJS mink driver.
+      $path = $this->tempFilesDirectory . DIRECTORY_SEPARATOR . 'browsertestbase-templatecache';
+      $this->minkDefaultDriverArgs = [
+        'http://127.0.0.1:8510',
+        $path,
+      ];
+      if (!file_exists($path)) {
+        mkdir($path);
+      }
    }

    try {
@@ -63,6 +71,19 @@ abstract class JavascriptTestBase extends BrowserTestBase {
    parent::tearDown();
  }

+  /**
+    * {@inheritdoc}
+    */
+  protected function getMinkDriverArgs() {
+    if ($this->minkDefaultDriverClass === DrupalSelenium2Driver::class) {
+      return getenv('MINK_DRIVER_ARGS_WEBDRIVER') ?: getenv('MINK_DRIVER_ARGS_PHANTOMJS') ?: parent::getMinkDriverArgs();
+    }
+    elseif ($this->minkDefaultDriverClass === PhantomJSDriver::class) {
+      return getenv('MINK_DRIVER_ARGS_PHANTOMJS') ?: parent::getMinkDriverArgs();
+    }
+    return parent::getMinkDriverArgs();
+  }
+
  /**
   * Asserts that the element with the given CSS selector is visible.
   *
@@ -169,4 +190,12 @@ EndOfScript;
    return $this->getSession()->evaluateScript($script) ?: [];
  }

+  /**
+   * {@inheritdoc}
+   */
+  protected function getHtmlOutputHeaders() {
+    // The webdriver API does not support fetching headers.
+    return '';
+  }
+
 }
@@ -2,6 +2,8 @@

 namespace Drupal\FunctionalJavascriptTests;

+use Zumba\Mink\Driver\PhantomJSDriver;
+
 /**
 * Runs a browser test using PhantomJS.
 *
@@ -9,6 +11,11 @@ namespace Drupal\FunctionalJavascriptTests;
 */
 abstract class LegacyJavascriptTestBase extends JavascriptTestBase {

+  /**
+   * {@inheritdoc}
+   */
+  protected $minkDefaultDriverClass = PhantomJSDriver::class;
+
  /**
   * {@inheritdoc}
   */
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests\Tests;
+
+use Drupal\FunctionalJavascriptTests\DrupalSelenium2Driver;
+
+/**
+ * Tests for the JSWebAssert class using webdriver.
+ *
+ * @group javascript
+ */
+class JSWebWithWebDriverAssertTest extends JSWebAssertTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $minkDefaultDriverClass = DrupalSelenium2Driver::class;
+
+}
@@ -55,4 +55,56 @@ class WebDriverWebAssert extends JSWebAssert {
    parent::responseHeaderNotEquals($name, $value);
  }

+  /**
+   * The use of responseHeaderContains() is not available.
+   *
+   * @param string $name
+   *   The name of the header.
+   * @param string $value
+   *   The value to check the header against.
+   */
+  public function responseHeaderContains($name, $value) {
+    @trigger_error('Support for responseHeaderContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+    parent::responseHeaderContains($name, $value);
+  }
+
+  /**
+   * The use of responseHeaderNotContains() is not available.
+   *
+   * @param string $name
+   *   The name of the header.
+   * @param string $value
+   *   The value to check the header against.
+   */
+  public function responseHeaderNotContains($name, $value) {
+    @trigger_error('Support for responseHeaderNotContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+    parent::responseHeaderNotContains($name, $value);
+  }
+
+  /**
+   * The use of responseHeaderMatches() is not available.
+   *
+   * @param string $name
+   *   The name of the header.
+   * @param string $regex
+   *   The value to check the header against.
+   */
+  public function responseHeaderMatches($name, $regex) {
+    @trigger_error('Support for responseHeaderMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+    parent::responseHeaderMatches($name, $regex);
+  }
+
+  /**
+   * The use of responseHeaderNotMatches() is not available.
+   *
+   * @param string $name
+   *   The name of the header.
+   * @param string $regex
+   *   The value to check the header against.
+   */
+  public function responseHeaderNotMatches($name, $regex) {
+    @trigger_error('Support for responseHeaderNotMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+    parent::responseHeaderNotMatches($name, $regex);
+  }
+
 }