diff -u b/core/modules/datetime/tests/src/Kernel/Views/DateTimeSchemaTest.php b/core/modules/datetime/tests/src/Kernel/Views/DateTimeSchemaTest.php --- b/core/modules/datetime/tests/src/Kernel/Views/DateTimeSchemaTest.php +++ b/core/modules/datetime/tests/src/Kernel/Views/DateTimeSchemaTest.php @@ -17,63 +17,36 @@ /** * {@inheritdoc} */ - public static $testViews = ['test_argument_datetime','test_filter_datetime','test_sort_datetime']; - - /** - * {@inheritdoc} - */ - protected function setUp($import_test_views = TRUE) { - // This shouldn't be needed, but I can't get this to fail!?! - $this->strictConfigSchema = TRUE; - - parent::setUp($import_test_views); - } + public static $testViews = ['test_argument_datetime','test_filter_datetime', 'test_sort_datetime']; /** * Test argument plugin schema. */ - public function testArgumentSchema() { - $field = static::$field_name . '_value'; + 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(); - $view->destroy(); - } + $this->assertConfigSchemaByName('views.view.test_argument_datetime'); - /** - * Test argument plugin schema. - */ - public function testFilterSchema() { - $field = static::$field_name . '_value'; + // 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(); - $view->destroy(); - } + $this->assertConfigSchemaByName('views.view.test_filter_datetime'); - /** - * Test argument plugin schema. - */ - public function testSortSchema() { - $field = static::$field_name . '_value'; + // Test sort schema. $view = Views::getView('test_sort_datetime'); - $view->initHandlers(); - - // This should be an invalid option. - $view->sort[$field]->options['foo'] = 'bar'; - - // So this should barf. - $view->save(); - - // And this should barf some more. + $sorts = $view->displayHandlers->get('default')->getOption('sorts'); + $this->assertNotEmpty($sorts['field_date_value']['granularity']); $this->assertConfigSchemaByName('views.view.test_sort_datetime'); - - $view->destroy(); } }