diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index 7ed907bae3adff2d694a4cc256720ca0e93c582e..b0aebc2236bb754828207ed8ddd7663517ce52b7 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -33,94 +33,12 @@ class DisplayTest extends UITestBase {
public static function getInfo() {
return array(
- 'name' => 'Display tests',
- 'description' => 'Tests the handling of displays in the UI, adding removing etc.',
+ 'name' => 'Display element tests',
+ 'description' => 'Tests the display UI.',
'group' => 'Views UI',
);
}
- /**
- * A helper method which creates a random view.
- */
- public function randomView(array $view = array()) {
- // Create a new view in the UI.
- $default = array();
- $default['label'] = $this->randomName(16);
- $default['id'] = strtolower($this->randomName(16));
- $default['description'] = $this->randomName(16);
- $default['page[create]'] = TRUE;
- $default['page[path]'] = $default['id'];
-
- $view += $default;
-
- $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
-
- return $default;
- }
-
- /**
- * Tests removing a display.
- */
- public function testRemoveDisplay() {
- $view = $this->randomView();
- $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
-
- $this->drupalGet($path_prefix . '/default');
- $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is no delete button on the default display.');
-
- $this->drupalGet($path_prefix . '/page_1');
- $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display.');
-
- // Delete the page, so we can test the undo process.
- $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
- $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there a undo button on the page display after deleting.');
- $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
- $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
-
- $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
- $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
-
- // Undo the deleting of the display.
- $this->drupalPostForm($path_prefix . '/page_1', array(), 'Undo delete of Page');
- $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there is no undo button on the page display after reverting.');
- $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display after the reverting.');
-
- // Now delete again and save the view.
- $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
- $this->drupalPostForm(NULL, array(), t('Save'));
-
- $this->assertNoLinkByHref($path_prefix . '/page_1', 'Make sure there is no display tab for the deleted display.');
- }
-
- /**
- * Tests adding a display.
- */
- public function testAddDisplay() {
- // Show the master display.
- \Drupal::config('views.settings')->set('ui.show.master_display', TRUE)->save();
-
- $settings['page[create]'] = FALSE;
- $view = $this->randomView($settings);
-
- $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
- $this->drupalGet($path_prefix);
-
- // Add a new display.
- $this->drupalPostForm(NULL, array(), 'Add Page');
- $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI');
-
- $this->assertNoLink('Master*', 0, 'Make sure the master display is not marked as changed.');
- $this->assertLink('Page*', 0, 'Make sure the added display is marked as changed.');
-
- $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", array('path' => 'test/path'), t('Apply'));
- $this->drupalPostForm(NULL, array(), t('Save'));
-
- // Test that the new view display contains the correct provider.
- $view = Views::getView($view['id']);
- $displays = $view->storage->get('display');
- $this->assertIdentical($displays['page_1']['provider'], 'views', 'The expected provider was added to the new display.');
- }
-
/**
* Tests reordering of displays.
*/
@@ -151,55 +69,6 @@ public function testReorderDisplay() {
$this->assertEqual($displays['page_1']['position'], 2, 'Make sure the page display comes after the block display.');
}
- /**
- * Tests that the correct display is loaded by default.
- */
- public function testDefaultDisplay() {
- $this->drupalGet('admin/structure/views/view/test_display');
- $elements = $this->xpath('//*[@id="views-page-1-display-title"]');
- $this->assertEqual(count($elements), 1, 'The page display is loaded as the default display.');
- }
-
- /**
- * Tests the cloning of a display.
- */
- public function testCloneDisplay() {
- $view = $this->randomView();
- $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
-
- $this->drupalGet($path_prefix);
- $this->drupalPostForm(NULL, array(), 'Clone Page');
- $this->assertLinkByHref($path_prefix . '/page_2', 0, 'Make sure after cloning the new display appears in the UI');
- $this->assertUrl($path_prefix . '/page_2', array(), 'The user got redirected to the new display.');
-
- // Set the title and override the css classes.
- $random_title = $this->randomName();
- $random_css = $this->randomName();
- $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/title", array('title' => $random_title), t('Apply'));
- $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/css_class", array('override[dropdown]' => 'page_2', 'css_class' => $random_css), t('Apply'));
-
- // Clone as a different display type.
- $this->drupalPostForm(NULL, array(), 'Clone as Block');
- $this->assertLinkByHref($path_prefix . '/block_1', 0, 'Make sure after cloning the new display appears in the UI');
- $this->assertUrl($path_prefix . '/block_1', array(), 'The user got redirected to the new display.');
- $this->assertText(t('Block settings'));
- $this->assertNoText(t('Page settings'));
-
- $this->drupalPostForm(NULL, array(), t('Save'));
- $view = views_get_view($view['id']);
- $view->initDisplay();
-
- $page_2 = $view->displayHandlers->get('page_2');
- $this->assertTrue($page_2, 'The new page display got saved.');
- $this->assertEqual($page_2->display['display_title'], 'Page');
- $block_1 = $view->displayHandlers->get('block_1');
- $this->assertTrue($block_1, 'The new block display got saved.');
- $this->assertEqual($block_1->display['display_plugin'], 'block');
- $this->assertEqual($block_1->display['display_title'], 'Block', 'The new display title got generated as expected.');
- $this->assertEqual($block_1->getOption('title'), $random_title, 'The overridden title option from the display got copied into the clone');
- $this->assertEqual($block_1->getOption('css_class'), $random_css, 'The overridden css_class option from the display got copied into the clone');
- }
-
/**
* Tests disabling of a display.
*/
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php
new file mode 100644
index 0000000000000000000000000000000000000000..95f379029d85dbf327ec9c4c38fb8f36bec1caba
--- /dev/null
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_ui\Tests\DisplayTestCRUD.
+ */
+
+namespace Drupal\views_ui\Tests;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the handling of displays in the UI, adding removing etc.
+ */
+class DisplayTestCRUD extends UITestBase {
+
+ /**
+ * Views used by this test.
+ *
+ * @var array
+ */
+ public static $testViews = array('test_display');
+
+ /**
+ * Modules to enable
+ *
+ * @var array
+ */
+ public static $modules = array('contextual');
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Display CRUD UI tests',
+ 'description' => 'Tests creation, retrieval, updating, and deletion of displays in the Web UI.',
+ 'group' => 'Views UI',
+ );
+ }
+
+ /**
+ * Tests adding a display.
+ */
+ public function testAddDisplay() {
+ // Show the master display.
+ \Drupal::config('views.settings')->set('ui.show.master_display', TRUE)->save();
+
+ $settings['page[create]'] = FALSE;
+ $view = $this->randomView($settings);
+
+ $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
+ $this->drupalGet($path_prefix);
+
+ // Add a new display.
+ $this->drupalPostForm(NULL, array(), 'Add Page');
+ $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI');
+
+ $this->assertNoLink('Master*', 0, 'Make sure the master display is not marked as changed.');
+ $this->assertLink('Page*', 0, 'Make sure the added display is marked as changed.');
+
+ $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", array('path' => 'test/path'), t('Apply'));
+ $this->drupalPostForm(NULL, array(), t('Save'));
+
+ // Test that the new view display contains the correct provider.
+ $view = Views::getView($view['id']);
+ $displays = $view->storage->get('display');
+ $this->assertIdentical($displays['page_1']['provider'], 'views', 'The expected provider was added to the new display.');
+ }
+
+ /**
+ * Tests removing a display.
+ */
+ public function testRemoveDisplay() {
+ $view = $this->randomView();
+ $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
+
+ $this->drupalGet($path_prefix . '/default');
+ $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is no delete button on the default display.');
+
+ $this->drupalGet($path_prefix . '/page_1');
+ $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display.');
+
+ // Delete the page, so we can test the undo process.
+ $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
+ $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there a undo button on the page display after deleting.');
+ $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
+ $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
+
+ $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
+ $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
+
+ // Undo the deleting of the display.
+ $this->drupalPostForm($path_prefix . '/page_1', array(), 'Undo delete of Page');
+ $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there is no undo button on the page display after reverting.');
+ $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display after the reverting.');
+
+ // Now delete again and save the view.
+ $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
+ $this->drupalPostForm(NULL, array(), t('Save'));
+
+ $this->assertNoLinkByHref($path_prefix . '/page_1', 'Make sure there is no display tab for the deleted display.');
+ }
+
+ /**
+ * Tests that the correct display is loaded by default.
+ */
+ public function testDefaultDisplay() {
+ $this->drupalGet('admin/structure/views/view/test_display');
+ $elements = $this->xpath('//*[@id="views-page-1-display-title"]');
+ $this->assertEqual(count($elements), 1, 'The page display is loaded as the default display.');
+ }
+
+ /**
+ * Tests the cloning of a display.
+ */
+ public function testCloneDisplay() {
+ $view = $this->randomView();
+ $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
+
+ $this->drupalGet($path_prefix);
+ $this->drupalPostForm(NULL, array(), 'Clone Page');
+ $this->assertLinkByHref($path_prefix . '/page_2', 0, 'Make sure after cloning the new display appears in the UI');
+ $this->assertUrl($path_prefix . '/page_2', array(), 'The user got redirected to the new display.');
+
+ // Set the title and override the css classes.
+ $random_title = $this->randomName();
+ $random_css = $this->randomName();
+ $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/title", array('title' => $random_title), t('Apply'));
+ $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/css_class", array('override[dropdown]' => 'page_2', 'css_class' => $random_css), t('Apply'));
+
+ // Clone as a different display type.
+ $this->drupalPostForm(NULL, array(), 'Clone as Block');
+ $this->assertLinkByHref($path_prefix . '/block_1', 0, 'Make sure after cloning the new display appears in the UI');
+ $this->assertUrl($path_prefix . '/block_1', array(), 'The user got redirected to the new display.');
+ $this->assertText(t('Block settings'));
+ $this->assertNoText(t('Page settings'));
+
+ $this->drupalPostForm(NULL, array(), t('Save'));
+ $view = views_get_view($view['id']);
+ $view->initDisplay();
+
+ $page_2 = $view->displayHandlers->get('page_2');
+ $this->assertTrue($page_2, 'The new page display got saved.');
+ $this->assertEqual($page_2->display['display_title'], 'Page');
+ $block_1 = $view->displayHandlers->get('block_1');
+ $this->assertTrue($block_1, 'The new block display got saved.');
+ $this->assertEqual($block_1->display['display_plugin'], 'block');
+ $this->assertEqual($block_1->display['display_title'], 'Block', 'The new display title got generated as expected.');
+ $this->assertEqual($block_1->getOption('title'), $random_title, 'The overridden title option from the display got copied into the clone');
+ $this->assertEqual($block_1->getOption('css_class'), $random_css, 'The overridden css_class option from the display got copied into the clone');
+ }
+
+}
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
index 4eee5d857dccb6e1d707967e39652b475775c6ca..53fcc05a1a99e1ed5a78a8c0f3a3b4feb1c9670d 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
@@ -46,4 +46,23 @@ protected function setUp() {
$this->drupalLogin($this->fullAdminUser);
}
+ /**
+ * A helper method which creates a random view.
+ */
+ public function randomView(array $view = array()) {
+ // Create a new view in the UI.
+ $default = array();
+ $default['label'] = $this->randomName(16);
+ $default['id'] = strtolower($this->randomName(16));
+ $default['description'] = $this->randomName(16);
+ $default['page[create]'] = TRUE;
+ $default['page[path]'] = $default['id'];
+
+ $view += $default;
+
+ $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
+
+ return $default;
+ }
+
}