From f1c278e8f491c25052af585221f031cfceafd602 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 13 May 2014 14:53:03 +0100
Subject: [PATCH] Revert "git commit -m Issue"
This reverts commit c024e97b493c12868df463bbb699d8c9df655ba6.
---
.../views/exposed_form/InputRequired.php | 2 +-
.../views/Tests/Plugin/ExposedFormTest.php | 26 +------------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 99f5ea49c29d..5508f3ada531 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -83,7 +83,7 @@ public function preRender($values) {
'format' => $this->options['text_input_required_format'],
);
$handler = Views::handlerManager('area')->getHandler($options);
- $handler->init($this->view, $this->displayHandler, $options);
+ $handler->init($this->view, $options);
$this->displayHandler->handlers['empty'] = array(
'area' => $handler,
);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index 61c156895077..3a41e778d9d3 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
// Create some random nodes.
for ($i = 0; $i < 5; $i++) {
- $this->drupalCreateNode(array('type' => 'article'));
+ $this->drupalCreateNode();
}
}
@@ -161,30 +161,6 @@ public function testExposedBlock() {
$this->assertEqual(count($elements), 1, 'One exposed form block found.');
}
- /**
- * Test the input required exposed form type.
- */
- public function testInputRequired() {
- $view = entity_load('view', 'test_exposed_form_buttons');
- $display = &$view->getDisplay('default');
- $display['display_options']['exposed_form']['type'] = 'input_required';
- $view->save();
-
- $this->drupalGet('test_exposed_form_buttons');
- $this->assertResponse(200);
- $this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply'));
-
- // Ensure that no results are displayed.
- $rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 0, 'No rows are displayed by default when no input is provided.');
-
- $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
-
- // Ensure that results are displayed.
- $rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 5, 'All rows are displayed by default when input is provided.');
- }
-
/**
* Returns a views exposed form ID.
*
--
GitLab