Commit 576a49b9 authored by catch's avatar catch
Browse files

Issue #3269517 by danflanagan8, dww: Datetime and Datetime Range tests should not rely on Classy

parent 0e2ea433

core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class DateTimeFieldTest extends DateTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}
@@ -127,7 +127,7 @@ public function testDateField() { 
              $expected = $date_formatter->format($date->getTimestamp(), $new_value, '', DateTimeItemInterface::STORAGE_TIMEZONE);

              $expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);

              $output = $this->renderTestEntity($id);

              $expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';

              $expected_markup = '<time datetime="' . $expected_iso . '">' . $expected . '</time>';

              $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [

                '%value' => $new_value,

                '%expected' => $expected,
@@ -299,7 +299,7 @@ public function testDatetimeField() { 
            $expected = $date_formatter->format($date->getTimestamp(), $new_value);

            $expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

            $output = $this->renderTestEntity($id);

            $expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';

            $expected_markup = '<time datetime="' . $expected_iso . '">' . $expected . '</time>';

            $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));

            break;

        }

core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class FilterDateTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * Nodes to test.
@@ -142,13 +142,13 @@ public function testExposedGroupedFilters() { 
    // Filter the Preview by 'empty'.

    $this->getSession()->getPage()->findField($this->fieldName . '_value')->selectOption(1);

    $this->getSession()->getPage()->pressButton('Apply');

    $results = $this->cssSelect('.view-content .field-content');

    $results = $this->cssSelect('.views-row .field-content');

    $this->assertCount(1, $results);



    // Filter the Preview by 'not empty'.

    $this->getSession()->getPage()->findField($this->fieldName . '_value')->selectOption(2);

    $this->getSession()->getPage()->pressButton('Apply');

    $results = $this->cssSelect('.view-content .field-content');

    $results = $this->cssSelect('.views-row .field-content');

    $this->assertCount(3, $results);

  }

core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php

+11 −11
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class DateRangeFieldTest extends DateTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * The default display settings to use for the formatters.
@@ -138,10 +138,10 @@ public function testDateRangeField() { 


      $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long', '', DateTimeItemInterface::STORAGE_TIMEZONE);

      $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);

      $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

      $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

      $end_expected = $this->dateFormatter->format($end_date->getTimestamp(), 'long', '', DateTimeItemInterface::STORAGE_TIMEZONE);

      $end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);

      $end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';

      $end_expected_markup = '<time datetime="' . $end_expected_iso . '">' . $end_expected . '</time>';

      $output = $this->renderTestEntity($id);

      $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [

        '%value' => 'long',
@@ -237,7 +237,7 @@ public function testDateRangeField() { 


      $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long', '', DateTimeItemInterface::STORAGE_TIMEZONE);

      $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);

      $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

      $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

      $output = $this->renderTestEntity($id);

      $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [

        '%value' => 'long',
@@ -345,10 +345,10 @@ public function testDatetimeRangeField() { 


    $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long');

    $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

    $end_expected = $this->dateFormatter->format($end_date->getTimestamp(), 'long');

    $end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '">' . $end_expected . '</time>';

    $output = $this->renderTestEntity($id);

    $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));

    $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
@@ -427,7 +427,7 @@ public function testDatetimeRangeField() { 


    $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long');

    $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

    $output = $this->renderTestEntity($id);

    $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));

    $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
@@ -518,10 +518,10 @@ public function testAlldayRangeField() { 


    $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long');

    $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

    $end_expected = $this->dateFormatter->format($end_date->getTimestamp(), 'long');

    $end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '">' . $end_expected . '</time>';

    $output = $this->renderTestEntity($id);

    $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));

    $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
@@ -599,10 +599,10 @@ public function testAlldayRangeField() { 


    $start_expected = $this->dateFormatter->format($start_date->getTimestamp(), 'long');

    $start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';

    $start_expected_markup = '<time datetime="' . $start_expected_iso . '">' . $start_expected . '</time>';

    $end_expected = $this->dateFormatter->format($end_date->getTimestamp(), 'long');

    $end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';

    $end_expected_markup = '<time datetime="' . $end_expected_iso . '">' . $end_expected . '</time>';

    $output = $this->renderTestEntity($id);

    $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));

    $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));