Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / node / tests / src / Functional / Views / NodeRevisionWizardTest.php

diff --git a/web/core/modules/node/tests/src/Functional/Views/NodeRevisionWizardTest.php b/web/core/modules/node/tests/src/Functional/Views/NodeRevisionWizardTest.php
index db70b2c9da574ece0e03d865369a47b4652962c6..4cbecf314eee0d0782a9b205e9d06f1d150347c9 100644 (file)
--- a/web/core/modules/node/tests/src/Functional/Views/NodeRevisionWizardTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/NodeRevisionWizardTest.php
@@ -45,16 +45,19 @@ class NodeRevisionWizardTest extends WizardTestBase {
     $view['show[wizard_key]'] = 'node_revision';
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
 
-    $view_storage_controller = \Drupal::entityManager()->getStorage('view');
-    /** @var \Drupal\views\Entity\View $view */
-    $view = $view_storage_controller->load($view['id']);
+    $view = Views::getView($view['id']);
+    $view->initHandlers();
 
-    $this->assertEqual($view->get('base_table'), 'node_field_revision');
+    $this->assertEqual($view->getBaseTables(), ['node_field_revision' => TRUE, '#global' => TRUE]);
 
-    $executable = Views::executableFactory()->get($view);
-    $this->executeView($executable);
+    // Check for the default filters.
+    $this->assertEqual($view->filter['status']->table, 'node_field_revision');
+    $this->assertEqual($view->filter['status']->field, 'status');
+    $this->assertTrue($view->filter['status']->value);
 
-    $this->assertIdenticalResultset($executable, [['vid' => 1], ['vid' => 3], ['vid' => 2], ['vid' => 4]],
+    $this->executeView($view);
+
+    $this->assertIdenticalResultset($view, [['vid' => 1], ['vid' => 3], ['vid' => 2], ['vid' => 4]],
       ['vid' => 'vid']);
   }