diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-02-05 21:44:35 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-02-05 21:44:35 +0000 |
commit | 2acf463dfed135050f54eab64884e27efdf7507d (patch) | |
tree | 4a7296720721bc6acb7b8b5535c80f7daf5689a0 /modules/filter/filter.test | |
parent | 03d9f68161904f82165b196935a00eac6ad57f83 (diff) | |
download | brdo-2acf463dfed135050f54eab64884e27efdf7507d.tar.gz brdo-2acf463dfed135050f54eab64884e27efdf7507d.tar.bz2 |
- Patch #674626 by asimmonds: fixed text format filter list not being ordered correctly.
Diffstat (limited to 'modules/filter/filter.test')
-rw-r--r-- | modules/filter/filter.test | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/filter/filter.test b/modules/filter/filter.test index a15c26838..64d3cb514 100644 --- a/modules/filter/filter.test +++ b/modules/filter/filter.test @@ -231,6 +231,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { $result = db_query('SELECT * FROM {cache_filter}')->fetchObject(); $this->assertFalse($result, t('Cache cleared.')); + $elements = $this->xpath('//select[@name="filters[' . $first_filter . '][weight]"]/following::select[@name="filters[' . $second_filter . '][weight]"]'); + $this->assertTrue(!empty($elements), t('Order confirmed in admin interface.')); + // Reorder filters. $edit = array(); $edit['filters[' . $second_filter . '][weight]'] = 1; @@ -239,6 +242,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { $this->assertFieldByName('filters[' . $second_filter . '][weight]', 1, t('Order saved successfully.')); $this->assertFieldByName('filters[' . $first_filter . '][weight]', 2, t('Order saved successfully.')); + $elements = $this->xpath('//select[@name="filters[' . $second_filter . '][weight]"]/following::select[@name="filters[' . $first_filter . '][weight]"]'); + $this->assertTrue(!empty($elements), t('Reorder confirmed in admin interface.')); + $result = db_query('SELECT * FROM {filter} WHERE format = :format ORDER BY weight ASC', array(':format' => $filtered)); $filters = array(); foreach ($result as $filter) { @@ -246,7 +252,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { $filters[] = $filter; } } - $this->assertTrue(($filters[0]->name == $second_filter && $filters[1]->name == $first_filter), t('Order confirmed.')); + $this->assertTrue(($filters[0]->name == $second_filter && $filters[1]->name == $first_filter), t('Order confirmed in database.')); // Add format. $edit = array(); |