updated core from 8.4 to 8.5 : bug with login_destination
This commit is contained in:
@@ -7,8 +7,8 @@ package: Testing
|
||||
dependencies:
|
||||
- views
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-01-03
|
||||
version: '8.4.4'
|
||||
# Information added by Drupal.org packaging script on 2018-03-07
|
||||
version: '8.5.0'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1515021228
|
||||
datestamp: 1520457826
|
||||
|
||||
+1
@@ -33,6 +33,7 @@ display:
|
||||
relationship: none
|
||||
table: node__field_date
|
||||
order: DESC
|
||||
granularity: second
|
||||
plugin_id: datetime
|
||||
id:
|
||||
field: nid
|
||||
|
||||
@@ -183,4 +183,20 @@ abstract class DateTestBase extends BrowserTestBase {
|
||||
->save();
|
||||
}
|
||||
|
||||
/**
|
||||
* Massages test date values.
|
||||
*
|
||||
* If a date object is generated directly by a test, then it needs to be
|
||||
* adjusted to behave like the computed date from the item.
|
||||
*
|
||||
* @param \Drupal\Core\Datetime\DrupalDateTime $date
|
||||
* A date object directly generated by the test.
|
||||
*/
|
||||
protected function massageTestDate($date) {
|
||||
if ($this->field->getSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
|
||||
// Set the default time for date-only items.
|
||||
$date->setDefaultDateTime();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Drupal\Component\Utility\SafeMarkup;
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Core\Datetime\DrupalDateTime;
|
||||
use Drupal\Core\Datetime\Entity\DateFormat;
|
||||
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
|
||||
use Drupal\entity_test\Entity\EntityTest;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
@@ -58,7 +59,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
// mimic the user in a different timezone simply entering '2012-12-31' via
|
||||
// the UI.
|
||||
$value = '2012-12-31 00:00:00';
|
||||
$date = new DrupalDateTime($value, DATETIME_STORAGE_TIMEZONE);
|
||||
$date = new DrupalDateTime($value, DateTimeItemInterface::STORAGE_TIMEZONE);
|
||||
|
||||
// Submit a valid date and ensure it is accepted.
|
||||
$date_format = DateFormat::load('html_date')->getPattern();
|
||||
@@ -100,7 +101,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
// Formats that display a time component for date-only fields will display
|
||||
// the default time, so that is applied before calculating the expected
|
||||
// value.
|
||||
datetime_date_default_time($date);
|
||||
$this->massageTestDate($date);
|
||||
foreach ($options as $setting => $values) {
|
||||
foreach ($values as $new_value) {
|
||||
// Update the entity display settings.
|
||||
@@ -114,8 +115,8 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
case 'format_type':
|
||||
// Verify that a date is displayed. Since this is a date-only
|
||||
// field, it is expected to display the time as 00:00:00.
|
||||
$expected = format_date($date->getTimestamp(), $new_value, '', DATETIME_STORAGE_TIMEZONE);
|
||||
$expected_iso = format_date($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DATETIME_STORAGE_TIMEZONE);
|
||||
$expected = format_date($date->getTimestamp(), $new_value, '', DateTimeItemInterface::STORAGE_TIMEZONE);
|
||||
$expected_iso = format_date($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>';
|
||||
$this->assertContains($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
|
||||
@@ -135,7 +136,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
|
||||
->setComponent($field_name, $this->displayOptions)
|
||||
->save();
|
||||
$expected = $date->format(DATETIME_DATE_STORAGE_FORMAT);
|
||||
$expected = $date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
|
||||
$output = $this->renderTestEntity($id);
|
||||
$this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
|
||||
'%expected' => $expected,
|
||||
@@ -296,7 +297,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
|
||||
->setComponent($field_name, $this->displayOptions)
|
||||
->save();
|
||||
$expected = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
|
||||
$expected = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
|
||||
$output = $this->renderTestEntity($id);
|
||||
$this->assertContains($expected, $output, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
|
||||
|
||||
@@ -329,7 +330,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
$entity = EntityTest::load($id);
|
||||
$field_name = $this->fieldStorage->getName();
|
||||
$date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
|
||||
$entity->{$field_name}->value = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
|
||||
$entity->{$field_name}->value = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
|
||||
$entity->save();
|
||||
|
||||
$this->displayOptions['type'] = 'datetime_time_ago';
|
||||
@@ -356,7 +357,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
$entity = EntityTest::load($id);
|
||||
$field_name = $this->fieldStorage->getName();
|
||||
$date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
|
||||
$entity->{$field_name}->value = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
|
||||
$entity->{$field_name}->value = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
|
||||
$entity->save();
|
||||
|
||||
entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
|
||||
@@ -695,7 +696,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
$new_node = Node::create(['type' => 'date_content']);
|
||||
$expected_date = new DrupalDateTime('now', drupal_get_user_timezone());
|
||||
$this->assertEqual($new_node->get($field_name)
|
||||
->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
|
||||
->offsetGet(0)->value, $expected_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT));
|
||||
|
||||
// Set an invalid relative default_value to test validation.
|
||||
$field_edit = [
|
||||
@@ -734,7 +735,7 @@ class DateTimeFieldTest extends DateTestBase {
|
||||
$new_node = Node::create(['type' => 'date_content']);
|
||||
$expected_date = new DrupalDateTime('+90 days', drupal_get_user_timezone());
|
||||
$this->assertEqual($new_node->get($field_name)
|
||||
->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
|
||||
->offsetGet(0)->value, $expected_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT));
|
||||
|
||||
// Remove default value.
|
||||
$field_edit = [
|
||||
|
||||
@@ -5,6 +5,7 @@ namespace Drupal\Tests\datetime\Kernel;
|
||||
use Drupal\Core\Field\FieldItemListInterface;
|
||||
use Drupal\Core\Field\FieldItemInterface;
|
||||
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
|
||||
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
|
||||
use Drupal\entity_test\Entity\EntityTest;
|
||||
use Drupal\field\Entity\FieldConfig;
|
||||
use Drupal\Tests\field\Kernel\FieldKernelTestBase;
|
||||
@@ -80,19 +81,19 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
|
||||
$this->assertEqual($entity->field_datetime->value, $value);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Verify changing the date value.
|
||||
$new_value = '2016-11-04T00:21:00';
|
||||
$entity->field_datetime->value = $new_value;
|
||||
$this->assertEqual($entity->field_datetime->value, $new_value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Read changed entity and assert changed values.
|
||||
$this->entityValidateAndSave($entity);
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime->value, $new_value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Test the generateSampleValue() method.
|
||||
$entity = EntityTest::create();
|
||||
@@ -121,23 +122,35 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
|
||||
$this->assertEqual($entity->field_datetime->value, $value);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
$entity->field_datetime->date->setDefaultDateTime();
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
|
||||
// Verify changing the date value.
|
||||
$new_value = '2016-11-04';
|
||||
$entity->field_datetime->value = $new_value;
|
||||
$this->assertEqual($entity->field_datetime->value, $new_value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
$entity->field_datetime->date->setDefaultDateTime();
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
|
||||
// Read changed entity and assert changed values.
|
||||
$this->entityValidateAndSave($entity);
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime->value, $new_value);
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
$entity->field_datetime->date->setDefaultDateTime();
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
|
||||
// Test the generateSampleValue() method.
|
||||
$entity = EntityTest::create();
|
||||
$entity->field_datetime->generateSampleItems();
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
$entity->field_datetime->date->setDefaultDateTime();
|
||||
$this->assertEquals('12:00:00', $entity->field_datetime->date->format('H:i:s'));
|
||||
$this->entityValidateAndSave($entity);
|
||||
}
|
||||
|
||||
@@ -158,7 +171,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Test DateTimeItem::setValue() using property array.
|
||||
$entity = EntityTest::create();
|
||||
@@ -169,7 +182,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Test a date-only field.
|
||||
$this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
|
||||
@@ -184,7 +197,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Test DateTimeItem::setValue() using property array.
|
||||
$entity = EntityTest::create();
|
||||
@@ -195,7 +208,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -215,7 +228,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
|
||||
// Test Date::setValue() with a date-only field.
|
||||
// Test a date+time field.
|
||||
@@ -230,7 +243,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
|
||||
$id = $entity->id();
|
||||
$entity = EntityTest::load($id);
|
||||
$this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
|
||||
$this->assertEquals(DATETIME_STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -28,6 +28,9 @@ class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
|
||||
'2000-10-10',
|
||||
'2001-10-10',
|
||||
'2002-01-01',
|
||||
// Add a date that is the year 2002 in UTC, but 2003 in the site's time
|
||||
// zone (Australia/Sydney).
|
||||
'2002-12-31T23:00:00',
|
||||
];
|
||||
foreach ($dates as $date) {
|
||||
$node = Node::create([
|
||||
@@ -64,6 +67,25 @@ class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
|
||||
$expected[] = ['nid' => $this->nodes[2]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view, ['2003']);
|
||||
$expected = [];
|
||||
$expected[] = ['nid' => $this->nodes[3]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
|
||||
// Tests different system timezone with the same nodes.
|
||||
$this->setSiteTimezone('America/Vancouver');
|
||||
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view, ['2002']);
|
||||
$expected = [];
|
||||
// Only the 3rd node is returned here since UTC 2002-01-01T00:00:00 is still
|
||||
// in 2001 for this user timezone.
|
||||
$expected[] = ['nid' => $this->nodes[3]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -87,6 +109,7 @@ class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
|
||||
$this->executeView($view, ['01']);
|
||||
$expected = [];
|
||||
$expected[] = ['nid' => $this->nodes[2]->id()];
|
||||
$expected[] = ['nid' => $this->nodes[3]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
@@ -112,6 +135,7 @@ class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
|
||||
$this->executeView($view, ['01']);
|
||||
$expected = [];
|
||||
$expected[] = ['nid' => $this->nodes[2]->id()];
|
||||
$expected[] = ['nid' => $this->nodes[3]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
@@ -157,6 +181,7 @@ class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
|
||||
$this->executeView($view, ['01']);
|
||||
$expected = [];
|
||||
$expected[] = ['nid' => $this->nodes[2]->id()];
|
||||
$expected[] = ['nid' => $this->nodes[3]->id()];
|
||||
$this->assertIdenticalResultset($view, $expected, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ abstract class DateTimeHandlerTestBase extends ViewsKernelTestBase {
|
||||
protected function setUp($import_test_views = TRUE) {
|
||||
parent::setUp($import_test_views);
|
||||
|
||||
$this->installSchema('node', 'node_access');
|
||||
$this->installEntitySchema('node');
|
||||
$this->installEntitySchema('user');
|
||||
|
||||
@@ -76,4 +77,18 @@ abstract class DateTimeHandlerTestBase extends ViewsKernelTestBase {
|
||||
ViewTestData::createTestViews(get_class($this), ['datetime_test']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the site timezone to a given timezone.
|
||||
*
|
||||
* @param string $timezone
|
||||
* The timezone identifier to set.
|
||||
*/
|
||||
protected function setSiteTimezone($timezone) {
|
||||
// Set an explicit site timezone, and disallow per-user timezones.
|
||||
$this->config('system.date')
|
||||
->set('timezone.user.configurable', 0)
|
||||
->set('timezone.default', $timezone)
|
||||
->save();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\Tests\datetime\Kernel\Views;
|
||||
|
||||
use Drupal\Tests\SchemaCheckTestTrait;
|
||||
use Drupal\views\Views;
|
||||
|
||||
/**
|
||||
* Tests the Drupal\datetime\Plugin\views schemas.
|
||||
*
|
||||
* @group datetime
|
||||
*/
|
||||
class DateTimeSchemaTest extends DateTimeHandlerTestBase {
|
||||
|
||||
use SchemaCheckTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $testViews = ['test_argument_datetime', 'test_filter_datetime', 'test_sort_datetime'];
|
||||
|
||||
/**
|
||||
* Test argument plugin schema.
|
||||
*/
|
||||
public function testDateTimeSchema() {
|
||||
// Test argument schema.
|
||||
$view = Views::getView('test_argument_datetime');
|
||||
$view->initHandlers();
|
||||
$view->setDisplay('default');
|
||||
$arguments = $view->displayHandlers->get('default')->getOption('arguments');
|
||||
$arguments['field_date_value_year']['date'] = 'Date';
|
||||
$view->displayHandlers->get('default')->overrideOption('arguments', $arguments);
|
||||
$view->save();
|
||||
$this->assertConfigSchemaByName('views.view.test_argument_datetime');
|
||||
|
||||
// Test filter schema.
|
||||
$view = Views::getView('test_filter_datetime');
|
||||
$view->initHandlers();
|
||||
$filters = $view->displayHandlers->get('default')->getOption('filters');
|
||||
$filters['field_date_value']['type'] = 'Date';
|
||||
$view->save();
|
||||
$this->assertConfigSchemaByName('views.view.test_filter_datetime');
|
||||
|
||||
// Test sort schema.
|
||||
$view = Views::getView('test_sort_datetime');
|
||||
$view->initHandlers();
|
||||
$sorts = $view->displayHandlers->get('default')->getOption('sorts');
|
||||
$this->assertNotEmpty($sorts['field_date_value']['granularity']);
|
||||
$this->assertConfigSchemaByName('views.view.test_sort_datetime');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Drupal\Tests\datetime\Kernel\Views;
|
||||
|
||||
use Drupal\Component\Datetime\DateTimePlus;
|
||||
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\node\Entity\Node;
|
||||
@@ -20,9 +21,26 @@ class FilterDateTest extends DateTimeHandlerTestBase {
|
||||
public static $testViews = ['test_filter_datetime'];
|
||||
|
||||
/**
|
||||
* For offset tests, set to the current time.
|
||||
* An array of timezone extremes to test.
|
||||
*
|
||||
* @var string[]
|
||||
*/
|
||||
protected static $date;
|
||||
protected static $timezones = [
|
||||
// UTC-12, no DST.
|
||||
'Pacific/Kwajalein',
|
||||
// UTC-11, no DST.
|
||||
'Pacific/Midway',
|
||||
// UTC-7, no DST.
|
||||
'America/Phoenix',
|
||||
// UTC.
|
||||
'UTC',
|
||||
// UTC+5:30, no DST.
|
||||
'Asia/Kolkata',
|
||||
// UTC+12, no DST.
|
||||
'Pacific/Funafuti',
|
||||
// UTC+13, no DST.
|
||||
'Pacific/Tongatapu',
|
||||
];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
@@ -32,30 +50,24 @@ class FilterDateTest extends DateTimeHandlerTestBase {
|
||||
protected function setUp($import_test_views = TRUE) {
|
||||
parent::setUp($import_test_views);
|
||||
|
||||
// Set to 'today'.
|
||||
static::$date = REQUEST_TIME;
|
||||
|
||||
// Change field storage to date-only.
|
||||
$storage = FieldStorageConfig::load('node.' . static::$field_name);
|
||||
$storage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
|
||||
$storage->save();
|
||||
|
||||
$dates = [
|
||||
// Tomorrow.
|
||||
\Drupal::service('date.formatter')->format(static::$date + 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
// Today.
|
||||
\Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
// Yesterday.
|
||||
\Drupal::service('date.formatter')->format(static::$date - 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
];
|
||||
// Retrieve tomorrow, today and yesterday dates just to create the nodes.
|
||||
$timestamp = $this->getUTCEquivalentOfUserNowAsTimestamp();
|
||||
$dates = $this->getRelativeDateValuesFromTimestamp($timestamp);
|
||||
|
||||
// Clean the nodes on setUp.
|
||||
$this->nodes = [];
|
||||
foreach ($dates as $date) {
|
||||
$node = Node::create([
|
||||
'title' => $this->randomMachineName(8),
|
||||
'type' => 'page',
|
||||
'field_date' => [
|
||||
'value' => $date,
|
||||
]
|
||||
],
|
||||
]);
|
||||
$node->save();
|
||||
$this->nodes[] = $node;
|
||||
@@ -69,48 +81,156 @@ class FilterDateTest extends DateTimeHandlerTestBase {
|
||||
$view = Views::getView('test_filter_datetime');
|
||||
$field = static::$field_name . '_value';
|
||||
|
||||
// Test simple operations.
|
||||
$view->initHandlers();
|
||||
foreach (static::$timezones as $timezone) {
|
||||
|
||||
// A greater than or equal to 'now', should return the 'today' and
|
||||
// the 'tomorrow' node.
|
||||
$view->filter[$field]->operator = '>=';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['value'] = 'now';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[0]->id()],
|
||||
['nid' => $this->nodes[1]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
$this->setSiteTimezone($timezone);
|
||||
$timestamp = $this->getUTCEquivalentOfUserNowAsTimestamp();
|
||||
$dates = $this->getRelativeDateValuesFromTimestamp($timestamp);
|
||||
$this->updateNodesDateFieldsValues($dates);
|
||||
|
||||
// Only dates in the past.
|
||||
$view->initHandlers();
|
||||
$view->filter[$field]->operator = '<';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['value'] = 'now';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[2]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
// Test simple operations.
|
||||
$view->initHandlers();
|
||||
|
||||
// Test offset for between operator. Only the 'tomorrow' node should appear.
|
||||
$view->initHandlers();
|
||||
$view->filter[$field]->operator = 'between';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['max'] = '+2 days';
|
||||
$view->filter[$field]->value['min'] = '+1 day';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[0]->id()],
|
||||
// A greater than or equal to 'now', should return the 'today' and the
|
||||
// 'tomorrow' node.
|
||||
$view->filter[$field]->operator = '>=';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['value'] = 'now';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[0]->id()],
|
||||
['nid' => $this->nodes[1]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
|
||||
// Only dates in the past.
|
||||
$view->initHandlers();
|
||||
$view->filter[$field]->operator = '<';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['value'] = 'now';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[2]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
|
||||
// Test offset for between operator. Only 'tomorrow' node should appear.
|
||||
$view->initHandlers();
|
||||
$view->filter[$field]->operator = 'between';
|
||||
$view->filter[$field]->value['type'] = 'offset';
|
||||
$view->filter[$field]->value['max'] = '+2 days';
|
||||
$view->filter[$field]->value['min'] = '+1 day';
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[0]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test date filter with date-only fields.
|
||||
*/
|
||||
public function testDateIs() {
|
||||
$view = Views::getView('test_filter_datetime');
|
||||
$field = static::$field_name . '_value';
|
||||
|
||||
foreach (static::$timezones as $timezone) {
|
||||
|
||||
$this->setSiteTimezone($timezone);
|
||||
$timestamp = $this->getUTCEquivalentOfUserNowAsTimestamp();
|
||||
$dates = $this->getRelativeDateValuesFromTimestamp($timestamp);
|
||||
$this->updateNodesDateFieldsValues($dates);
|
||||
|
||||
// Test simple operations.
|
||||
$view->initHandlers();
|
||||
|
||||
// Filtering with nodes date-only values (format: Y-m-d) to test UTC
|
||||
// conversion does NOT change the day.
|
||||
$view->filter[$field]->operator = '=';
|
||||
$view->filter[$field]->value['type'] = 'date';
|
||||
$view->filter[$field]->value['value'] = $this->nodes[2]->field_date->first()->getValue()['value'];
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[2]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
|
||||
// Test offset for between operator. Only 'today' and 'tomorrow' nodes
|
||||
// should appear.
|
||||
$view->initHandlers();
|
||||
$view->filter[$field]->operator = 'between';
|
||||
$view->filter[$field]->value['type'] = 'date';
|
||||
$view->filter[$field]->value['max'] = $this->nodes[0]->field_date->first()->getValue()['value'];
|
||||
$view->filter[$field]->value['min'] = $this->nodes[1]->field_date->first()->getValue()['value'];
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
['nid' => $this->nodes[0]->id()],
|
||||
['nid' => $this->nodes[1]->id()],
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
$view->destroy();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns UTC timestamp of user's TZ 'now'.
|
||||
*
|
||||
* The date field stores date_only values without conversion, considering them
|
||||
* already as UTC. This method returns the UTC equivalent of user's 'now' as a
|
||||
* unix timestamp, so they match using Y-m-d format.
|
||||
*
|
||||
* @return int
|
||||
* Unix timestamp.
|
||||
*/
|
||||
protected function getUTCEquivalentOfUserNowAsTimestamp() {
|
||||
$user_now = new DateTimePlus('now', new \DateTimeZone(drupal_get_user_timezone()));
|
||||
$utc_equivalent = new DateTimePlus($user_now->format('Y-m-d H:i:s'), new \DateTimeZone(DATETIME_STORAGE_TIMEZONE));
|
||||
|
||||
return $utc_equivalent->getTimestamp();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an array formatted date_only values.
|
||||
*
|
||||
* @param int $timestamp
|
||||
* Unix Timestamp equivalent to user's "now".
|
||||
*
|
||||
* @return array
|
||||
* An array of DATETIME_DATE_STORAGE_FORMAT date values. In order tomorrow,
|
||||
* today and yesterday.
|
||||
*/
|
||||
protected function getRelativeDateValuesFromTimestamp($timestamp) {
|
||||
return [
|
||||
// Tomorrow.
|
||||
\Drupal::service('date.formatter')->format($timestamp + 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
// Today.
|
||||
\Drupal::service('date.formatter')->format($timestamp, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
// Yesterday.
|
||||
\Drupal::service('date.formatter')->format($timestamp - 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
];
|
||||
$this->assertIdenticalResultset($view, $expected_result, $this->map);
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates tests nodes date fields values.
|
||||
*
|
||||
* @param array $dates
|
||||
* An array of DATETIME_DATE_STORAGE_FORMAT date values.
|
||||
*/
|
||||
protected function updateNodesDateFieldsValues(array $dates) {
|
||||
foreach ($dates as $index => $date) {
|
||||
$this->nodes[$index]->{static::$field_name}->value = $date;
|
||||
$this->nodes[$index]->save();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Drupal\Tests\datetime\Kernel\Views;
|
||||
|
||||
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
|
||||
use Drupal\node\Entity\Node;
|
||||
use Drupal\views\Views;
|
||||
|
||||
@@ -39,6 +40,9 @@ class FilterDateTimeTest extends DateTimeHandlerTestBase {
|
||||
|
||||
// Set the timezone.
|
||||
date_default_timezone_set(static::$timezone);
|
||||
$this->config('system.date')
|
||||
->set('timezone.default', static::$timezone)
|
||||
->save();
|
||||
|
||||
// Add some basic test nodes.
|
||||
$dates = [
|
||||
@@ -47,7 +51,7 @@ class FilterDateTimeTest extends DateTimeHandlerTestBase {
|
||||
'2002-10-10T14:14:14',
|
||||
// The date storage timezone is used (this mimics the steps taken in the
|
||||
// widget: \Drupal\datetime\Plugin\Field\FieldWidget::messageFormValues().
|
||||
\Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
|
||||
\Drupal::service('date.formatter')->format(static::$date, 'custom', DateTimeItemInterface::DATETIME_STORAGE_FORMAT, DateTimeItemInterface::STORAGE_TIMEZONE),
|
||||
];
|
||||
foreach ($dates as $date) {
|
||||
$node = Node::create([
|
||||
@@ -183,7 +187,7 @@ class FilterDateTimeTest extends DateTimeHandlerTestBase {
|
||||
$view->filter[$field]->value['max'] = '';
|
||||
// Use the date from node 3. Use the site timezone (mimics a value entered
|
||||
// through the UI).
|
||||
$view->filter[$field]->value['value'] = \Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, static::$timezone);
|
||||
$view->filter[$field]->value['value'] = \Drupal::service('date.formatter')->format(static::$date, 'custom', DateTimeItemInterface::DATETIME_STORAGE_FORMAT, static::$timezone);
|
||||
$view->setDisplay('default');
|
||||
$this->executeView($view);
|
||||
$expected_result = [
|
||||
|
||||
Reference in New Issue
Block a user