diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php index db75d7d..855dc81 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php @@ -7,6 +7,7 @@ namespace Drupal\views_ui\Tests; +use Drupal\views_ui\ViewUI; use SimpleXMLElement; /** @@ -86,28 +87,23 @@ function testPreviewUI() { */ function testPreviewWithPagersUI() { - // Disable automatic preview. - $edit = array( - 'ui_always_live_preview' => FALSE, - ); - $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration')); - // Create 11 nodes and make sure that everyone is returned. for ($i = 0; $i < 11; $i++) { $this->drupalCreateNode(); } // Test Full Pager. - $this->drupalGet('admin/structure/views/view/test_pager_full/edit'); - $this->assertResponse(200); - $this->drupalPostAJAX(NULL, array(), array('op' => t('Update preview'))); + $view = $view = entity_load('view', 'test_pager_full'); + $view_ui = new ViewUI($view); + $rendered_preview = $view_ui->renderPreview('default'); + $result = simplexml_load_string('' . $rendered_preview . ''); // Are there 5 rows returned? - $elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]'); - $this->assertEqual(count($elements), 5); + $elements = $result->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]'); + $this->assertEqual(count($elements), 5, '5 items found on page.'); // Test that the pager is present and rendered. - $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'pager')); + $elements = $result->xpath('//ul[@class = "pager"]/li'); $this->assertTrue(!empty($elements), 'Full pager found.'); // Verify elements and links to pages. @@ -142,16 +138,17 @@ function testPreviewWithPagersUI() { } // Test Mini Pager. - $this->drupalGet('admin/structure/views/view/test_mini_pager/edit'); - $this->assertResponse(200); - $this->drupalPostAJAX(NULL, array(), array('op' => t('Update preview'))); + $view = $view = entity_load('view', 'test_mini_pager'); + $view_ui = new ViewUI($view); + $rendered_preview = $view_ui->renderPreview('default'); + $result = simplexml_load_string('' . $rendered_preview . ''); // Are there 3 rows returned? - $elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]'); - $this->assertEqual(count($elements), 3); + $elements = $result->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]'); + $this->assertEqual(count($elements), 3, '3 items found on page.'); // Test that the pager is present and rendered. - $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'pager')); + $elements = $result->xpath('//ul[@class = "pager"]/li'); $this->assertTrue(!empty($elements), 'Mini pager found.'); // Verify elements and links to pages.