Skip to content

D
drupal
Commit 6b6ddee8 authored by catch's avatar catch
Browse files
Options

Issue #2863267 by Lendude, Jo Fitzgerald, michielnugter, dawehner, klausi:... 

Issue #2863267 by Lendude, Jo Fitzgerald, michielnugter, dawehner, klausi: Convert web tests of views
parent 477fbfd2
Hide whitespace changes
Inline Side-by-side
Showing with 727 additions and 394 deletions
core/modules/views/src/Tests/Handler/HandlerTestBase.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
@trigger_error('\Drupal\views\Tests\Handler\HandlerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
use Drupal\views\Tests\ViewTestBase;
/**
* @todo.
* @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
* Use \Drupal\Tests\views\Functional\ViewTestBase.
*/
abstract class HandlerTestBase extends ViewTestBase {
......
core/modules/views/src/Tests/Plugin/PluginTestBase.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Plugin;
@trigger_error('\Drupal\views\Tests\Plugin\PluginTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
use Drupal\views\Tests\ViewTestBase;
/**
* @todo.
* @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
* Use \Drupal\Tests\views\Functional\ViewTestBase.
*/
abstract class PluginTestBase extends ViewTestBase {
......
core/modules/views/src/Tests/ViewTestBase.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests;
@trigger_error('\Drupal\views\Tests\ViewTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\simpletest\WebTestBase;
......@@ -13,6 +14,9 @@
* When possible, ViewsKernelTestBase should be used instead. Both base classes
* include the same methods.
*
* @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
* Use \Drupal\Tests\views\Functional\ViewTestBase.
*
* @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase
* @see \Drupal\simpletest\WebTestBase
*/
......
core/modules/views/src/Tests/Wizard/WizardTestBase.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Wizard;
@trigger_error('\Drupal\views\Tests\Wizard\WizardTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\Wizard\WizardTestBase', E_USER_DEPRECATED);
use Drupal\views\Tests\ViewTestBase;
/**
* Views UI wizard tests.
*
* @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
* Use \Drupal\Tests\views\Functional\Wizard\WizardTestBase.
*/
abstract class WizardTestBase extends ViewTestBase {
......
core/modules/views/src/Tests/DefaultViewsTest.php → core/modules/views/tests/src/Functional/DefaultViewsTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests;
namespace Drupal\Tests\views\Functional;
use Drupal\comment\CommentInterface;
use Drupal\comment\Tests\CommentTestTrait;
......@@ -42,8 +42,8 @@ class DefaultViewsTest extends ViewTestBase {
'glossary' => ['all'],
];
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
$this->drupalPlaceBlock('page_title_block');
......
core/modules/views/src/Tests/Entity/BaseFieldAccessTest.php → core/modules/views/tests/src/Functional/Entity/BaseFieldAccessTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Entity;
namespace Drupal\Tests\views\Functional\Entity;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\views\Tests\ViewTestBase;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
/**
......@@ -32,8 +32,8 @@ class BaseFieldAccessTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
/** @var \Drupal\Core\Entity\EntityDefinitionUpdateManager $update_manager */
$update_manager = $this->container->get('entity.definition_update_manager');
\Drupal::entityManager()->clearCachedDefinitions();
......
core/modules/views/src/Tests/Entity/FieldEntityTest.php → core/modules/views/tests/src/Functional/Entity/FieldEntityTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Entity;
namespace Drupal\Tests\views\Functional\Entity;
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\node\Entity\Node;
use Drupal\user\Entity\User;
use Drupal\views\Tests\ViewTestBase;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
use Drupal\views\Views;
use Drupal\comment\Entity\Comment;
......
core/modules/views/src/Tests/Entity/FieldEntityTranslationTest.php → core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Entity;
namespace Drupal\Tests\views\Functional\Entity;
use Drupal\Core\Language\Language;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\views\Tests\ViewTestBase;
use Drupal\Tests\views\Functional\ViewTestBase;
use Symfony\Component\CssSelector\CssSelectorConverter;
/**
......@@ -164,8 +164,8 @@ protected function assertRows($expected = []) {
$rows = $this->cssSelect('div.views-row');
foreach ($rows as $row) {
$actual[] = [
'title' => (string) $row->xpath((new CssSelectorConverter())->toXPath('.views-field-title span.field-content a'))[0],
'sticky' => (string) $row->xpath((new CssSelectorConverter())->toXPath('.views-field-sticky span.field-content'))[0],
'title' => $row->find('xpath', (new CssSelectorConverter())->toXPath('.views-field-title span.field-content a'))->getText(),
'sticky' => $row->find('xpath', (new CssSelectorConverter())->toXPath('.views-field-sticky span.field-content'))->getText(),
];
}
$this->assertEqual($actual, $expected);
......
core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php → core/modules/views/tests/src/Functional/Entity/FilterEntityBundleTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Entity;
namespace Drupal\Tests\views\Functional\Entity;
use Drupal\node\Entity\Node;
use Drupal\views\Tests\ViewTestBase;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
use Drupal\views\Views;
......@@ -42,7 +42,7 @@ class FilterEntityBundleTest extends ViewTestBase {
*/
protected $entities = [];
protected function setUp() {
protected function setUp($import_test_views = TRUE) {
parent::setUp(FALSE);
$this->drupalCreateContentType(['type' => 'test_bundle']);
......
core/modules/views/src/Tests/Entity/ViewNonTranslatableEntityTest.php → core/modules/views/tests/src/Functional/Entity/ViewNonTranslatableEntityTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Entity;
namespace Drupal\Tests\views\Functional\Entity;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\language_test\Entity\NoLanguageEntityTest;
use Drupal\simpletest\WebTestBase;
use Drupal\Tests\BrowserTestBase;
/**
* Tests the view creation of non-translatable entities.
*
* @group views
*/
class ViewNonTranslatableEntityTest extends WebTestBase {
class ViewNonTranslatableEntityTest extends BrowserTestBase {
/**
* Modules to enable.
......
core/modules/views/src/Tests/GlossaryTest.php → core/modules/views/tests/src/Functional/GlossaryTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests;
namespace Drupal\Tests\views\Functional;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Url;
use Drupal\views\Tests\AssertViewsCacheTagsTrait;
use Drupal\views\Views;
/**
......@@ -97,8 +98,8 @@ public function testGlossaryView() {
'user_list',
'http_response',
'rendered',
// FinishResponseSubscriber adds this cache tag to responses that have the
// 'user.permissions' cache context for anonymous users.
// FinishResponseSubscriber adds this cache tag to responses that have
// the 'user.permissions' cache context for anonymous users.
'config:user.role.anonymous',
]
);
......@@ -113,8 +114,9 @@ public function testGlossaryView() {
// to ensure that both of them are correct.
$result = $this->xpath('//a[contains(@href, :href) and normalize-space(text())=:label]/..', [':href' => $href, ':label' => $label]);
$this->assertTrue(count($result));
// The rendered output looks like "| (count)" so let's figure out the int.
$result_count = trim(str_replace(['|', '(', ')'], '', (string) $result[0]));
// The rendered output looks like "<a href=''>X</a> | (count)" so let's
// figure out the int.
$result_count = explode(' ', trim(str_replace(['|', '(', ')'], '', $result[0]->getText())))[1];
$this->assertEqual($result_count, $count, 'The expected number got rendered.');
}
}
......
core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php → core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
/**
......@@ -10,7 +11,7 @@
* @group views
* @see \Drupal\views\Plugin\views\area\HTTPStatusCode
*/
class AreaHTTPStatusCodeTest extends HandlerTestBase {
class AreaHTTPStatusCodeTest extends ViewTestBase {
/**
* Views used by this test.
......
core/modules/views/src/Tests/Handler/AreaTest.php → core/modules/views/tests/src/Functional/Handler/AreaTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Component\Utility\Xss;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
/**
......@@ -12,7 +13,7 @@
* @see \Drupal\views\Plugin\views\area\AreaPluginBase
* @see \Drupal\views_test\Plugin\views\area\TestExample
*/
class AreaTest extends HandlerTestBase {
class AreaTest extends ViewTestBase {
/**
* Views used by this test.
......@@ -28,8 +29,8 @@ class AreaTest extends HandlerTestBase {
*/
public static $modules = ['node', 'views_ui'];
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
$this->enableViewsTestModule();
}
......@@ -110,41 +111,6 @@ public function testRenderArea() {
$this->assertTrue(strpos($output, '<script') === FALSE, 'Script tags were escaped');
}
/**
* Tests that the header and footer areas are not rendered if empty.
*/
public function testRenderEmptyHeaderFooter() {
$view = Views::getView('test_example_area');
$view->initHandlers();
// Set example empty text.
$view->empty['test_example']->options['string'] = '<p>' . $this->randomMachineName() . '</p>';
$xpath = '//div[contains(@class, :class)]';
// Verify that the empty header and footer sections have not been rendered.
$output = $view->preview();
$html = $this->container->get('renderer')->renderRoot($output);
$this->setRawContent($html);
$this->assertEqual(0, count($this->xpath($xpath, [':class' => 'view-header'])));
$this->assertEqual(0, count($this->xpath($xpath, [':class' => 'view-footer'])));
// Set example header text.
$view->header['test_example']->options['string'] = '<p>' . $this->randomMachineName() . '</p>';
$view->header['test_example']->options['empty'] = TRUE;
// Set example footer text.
$view->footer['test_example']->options['string'] = '<p>' . $this->randomMachineName() . '</p>';
$view->footer['test_example']->options['empty'] = TRUE;
// Verify that the header and footer sections have been rendered.
$output = $view->preview();
$html = $this->container->get('renderer')->renderRoot($output);
$this->setRawContent($html);
$this->assertEqual(1, count($this->xpath($xpath, [':class' => 'view-header'])));
$this->assertEqual(1, count($this->xpath($xpath, [':class' => 'view-footer'])));
}
/**
* Tests the access for an area.
*/
......
core/modules/views/src/Tests/Handler/AreaTitleWebTest.php → core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Entity\View;
use Drupal\views\Tests\ViewTestBase;
/**
* Tests the title area handler with a web test.
......@@ -23,8 +23,8 @@ class AreaTitleWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
$this->enableViewsTestModule();
}
......
core/modules/views/src/Tests/Handler/ArgumentStringTest.php → core/modules/views/tests/src/Functional/Handler/ArgumentStringTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
/**
......@@ -9,7 +10,7 @@
*
* @group views
*/
class ArgumentStringTest extends HandlerTestBase {
class ArgumentStringTest extends ViewTestBase {
/**
* Views used by this test.
......
core/modules/views/src/Tests/Handler/FieldDropButtonTest.php → core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Tests\views\Functional\ViewTestBase;
/**
* Tests the dropbutton field handler.
......@@ -8,7 +10,7 @@
* @group views
* @see \Drupal\system\Plugin\views\field\Dropbutton
*/
class FieldDropButtonTest extends HandlerTestBase {
class FieldDropButtonTest extends ViewTestBase {
/**
* Views used by this test.
......@@ -27,8 +29,8 @@ class FieldDropButtonTest extends HandlerTestBase {
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
$admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access']);
$this->drupalLogin($admin_user);
......@@ -48,7 +50,7 @@ public function testDropbutton() {
foreach ($nodes as $node) {
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => $node->label()]);
$this->assertEqual(count($result), 1, 'Just one node title link was found.');
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => t('Custom Text')]);
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => 'Custom Text']);
$this->assertEqual(count($result), 1, 'Just one custom link was found.');
}
......
core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php → core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Core\Url;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\Node;
use Drupal\Tests\views\Functional\ViewTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\EntityOperations handler.
*
* @group views
*/
class FieldEntityOperationsTest extends HandlerTestBase {
class FieldEntityOperationsTest extends ViewTestBase {
/**
* Views used by this test.
......@@ -27,8 +28,8 @@ class FieldEntityOperationsTest extends HandlerTestBase {
*/
public static $modules = ['node', 'language', 'views_ui'];
public function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Create Article content type.
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
......@@ -72,7 +73,7 @@ public function testEntityOperations() {
$this->assertTrue(count($operations) > 0, 'There are operations.');
foreach ($operations as $operation) {
$expected_destination = Url::fromUri('internal:/test-entity-operations')->toString();
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[@href=:path and text()=:title]', [':path' => $operation['url']->toString() . '?destination=' . $expected_destination, ':title' => $operation['title']]);
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[@href=:path and text()=:title]', [':path' => $operation['url']->toString() . '?destination=' . $expected_destination, ':title' => (string) $operation['title']]);
$this->assertEqual(count($result), 1, t('Found entity @operation link with destination parameter.', ['@operation' => $operation['title']]));
// Entities which were created in Hungarian should link to the Hungarian
// edit form, others to the English one (which has no path prefix here).
......
core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php → core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Render\RenderContext;
use Drupal\field\Entity\FieldConfig;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
use Drupal\field\Entity\FieldStorageConfig;
......@@ -15,7 +16,7 @@
*
* @group views
*/
class FieldGroupRowsTest extends HandlerTestBase {
class FieldGroupRowsTest extends ViewTestBase {
/**
* Views used by this test.
......@@ -38,8 +39,8 @@ class FieldGroupRowsTest extends HandlerTestBase {
*/
private $fieldName = 'field_group_rows';
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Create content type with unlimited text field.
$node_type = $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
......
core/modules/views/src/Tests/Handler/FieldGroupRowsWebTest.php → core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\views\Tests\ViewTestBase;
use Drupal\Tests\views\Functional\ViewTestBase;
/**
* Tests the "Display all values in the same row" setting.
......@@ -59,8 +59,8 @@ class FieldGroupRowsWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Create content type with unlimited text field.
$this->nodeType = $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
......@@ -98,7 +98,7 @@ public function testGroupRows() {
$rendered_value = [];
foreach ($result as $row) {
$rendered_value[] = (string) $row[0];
$rendered_value[] = $row->getText();
}
$this->assertEqual(['a, b, c'], $rendered_value);
}
......@@ -111,7 +111,7 @@ public function testUngroupedRows() {
$result = $this->cssSelect('div.views-field-field-views-testing-group- div');
$rendered_value = [];
foreach ($result as $row) {
$rendered_value[] = (string) $row[0];
$rendered_value[] = $row->getText();
}
$this->assertEqual(['a', 'b', 'c'], $rendered_value);
}
......
core/modules/views/src/Tests/Handler/FieldWebTest.php → core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Unicode;
......@@ -8,6 +8,7 @@
use Drupal\Core\Render\RenderContext;
use Drupal\Core\Url;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
/**
......@@ -16,7 +17,7 @@
* @group views
* @see \Drupal\views\Plugin\views\field\FieldPluginBase
*/
class FieldWebTest extends HandlerTestBase {
class FieldWebTest extends ViewTestBase {
use AssertPageCacheContextsAndTagsTrait;
......@@ -41,8 +42,8 @@ class FieldWebTest extends HandlerTestBase {
'views_test_data_name' => 'name',
];
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
$this->enableViewsTestModule();
}
......@@ -99,7 +100,7 @@ protected function clickSortLoadIdsFromOutput() {
$fields = $this->xpath("//td[contains(@class, 'views-field-id')]");
$ids = [];
foreach ($fields as $field) {
$ids[] = (int) $field[0];
$ids[] = (int) $field->getText();
}
return $ids;
}
......
core/modules/views/src/Tests/Handler/FilterDateTest.php → core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
View file @ 6b6ddee8
<?php
namespace Drupal\views\Tests\Handler;
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
/**
......@@ -13,7 +14,7 @@
*
* @group views
*/
class FilterDateTest extends HandlerTestBase {
class FilterDateTest extends ViewTestBase {
use SchemaCheckTestTrait;
/**
......@@ -30,8 +31,8 @@ class FilterDateTest extends HandlerTestBase {
*/
public static $modules = ['node', 'views_ui', 'datetime'];
protected function setUp() {
parent::setUp();
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Add a date field so we can test datetime handling.
NodeType::create([
......@@ -213,7 +214,7 @@ protected function _testFilterDateUI() {
$this->assertFieldByName($name, $value);
if (strpos($name, '[value][type]')) {
$radio = $this->cssSelect('input[name="' . $name . '"][checked="checked"][type="radio"]');
$this->assertEqual((string) $radio[0]['value'], $value);
$this->assertEqual($radio[0]->getAttribute('value'), $value);
}
}
......@@ -221,22 +222,27 @@ protected function _testFilterDateUI() {
$this->assertConfigSchemaByName('views.view.test_filter_date_between');
// Test that the exposed filter works as expected.
$this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
$this->drupalPostForm(NULL, [], t('Update preview'));
$path = 'test_filter_date_between-path';
$this->drupalPostForm('admin/structure/views/view/test_filter_date_between/edit', [], 'Add Page');
$this->drupalPostForm('admin/structure/views/nojs/display/test_filter_date_between/page_1/path', ['path' => $path], 'Apply');
$this->drupalPostForm(NULL, [], t('Save'));
$this->drupalGet($path);
$this->drupalPostForm(NULL, [], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 4);
$this->drupalPostForm(NULL, ['created' => '1'], t('Update preview'));
$this->drupalPostForm(NULL, ['created' => '1'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 1);
$this->assertEqual((string) $results[0], $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '2'], t('Update preview'));
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '2'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 1);
$this->assertEqual((string) $results[0], $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '3'], t('Update preview'));
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '3'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 1);
$this->assertEqual((string) $results[0], $this->nodes[1]->id());
$this->assertEqual($results[0]->getText(), $this->nodes[1]->id());
// Change the filter to a single filter to test the schema when the operator
// is not exposed.
......@@ -250,15 +256,15 @@ protected function _testFilterDateUI() {
$this->assertConfigSchemaByName('views.view.test_filter_date_between');
// Test that the filter works as expected.
$this->drupalPostForm(NULL, [], t('Update preview'));
$this->drupalGet($path);
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 1);
$this->assertEqual((string) $results[0], $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => format_date(250000, 'custom', 'Y-m-d H:i:s')], t('Update preview'));
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => format_date(250000, 'custom', 'Y-m-d H:i:s')], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
$this->assertEqual(count($results), 2);
$this->assertEqual((string) $results[0], $this->nodes[2]->id());
$this->assertEqual((string) $results[1], $this->nodes[3]->id());
$this->assertEqual($results[0]->getText(), $this->nodes[2]->id());
$this->assertEqual($results[1]->getText(), $this->nodes[3]->id());
}
/**
......