diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
| commit | c9de4646c570a45de03d6e7ec470daf01a8d2cab (patch) | |
| tree | 5d8781ec52d1cf25c5ca1a842d2a7a65bf0f7e95 /modules | |
| parent | 4bd74a00668557ce827e4c51d7c278548518aaf8 (diff) | |
| download | brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.gz brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.bz2 | |
- Patch #907690 by sun, pwolanin: breadcrumbs don't work for dynamic paths and local tasks #2.
Diffstat (limited to 'modules')
41 files changed, 777 insertions, 135 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index d9afbe66f..4d70102cc 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -134,7 +134,6 @@ function aggregator_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_admin_remove_feed', 5), 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, 'file' => 'aggregator.admin.inc', ); $items['admin/config/services/aggregator/update/%aggregator_feed'] = array( @@ -142,7 +141,6 @@ function aggregator_menu() { 'page callback' => 'aggregator_admin_refresh_feed', 'page arguments' => array(5), 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, 'file' => 'aggregator.admin.inc', ); $items['admin/config/services/aggregator/list'] = array( @@ -227,7 +225,6 @@ function aggregator_menu() { 'page callback' => 'aggregator_page_source', 'page arguments' => array(2), 'access arguments' => array('access news feeds'), - 'type' => MENU_CALLBACK, 'file' => 'aggregator.pages.inc', ); $items['aggregator/sources/%aggregator_feed/view'] = array( @@ -257,7 +254,6 @@ function aggregator_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_feed', 6), 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, 'file' => 'aggregator.admin.inc', ); $items['admin/config/services/aggregator/edit/category/%aggregator_category'] = array( @@ -265,7 +261,6 @@ function aggregator_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_category', 6), 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, 'file' => 'aggregator.admin.inc', ); diff --git a/modules/book/book.module b/modules/book/book.module index 053a14a06..7fd4ce57c 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -182,7 +182,6 @@ function book_menu() { 'access callback' => '_book_outline_remove_access', 'access arguments' => array(1), 'theme callback' => '_node_custom_theme', - 'type' => MENU_CALLBACK, 'file' => 'book.pages.inc', ); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index fd46cd7c0..5e4c34a99 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -241,7 +241,6 @@ function comment_menu() { 'page callback' => 'comment_permalink', 'page arguments' => array(1), 'access arguments' => array('access comments'), - 'type' => MENU_CALLBACK, ); $items['comment/%/view'] = array( 'title' => 'View comment', @@ -264,7 +263,6 @@ function comment_menu() { 'page callback' => 'comment_approve', 'page arguments' => array(1), 'access arguments' => array('administer comments'), - 'type' => MENU_CALLBACK, 'file' => 'comment.pages.inc', 'weight' => 1, ); @@ -283,7 +281,6 @@ function comment_menu() { 'page arguments' => array(2), 'access callback' => 'node_access', 'access arguments' => array('view', 2), - 'type' => MENU_CALLBACK, 'file' => 'comment.pages.inc', ); diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 06103eae2..fc66f0519 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -77,7 +77,6 @@ function contact_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_category_edit_form', 4), 'access arguments' => array('administer contact forms'), - 'type' => MENU_CALLBACK, 'file' => 'contact.admin.inc', ); $items['admin/structure/contact/delete/%contact'] = array( @@ -85,7 +84,6 @@ function contact_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_category_delete_form', 4), 'access arguments' => array('administer contact forms'), - 'type' => MENU_CALLBACK, 'file' => 'contact.admin.inc', ); $items['contact'] = array( diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module index b1266ef88..8cf5a7e59 100644 --- a/modules/dashboard/dashboard.module +++ b/modules/dashboard/dashboard.module @@ -53,7 +53,6 @@ function dashboard_menu() { 'page callback' => 'dashboard_admin', 'page arguments' => array(TRUE), 'access arguments' => array('access dashboard'), - 'type' => MENU_CALLBACK, ); $items['admin/dashboard/drawer'] = array( 'page callback' => 'dashboard_show_disabled', diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index 0d149ec35..dac5387c4 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -67,7 +67,6 @@ function dblog_menu() { 'page callback' => 'dblog_event', 'page arguments' => array(3), 'access arguments' => array('access site reports'), - 'type' => MENU_CALLBACK, 'file' => 'dblog.admin.inc', ); diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test index 5fa444b66..cd85e6579 100644 --- a/modules/field/modules/options/options.test +++ b/modules/field/modules/options/options.test @@ -77,7 +77,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_test_entity_save($entity); // With no field data, no buttons are checked. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoFieldChecked("edit-card-1-$langcode-0"); $this->assertNoFieldChecked("edit-card-1-$langcode-1"); $this->assertNoFieldChecked("edit-card-1-$langcode-2"); @@ -89,7 +89,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0)); // Check that the selected button is checked. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-card-1-$langcode-0"); $this->assertNoFieldChecked("edit-card-1-$langcode-1"); $this->assertNoFieldChecked("edit-card-1-$langcode-2"); @@ -104,7 +104,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_update_field($this->card_1); $instance['required'] = TRUE; field_update_instance($instance); - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-card-1-$langcode-99"); } @@ -134,7 +134,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_test_entity_save($entity); // Display form: with no field data, nothing is checked. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertNoFieldChecked("edit-card-2-$langcode-2"); @@ -150,7 +150,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0, 2)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertFieldChecked("edit-card-2-$langcode-2"); @@ -165,7 +165,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-card-2-$langcode-0"); $this->assertNoFieldChecked("edit-card-2-$langcode-1"); $this->assertNoFieldChecked("edit-card-2-$langcode-2"); @@ -194,7 +194,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_update_field($this->card_2); $instance['required'] = TRUE; field_update_instance($instance); - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-card-2-$langcode-99"); } @@ -222,7 +222,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_test_entity_save($entity); // Display form. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); // A required field without any value has a "none" option. $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1-' . $langcode, ':label' => t('- Select a value -'))), t('A required select list has a "Select a value" choice.')); @@ -244,7 +244,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); // A required field with a value has no 'none' option. $this->assertFalse($this->xpath('//select[@id=:id]//option[@value="_none"]', array(':id' => 'edit-card-1-' . $langcode)), t('A required select list with an actual value has no "none" choice.')); $this->assertOptionSelected("edit-card-1-$langcode", 0); @@ -256,12 +256,12 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_update_instance($instance); // Display form. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); // A non-required field has a 'none' option. $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1-' . $langcode, ':label' => t('- None -'))), t('A non-required select list has a "None" choice.')); // Submit form: Unselect the option. $edit = array("card_1[$langcode]" => '_none'); - $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save')); $this->assertFieldValues($entity_init, 'card_1', $langcode, array()); // Test optgroups. @@ -271,7 +271,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_update_field($this->card_1); // Display form: with no field data, nothing is selected - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoOptionSelected("edit-card-1-$langcode", 0); $this->assertNoOptionSelected("edit-card-1-$langcode", 1); $this->assertNoOptionSelected("edit-card-1-$langcode", 2); @@ -284,14 +284,14 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertOptionSelected("edit-card-1-$langcode", 0); $this->assertNoOptionSelected("edit-card-1-$langcode", 1); $this->assertNoOptionSelected("edit-card-1-$langcode", 2); // Submit form: Unselect the option. $edit = array("card_1[$langcode]" => '_none'); - $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save')); $this->assertFieldValues($entity_init, 'card_1', $langcode, array()); } @@ -318,7 +318,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_test_entity_save($entity); // Display form: with no field data, nothing is selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoOptionSelected("edit-card-2-$langcode", 0); $this->assertNoOptionSelected("edit-card-2-$langcode", 1); $this->assertNoOptionSelected("edit-card-2-$langcode", 2); @@ -330,7 +330,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0, 2)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertOptionSelected("edit-card-2-$langcode", 0); $this->assertNoOptionSelected("edit-card-2-$langcode", 1); $this->assertOptionSelected("edit-card-2-$langcode", 2); @@ -341,7 +341,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertOptionSelected("edit-card-2-$langcode", 0); $this->assertNoOptionSelected("edit-card-2-$langcode", 1); $this->assertNoOptionSelected("edit-card-2-$langcode", 2); @@ -361,18 +361,18 @@ class OptionsWidgetsTestCase extends FieldTestCase { // Check that the 'none' option has no efect if actual options are selected // as well. $edit = array("card_2[$langcode][]" => array('_none' => '_none', 0 => 0)); - $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save')); $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0)); // Check that selecting the 'none' option empties the field. $edit = array("card_2[$langcode][]" => array('_none' => '_none')); - $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save')); $this->assertFieldValues($entity_init, 'card_2', $langcode, array()); // A required select list does not have an empty key. $instance['required'] = TRUE; field_update_instance($instance); - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFalse($this->xpath('//select[@id=:id]//option[@value=""]', array(':id' => 'edit-card-2-' . $langcode)), t('A required select list does not have an empty key.')); // We do not have to test that a required select list with one option is @@ -388,7 +388,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_update_instance($instance); // Display form: with no field data, nothing is selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoOptionSelected("edit-card-2-$langcode", 0); $this->assertNoOptionSelected("edit-card-2-$langcode", 1); $this->assertNoOptionSelected("edit-card-2-$langcode", 2); @@ -401,14 +401,14 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertOptionSelected("edit-card-2-$langcode", 0); $this->assertNoOptionSelected("edit-card-2-$langcode", 1); $this->assertNoOptionSelected("edit-card-2-$langcode", 2); // Submit form: Unselect the option. $edit = array("card_2[$langcode][]" => array('_none' => '_none')); - $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $entity->ftid . '/edit', $edit, t('Save')); $this->assertFieldValues($entity_init, 'card_2', $langcode, array()); } @@ -435,7 +435,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { field_test_entity_save($entity); // Display form: with no field data, option is unchecked. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoFieldChecked("edit-bool-$langcode"); $this->assertRaw('Some dangerous & unescaped <strong>markup</strong>', t('Option text was properly filtered.')); @@ -445,7 +445,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'bool', $langcode, array(0)); // Display form: check that the right options are selected. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertFieldChecked("edit-bool-$langcode"); // Submit form: uncheck the option. @@ -454,7 +454,7 @@ class OptionsWidgetsTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, 'bool', $langcode, array(1)); // Display form: with 'off' value, option is unchecked. - $this->drupalGet('test-entity/' . $entity->ftid .'/edit'); + $this->drupalGet('test-entity/manage/' . $entity->ftid . '/edit'); $this->assertNoFieldChecked("edit-bool-$langcode"); } } diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test index 9256277d9..bfc9156e5 100644 --- a/modules/field/modules/text/text.test +++ b/modules/field/modules/text/text.test @@ -115,7 +115,7 @@ class TextFieldTestCase extends DrupalWebTestCase { "{$this->field_name}[$langcode][0][value]" => $value, ); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created')); @@ -184,7 +184,7 @@ class TextFieldTestCase extends DrupalWebTestCase { "{$this->field_name}[$langcode][0][value]" => $value, ); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created')); @@ -210,7 +210,7 @@ class TextFieldTestCase extends DrupalWebTestCase { // Display edition form. // We should now have a 'text format' selector. - $this->drupalGet('test-entity/' . $id . '/edit'); + $this->drupalGet('test-entity/manage/' . $id . '/edit'); $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', t('Widget is displayed')); $this->assertFieldByName("{$this->field_name}[$langcode][0][format]", '', t('Format selector is displayed')); diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index e865ac22d..43b6fe5bd 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -1259,14 +1259,14 @@ class FieldFormTestCase extends FieldTestCase { $value = mt_rand(1, 127); $edit = array("{$this->field_name}[$langcode][0][value]" => $value); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); $entity = field_test_entity_test_load($id); $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was saved'); // Display edit form. - $this->drupalGet('test-entity/' . $id . '/edit'); + $this->drupalGet('test-entity/manage/' . $id . '/edit'); $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", $value, 'Widget is displayed with the correct default value'); $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed'); @@ -1281,7 +1281,7 @@ class FieldFormTestCase extends FieldTestCase { // Empty the field. $value = ''; $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost('test-entity/' . $id . '/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); $entity = field_test_entity_test_load($id); $this->assertIdentical($entity->{$this->field_name}, array(), 'Field was emptied'); @@ -1306,7 +1306,7 @@ class FieldFormTestCase extends FieldTestCase { $value = mt_rand(1, 127); $edit = array("{$this->field_name}[$langcode][0][value]" => $value); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); $entity = field_test_entity_test_load($id); @@ -1315,7 +1315,7 @@ class FieldFormTestCase extends FieldTestCase { // Edit with missing required value. $value = ''; $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost('test-entity/' . $id . '/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation'); } @@ -1384,7 +1384,7 @@ class FieldFormTestCase extends FieldTestCase { // Submit the form and create the entity. $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); $entity = field_test_entity_test_load($id); @@ -1474,7 +1474,7 @@ class FieldFormTestCase extends FieldTestCase { // Create entity with three values. $edit = array("{$this->field_name}[$langcode]" => '1, 2, 3'); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; // Check that the values were saved. @@ -1482,7 +1482,7 @@ class FieldFormTestCase extends FieldTestCase { $this->assertFieldValues($entity_init, $this->field_name, $langcode, array(1, 2, 3)); // Display the form, check that the values are correctly filled in. - $this->drupalGet('test-entity/' . $id . '/edit'); + $this->drupalGet('test-entity/manage/' . $id . '/edit'); $this->assertFieldByName("{$this->field_name}[$langcode]", '1, 2, 3', t('Widget is displayed.')); // Submit the form with more values than the field accepts. @@ -1529,7 +1529,7 @@ class FieldFormTestCase extends FieldTestCase { // Create entity. $edit = array("{$field_name}[$langcode][0][value]" => 1); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; // Check that the default value was saved. @@ -1539,7 +1539,7 @@ class FieldFormTestCase extends FieldTestCase { // Create a new revision. $edit = array("{$field_name}[$langcode][0][value]" => 2, 'revision' => TRUE); - $this->drupalPost('test-entity/' . $id . '/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); // Check that the new revision has the expected values. $entity = field_test_entity_test_load($id); @@ -2721,7 +2721,7 @@ class FieldTranslationsTestCase extends FieldTestCase { // Create a new revision. $langcode = field_valid_language(NULL); $edit = array("{$field_name}[$langcode][0][value]" => $entity->{$field_name}[$langcode][0]['value'], 'revision' => TRUE); - $this->drupalPost('test-entity/' . $eid . '/edit', $edit, t('Save')); + $this->drupalPost('test-entity/manage/' . $eid . '/edit', $edit, t('Save')); // Check translation revisions. $this->checkTranslationRevisions($eid, $eid, $available_languages); diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc index 149c09a2c..353bb3de0 100644 --- a/modules/field/tests/field_test.entity.inc +++ b/modules/field/tests/field_test.entity.inc @@ -392,7 +392,7 @@ function field_test_entity_form_submit($form, &$form_state) { drupal_set_message($message); if ($entity->ftid) { - $form_state['redirect'] = 'test-entity/' . $entity->ftid . '/edit'; + $form_state['redirect'] = 'test-entity/manage/' . $entity->ftid . '/edit'; } else { // Error on save. diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module index 5adc3a4c1..3767a8014 100644 --- a/modules/field/tests/field_test.module +++ b/modules/field/tests/field_test.module @@ -52,10 +52,10 @@ function field_test_menu() { 'type' => MENU_NORMAL_ITEM, ); } - $items['test-entity/%field_test_entity_test/edit'] = array( + $items['test-entity/manage/%field_test_entity_test/edit'] = array( 'title' => 'Edit test entity', 'page callback' => 'field_test_entity_edit', - 'page arguments' => array(1), + 'page arguments' => array(2), 'access arguments' => array('administer field_test content'), 'type' => MENU_NORMAL_ITEM, ); diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module index 8ce1cdd14..cb4831f42 100644 --- a/modules/field_ui/field_ui.module +++ b/modules/field_ui/field_ui.module @@ -114,7 +114,6 @@ function field_ui_menu() { 'title arguments' => array($field_position), 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_edit_form', $field_position), - 'type' => MENU_LOCAL_TASK, 'file' => 'field_ui.admin.inc', ) + $access; $items["$path/fields/%field_ui_menu/edit"] = array( diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 85fb20fec..d726699c6 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -114,7 +114,6 @@ function filter_menu() { 'file' => 'filter.admin.inc', ); $items['admin/config/content/formats/%filter_format'] = array( - 'type' => MENU_CALLBACK, 'title callback' => 'filter_admin_format_title', 'title arguments' => array(4), 'page callback' => 'filter_admin_format_page', @@ -128,7 +127,6 @@ function filter_menu() { 'page arguments' => array('filter_admin_disable', 4), 'access callback' => '_filter_disable_format_access', 'access arguments' => array(4), - 'type' => MENU_CALLBACK, 'file' => 'filter.admin.inc', ); return $items; diff --git a/modules/forum/forum.module b/modules/forum/forum.module index a0e8b4c97..ed7129c81 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -147,7 +147,6 @@ function forum_menu() { 'page callback' => 'forum_form_main', 'page arguments' => array('container', 5), 'access arguments' => array('administer forums'), - 'type' => MENU_CALLBACK, 'file' => 'forum.admin.inc', ); $items['admin/structure/forum/edit/forum/%taxonomy_term'] = array( @@ -155,7 +154,6 @@ function forum_menu() { 'page callback' => 'forum_form_main', 'page arguments' => array('forum', 5), 'access arguments' => array('administer forums'), - 'type' => MENU_CALLBACK, 'file' => 'forum.admin.inc', ); return $items; diff --git a/modules/forum/forum.test b/modules/forum/forum.test index 786913ace..110dc3267 100644 --- a/modules/forum/forum.test +++ b/modules/forum/forum.test @@ -25,9 +25,25 @@ class ForumTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('taxonomy', 'comment', 'forum'); // Create users. - $this->admin_user = $this->drupalCreateUser(array('administer blocks', 'administer forums', 'administer menu', 'administer taxonomy', 'create forum content')); // 'access administration pages')); - $this->edit_any_topics_user = $this->drupalCreateUser(array('create forum content', 'edit any forum content', 'delete any forum content', 'access administration pages')); - $this->edit_own_topics_user = $this->drupalCreateUser(array('create forum content', 'edit own forum content', 'delete own forum content')); + $this->admin_user = $this->drupalCreateUser(array( + 'access administration pages', + 'administer blocks', + 'administer forums', + 'administer menu', + 'administer taxonomy', + 'create forum content', + )); + $this->edit_any_topics_user = $this->drupalCreateUser(array( + 'access administration pages', + 'create forum content', + 'edit any forum content', + 'delete any forum content', + )); + $this->edit_own_topics_user = $this->drupalCreateUser(array( + 'create forum content', + 'edit own forum content', + 'delete own forum content', + )); $this->web_user = $this->drupalCreateUser(array()); } diff --git a/modules/help/help.module b/modules/help/help.module index 18357b4b4..2c964d7bf 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -25,7 +25,6 @@ function help_menu() { 'page callback' => 'help_page', 'page arguments' => array(2), 'access arguments' => array('access administration pages'), - 'type' => MENU_CALLBACK, 'file' => 'help.admin.inc', ); } diff --git a/modules/image/image.module b/modules/image/image.module index 36807a8e5..ccf21c73a 100644 --- a/modules/image/image.module +++ b/modules/image/image.module @@ -125,7 +125,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_form', 5), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); $items['admin/config/media/image-styles/delete/%image_style'] = array( @@ -135,7 +134,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_delete_form', 5), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); $items['admin/config/media/image-styles/revert/%image_style'] = array( @@ -145,7 +143,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_revert_form', 5), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array( @@ -155,7 +152,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( @@ -165,7 +161,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_delete_form', 5, 7), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array( @@ -175,7 +170,6 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), - 'type' => MENU_CALLBACK, 'file' => 'image.admin.inc', ); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 1f42abc6c..417528628 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -150,7 +150,6 @@ function locale_menu() { 'page arguments' => array('locale_languages_edit_form', 5), 'access arguments' => array('administer languages'), 'file' => 'locale.admin.inc', - 'type' => MENU_CALLBACK, ); $items['admin/config/regional/language/delete/%'] = array( 'title' => 'Confirm', @@ -158,7 +157,6 @@ function locale_menu() { 'page arguments' => array('locale_languages_delete_form', 5), 'access arguments' => array('administer languages'), 'file' => 'locale.admin.inc', - 'type' => MENU_CALLBACK, ); // Translation functionality @@ -205,7 +203,6 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_translate_edit_form', 5), 'access arguments' => array('translate interface'), - 'type' => MENU_CALLBACK, 'file' => 'locale.admin.inc', ); $items['admin/config/regional/translate/delete/%'] = array( @@ -213,7 +210,6 @@ function locale_menu() { 'page callback' => 'locale_translate_delete_page', 'page arguments' => array(5), 'access arguments' => array('translate interface'), - 'type' => MENU_CALLBACK, 'file' => 'locale.admin.inc', ); @@ -233,7 +229,6 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_date_format_form', 5), 'access arguments' => array('administer site configuration'), - 'type' => MENU_CALLBACK, 'file' => 'locale.admin.inc', ); $items['admin/config/regional/date-time/locale/%/reset'] = array( @@ -242,7 +237,6 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_date_format_reset_form', 5), 'access arguments' => array('administer site configuration'), - 'type' => MENU_CALLBACK, 'file' => 'locale.admin.inc', ); diff --git a/modules/menu/menu.module b/modules/menu/menu.module index fc7a655b8..ded4bd21c 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -95,7 +95,6 @@ function menu_menu() { 'title callback' => 'menu_overview_title', 'title arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/manage/%menu/list'] = array( @@ -126,7 +125,6 @@ function menu_menu() { 'page callback' => 'menu_delete_menu_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/edit'] = array( @@ -134,7 +132,6 @@ function menu_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_edit_item', 'edit', 4, NULL), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/reset'] = array( @@ -142,7 +139,6 @@ function menu_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_reset_item_confirm', 4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/delete'] = array( @@ -150,7 +146,6 @@ function menu_menu() { 'page callback' => 'menu_item_delete_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); return $items; @@ -707,7 +702,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_options'] = array( '#type' => 'checkboxes', '#title' => t('Available menus'), - '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu' => 'main-menu')), + '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu')), '#options' => $menu_options, '#description' => t('The menus available to place links in for this content type.'), ); diff --git a/modules/menu/menu.test b/modules/menu/menu.test index 1fa76f188..2c5900181 100644 --- a/modules/menu/menu.test +++ b/modules/menu/menu.test @@ -112,14 +112,14 @@ class MenuTestCase extends DrupalWebTestCase { // Assert the new menu. $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertText($title, t('Custom menu was added.')); + $this->assertRaw($title, t('Custom menu was added.')); // Edit the menu. $new_title = $this->randomName(16); $menu['title'] = $new_title; menu_save($menu); $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertText($new_title, t('Custom menu was edited.')); + $this->assertRaw($new_title, t('Custom menu was edited.')); } /** diff --git a/modules/node/node.module b/modules/node/node.module index 4e94f5de9..b491e7469 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1844,12 +1844,10 @@ function node_menu() { 'title' => 'Delete', 'page arguments' => array('node_type_delete_confirm', 4), 'access arguments' => array('administer content types'), - 'type' => MENU_CALLBACK, 'file' => 'content_types.inc', ); $items['node'] = array( - 'title' => 'Content', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, @@ -1895,7 +1893,6 @@ function node_menu() { 'page arguments' => array(1), 'access callback' => 'node_access', 'access arguments' => array('view', 1), - 'type' => MENU_CALLBACK, ); $items['node/%node/view'] = array( 'title' => 'View', @@ -1943,7 +1940,6 @@ function node_menu() { 'page arguments' => array(1, TRUE), 'access callback' => '_node_revision_access', 'access arguments' => array(1), - 'type' => MENU_CALLBACK, ); $items['node/%node/revisions/%/revert'] = array( 'title' => 'Revert to earlier revision', @@ -1952,7 +1948,6 @@ function node_menu() { 'page arguments' => array('node_revision_revert_confirm', 1), 'access callback' => '_node_revision_access', 'access arguments' => array(1, 'update'), - 'type' => MENU_CALLBACK, 'file' => 'node.pages.inc', ); $items['node/%node/revisions/%/delete'] = array( @@ -1962,7 +1957,6 @@ function node_menu() { 'page arguments' => array('node_revision_delete_confirm', 1), 'access callback' => '_node_revision_access', 'access arguments' => array(1, 'delete'), - 'type' => MENU_CALLBACK, 'file' => 'node.pages.inc', ); return $items; diff --git a/modules/openid/openid.module b/modules/openid/openid.module index 3412db45d..7e7ebfd05 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -32,7 +32,6 @@ function openid_menu() { 'page arguments' => array('openid_user_delete_form', 1), 'access callback' => 'user_edit_access', 'access arguments' => array(1), - 'type' => MENU_CALLBACK, 'file' => 'openid.pages.inc', ); return $items; diff --git a/modules/path/path.module b/modules/path/path.module index e0766f9e1..0e5874357 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -66,7 +66,6 @@ function path_menu() { 'page callback' => 'path_admin_edit', 'page arguments' => array(5), 'access arguments' => array('administer url aliases'), - 'type' => MENU_CALLBACK, 'file' => 'path.admin.inc', ); $items['admin/config/search/path/delete/%path'] = array( @@ -74,7 +73,6 @@ function path_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('path_admin_delete_confirm', 5), 'access arguments' => array('administer url aliases'), - 'type' => MENU_CALLBACK, 'file' => 'path.admin.inc', ); $items['admin/config/search/path/list'] = array( diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 7f3094051..a94c3c033 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -99,7 +99,6 @@ function profile_menu() { 'page arguments' => array('profile_field_form'), 'access arguments' => array('administer users'), 'file' => 'profile.admin.inc', - 'type' => MENU_CALLBACK, ); $items['admin/config/people/profile/autocomplete'] = array( 'title' => 'Profile category autocomplete', @@ -114,7 +113,6 @@ function profile_menu() { 'page arguments' => array('profile_field_form'), 'access arguments' => array('administer users'), 'file' => 'profile.admin.inc', - 'type' => MENU_CALLBACK, ); $items['admin/config/people/profile/delete'] = array( 'title' => 'Delete field', @@ -122,7 +120,6 @@ function profile_menu() { 'page arguments' => array('profile_field_delete'), 'access arguments' => array('administer users'), 'file' => 'profile.admin.inc', - 'type' => MENU_CALLBACK, ); $items['profile/autocomplete'] = array( 'title' => 'Profile autocomplete', diff --git a/modules/search/search.module b/modules/search/search.module index a66f1b96a..e4f4130ba 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -182,7 +182,6 @@ function search_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('search_reindex_confirm'), 'access arguments' => array('administer search'), - 'type' => MENU_CALLBACK, 'file' => 'search.admin.inc', ); diff --git a/modules/search/search.test b/modules/search/search.test index 7e97640c3..29fa9ef3f 100644 --- a/modules/search/search.test +++ b/modules/search/search.test @@ -236,13 +236,16 @@ class SearchMatchTestCase extends DrupalWebTestCase { } } -class SearchBikeShed extends DrupalWebTestCase { +/** + * Tests the bike shed text on no results page, and text on the search page. + */ +class SearchPageText extends DrupalWebTestCase { protected $searching_user; public static function getInfo() { return array( - 'name' => 'Bike shed', - 'description' => 'Tests the bike shed text on the no results page.', + 'name' => 'Search page text', + 'description' => 'Tests the bike shed text on the no results page, and various other text on search pages.', 'group' => 'Search' ); } @@ -251,18 +254,31 @@ class SearchBikeShed extends DrupalWebTestCase { parent::setUp('search'); // Create user. - $this->searching_user = $this->drupalCreateUser(array('search content')); + $this->searching_user = $this->drupalCreateUser(array('search content', 'access user profiles')); } - function testFailedSearch() { + /** + * Tests the failed search text, and various other text on the search page. + */ + function testSearchText() { $this->drupalLogin($this->searching_user); $this->drupalGet('search/node'); $this->assertText(t('Enter your keywords')); + $this->assertText(t('Search')); + $title = t('Search') . ' | Drupal'; + $this->assertTitle($title, 'Search page title is correct'); $edit = array(); $edit['keys'] = 'bike shed ' . $this->randomName(); $this->drupalPost('search/node', $edit, t('Search')); $this->assertText(t('Consider loosening your query with OR. bike OR shed will often show more results than bike shed.'), t('Help text is displayed when search returns no results.')); + $this->assertText(t('Search')); + $this->assertTitle($title, 'Search page title is correct'); + + $edit['keys'] = $this->searching_user->name; + $this->drupalPost('search/user', $edit, t('Search')); + $this->assertText(t('Search')); + $this->assertTitle($title, 'Search page title is correct'); } } diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module index 6217d1ed4..348c6f725 100644 --- a/modules/shortcut/shortcut.module +++ b/modules/shortcut/shortcut.module @@ -91,7 +91,6 @@ function shortcut_menu() { 'title arguments' => array(4), 'access callback' => 'shortcut_set_edit_access', 'access arguments' => array(4), - 'type' => MENU_CALLBACK, 'file' => 'shortcut.admin.inc', ); $items['admin/config/user-interface/shortcut/%shortcut_set/links'] = array( @@ -114,7 +113,6 @@ function shortcut_menu() { 'page arguments' => array('shortcut_set_delete_form', 4), 'access callback' => 'shortcut_set_delete_access', 'access arguments' => array(4), - 'type' => MENU_CALLBACK, 'file' => 'shortcut.admin.inc', ); $items['admin/config/user-interface/shortcut/%shortcut_set/add-link'] = array( @@ -141,7 +139,6 @@ function shortcut_menu() { 'page arguments' => array('shortcut_link_edit', 5), 'access callback' => 'shortcut_link_access', 'access arguments' => array(5), - 'type' => MENU_CALLBACK, 'file' => 'shortcut.admin.inc', ); $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array( @@ -150,7 +147,6 @@ function shortcut_menu() { 'page arguments' => array('shortcut_link_delete', 5), 'access callback' => 'shortcut_link_access', 'access arguments' => array(5), - 'type' => MENU_CALLBACK, 'file' => 'shortcut.admin.inc', ); $items['user/%user/shortcuts'] = array( diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 5b1849dd6..16076d766 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -2738,7 +2738,14 @@ class DrupalWebTestCase extends DrupalTestCase { * TRUE on pass, FALSE on fail. */ protected function assertTitle($title, $message = '', $group = 'Other') { - return $this->assertEqual(current($this->xpath('//title')), $title, $message, $group); + $actual = (string) current($this->xpath('//title')); + if (!$message) { + $message = t('Page title @actual is equal to @expected.', array( + '@actual' => var_export($actual, TRUE), + '@expected' => var_export($title, TRUE), + )); + } + return $this->assertEqual($actual, $title, $message, $group); } /** @@ -2754,7 +2761,14 @@ class DrupalWebTestCase extends DrupalTestCase { * TRUE on pass, FALSE on fail. */ protected function assertNoTitle($title, $message = '', $group = 'Other') { - return $this->assertNotEqual(current($this->xpath('//title')), $title, $message, $group); + $actual = (string) current($this->xpath('//title')); + if (!$message) { + $message = t('Page title @actual is not equal to @unexpected.', array( + '@actual' => var_export($actual, TRUE), + '@unexpected' => var_export($title, TRUE), + )); + } + return $this->assertNotEqual($actual, $title, $message, $group); } /** @@ -3092,6 +3106,24 @@ class DrupalWebTestCase extends DrupalTestCase { } /** + * Assert the page did not return the specified response code. + * + * @param $code + * Response code. For example 200 is a successful page request. For a list + * of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html. + * @param $message + * Message to display. + * + * @return + * Assertion result. + */ + protected function assertNoResponse($code, $message = '') { + $curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE); + $match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code; + return $this->assertFalse($match, $message ? $message : t('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), t('Browser')); + } + + /** * Asserts that the most recently sent e-mail message has the given value. * * The field in $name must have the content described in $value. diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index d19cc04d5..e734fe1da 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -56,7 +56,6 @@ function simpletest_menu() { 'page arguments' => array('simpletest_result_form', 5), 'description' => 'View result of tests.', 'access arguments' => array('administer unit tests'), - 'type' => MENU_CALLBACK, 'file' => 'simpletest.pages.inc', ); return $items; diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index 1dccb6e60..5857247ff 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -525,3 +525,555 @@ class MenuTreeDataTestCase extends DrupalUnitTestCase { return $this->assert($link1['mlid'] == $link2['mlid'], $message ? $message : t('First link is identical to second link')); } } + +/** + * Menu breadcrumbs related tests. + */ +class MenuBreadcrumbTestCase extends DrupalWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Breadcrumbs', + 'description' => 'Tests breadcrumbs functionality.', + 'group' => 'Menu', + ); + } + + function setUp() { + parent::setUp(array('menu_test')); + $perms = array_keys(module_invoke_all('permission')); + $this->admin_user = $this->drupalCreateUser($perms); + $this->drupalLogin($this->admin_user); + } + + /** + * Tests breadcrumbs on node and administrative paths. + */ + function testBreadCrumbs() { + // Prepare common base breadcrumb elements. + $home = array('<front>' => 'Home'); + $admin = $home + array('admin' => t('Administer')); + $config = $admin + array('admin/config' => t('Configuration')); + $type = 'article'; + $langcode = LANGUAGE_NONE; + + // Verify breadcrumbs for default local tasks. + $expected = array( + 'menu-test' => t('Menu test root'), + ); + $title = t('Breadcrumbs test: Local tasks'); + $trail = $home + $expected; + $tree = $expected + array( + 'menu-test/breadcrumb/tasks' => $title, + ); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks', $trail, $title, $tree); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/first', $trail, $title, $tree); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/first/first', $trail, $title, $tree); + $trail += array( + 'menu-test/breadcrumb/tasks' => t('Breadcrumbs test: Local tasks'), + ); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/first/second', $trail, $title, $tree); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/second', $trail, $title, $tree); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/second/first', $trail, $title, $tree); + $trail += array( + 'menu-test/breadcrumb/tasks/second' => t('Second'), + ); + $this->assertBreadcrumb('menu-test/breadcrumb/tasks/second/second', $trail, $title, $tree); + + // Verify Taxonomy administration breadcrumbs. + $trail = $admin + array( + 'admin/structure' => t('Structure'), + ); + $this->assertBreadcrumb('admin/structure/taxonomy', $trail); + + $trail += array( + 'admin/structure/taxonomy' => t('Taxonomy'), + ); + $this->assertBreadcrumb('admin/structure/taxonomy/tags', $trail); + $trail += array( + 'admin/structure/taxonomy/tags' => t('Tags'), + ); + $this->assertBreadcrumb('admin/structure/taxonomy/tags/edit', $trail); + $this->assertBreadcrumb('admin/structure/taxonomy/tags/fields', $trail); + $this->assertBreadcrumb('admin/structure/taxonomy/tags/add', $trail); + + // Verify Menu administration breadcrumbs. + $trail = $admin + array( + 'admin/structure' => t('Structure'), + ); + $this->assertBreadcrumb('admin/structure/menu', $trail); + + $trail += array( + 'admin/structure/menu' => t('Menus'), + ); + $this->assertBreadcrumb('admin/structure/menu/manage/navigation', $trail); + $trail += array( + 'admin/structure/menu/manage/navigation' => t('Navigation'), + ); + $this->assertBreadcrumb('admin/structure/menu/manage/navigation/edit', $trail); + $this->assertBreadcrumb('admin/structure/menu/manage/navigation/add', $trail); + + // Verify Node administration breadcrumbs. + $trail = $admin + array( + 'admin/structure' => t('Structure'), + 'admin/structure/types' => t('Content types'), + ); + $this->assertBreadcrumb('admin/structure/types/add', $trail); + $this->assertBreadcrumb("admin/structure/types/manage/$type", $trail); + $trail += array( + "admin/structure/types/manage/$type" => t('Article'), + ); + $this->assertBreadcrumb("admin/structure/types/manage/$type/fields", $trail); + $this->assertBreadcrumb("admin/structure/types/manage/$type/display", $trail); + $trail_teaser = $trail + array( + "admin/structure/types/manage/$type/display" => t('Manage display'), + ); + $this->assertBreadcrumb("admin/structure/types/manage/$type/display/teaser", $trail_teaser); + $this->assertBreadcrumb("admin/structure/types/manage/$type/comment/fields", $trail); + $this->assertBreadcrumb("admin/structure/types/manage/$type/comment/display", $trail); + $this->assertBreadcrumb("admin/structure/types/manage/$type/delete", $trail); + $trail += array( + "admin/structure/types/manage/$type/fields" => t('Manage fields'), + ); + $this->assertBreadcrumb("admin/structure/types/manage/$type/fields/body", $trail); + $trail += array( + "admin/structure/types/manage/$type/fields/body" => t('Body'), + ); + $this->assertBreadcrumb("admin/structure/types/manage/$type/fields/body/widget-type", $trail); + + // Verify Filter text format administration breadcrumbs. + $format = db_query_range("SELECT format, name FROM {filter_format}", 1, 1)->fetch(); + $format_id = $format->format; + $trail = $config + array( + 'admin/config/content' => t('Content authoring'), + ); + $this->assertBreadcrumb('admin/config/content/formats', $trail); + + $trail += array( + 'admin/config/content/formats' => t('Text formats'), + ); + $this->assertBreadcrumb('admin/config/content/formats/add', $trail); + $this->assertBreadcrumb("admin/config/content/formats/$format_id", $trail); + $trail += array( + "admin/config/content/formats/$format_id" => $format->name, + ); + $this->assertBreadcrumb("admin/config/content/formats/$format_id/disable", $trail); + + // Verify node breadcrumbs (without menu link). + $node1 = $this->drupalCreateNode(); + $nid1 = $node1->nid; + $trail = $home; + $this->assertBreadcrumb("node/$nid1", $trail); + // Also verify that the node does not appear elsewhere (e.g., menu trees). + $this->assertNoLink($node1->title); + // The node itself should not be contained in the breadcrumb on the default + // local task, since there is no difference between both pages. + $this->assertBreadcrumb("node/$nid1/view", $trail); + // Also verify that the node does not appear elsewhere (e.g., menu trees). + $this->assertNoLink($node1->title); + + $trail += array( + "node/$nid1" => $node1->title, + ); + $this->assertBreadcrumb("node/$nid1/edit", $trail); + + // Verify that breadcrumb on node listing page contains "Home" only. + $trail = array(); + $this->assertBreadcrumb('node', $trail); + + // Verify node breadcrumbs (in menu). + // Do this separately for Main menu and Navigation menu, since only the + // latter is a preferred menu by default. + // @todo Also test all themes? Manually testing led to the suspicion that + // breadcrumbs may differ, possibly due to template.php overrides. + $menus = array('main-menu', 'navigation'); + // Alter node type menu settings. + variable_set("menu_options_$type", $menus); + variable_set("menu_parent_$type", 'navigation:0'); + + foreach ($menus as $menu) { + // Create a parent node in the current menu. + $title = $this->randomName(); + $node2 = $this->drupalCreateNode(array( + 'type' => $type, + 'title' => $title, + 'menu' => array( + 'enabled' => 1, + 'link_title' => 'Parent ' . $title, + 'description' => '', + 'menu_name' => $menu, + 'plid' => 0, + ), + )); + $nid2 = $node2->nid; + + $trail = $home; + $tree = array( + "node/$nid2" => $node2->menu['link_title'], + ); + $this->assertBreadcrumb("node/$nid2", $trail, $node2->title, $tree); + // The node itself should not be contained in the breadcrumb on the + // default local task, since there is no difference between both pages. + $this->assertBreadcrumb("node/$nid2/view", $trail, $node2->title, $tree); + $trail += array( + "node/$nid2" => $node2->menu['link_title'], + ); + $this->assertBreadcrumb("node/$nid2/edit", $trail); + + // Create a child node in the current menu. + $title = $this->randomName(); + $node3 = $this->drupalCreateNode(array( + 'type' => $type, + 'title' => $title, + 'menu' => array( + 'enabled' => 1, + 'link_title' => 'Child ' . $title, + 'description' => '', + 'menu_name' => $menu, + 'plid' => $node2->menu['mlid'], + ), + )); + $nid3 = $node3->nid; + + $this->assertBreadcrumb("node/$nid3", $trail, $node3->title, $tree, FALSE); + // The node itself should not be contained in the breadcrumb on the + // default local task, since there is no difference between both pages. + $this->assertBreadcrumb("node/$nid3/view", $trail, $node3->title, $tree, FALSE); + $trail += array( + "node/$nid3" => $node3->menu['link_title'], + ); + $tree += array( + "node/$nid3" => $node3->menu['link_title'], + ); + $this->assertBreadcrumb("node/$nid3/edit", $trail); + + // Verify that node listing page still contains "Home" only. + $trail = array(); + $this->assertBreadcrumb('node', $trail); + + if ($menu == 'navigation') { + $parent = $node2; + $child = $node3; + } + } + + // Create a Navigation menu link for 'node', move the last parent node menu + // link below it, and verify a full breadcrumb for the last child node. + $menu = 'navigation'; + $edit = array( + 'link_title' => 'Root', + 'link_path' => 'node', + ); + $this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save')); + $link = db_query('SELECT * FROM {menu_links} WHERE link_title = :title', array(':title' => 'Root'))->fetchAssoc(); + + $edit = array( + 'menu[parent]' => $link['menu_name'] . ':' . $link['mlid'], + ); + $this->drupalPost("node/{$parent->nid}/edit", $edit, t('Save')); + $expected = array( + "node" => $link['link_title'], + ); + $trail = $home + $expected; + $tree = $expected + array( + "node/{$parent->nid}" => $parent->menu['link_title'], + ); + $this->assertBreadcrumb(NULL, $trail, $parent->title, $tree); + $trail += array( + "node/{$parent->nid}" => $parent->menu['link_title'], + ); + $tree += array( + "node/{$child->nid}" => $child->menu['link_title'], + ); + $this->assertBreadcrumb("node/{$child->nid}", $trail, $child->title, $tree); + + // Add a taxonomy term/tag to last node, and add a link for that term to the + // Navigation menu. + $tags = array( + 'Drupal' => array(), + 'Breadcrumbs' => array(), + ); + $edit = array( + "field_tags[$langcode]" => implode(',', array_keys($tags)), + ); + $this->drupalPost("node/{$parent->nid}/edit", $edit, t('Save')); + + // Put both terms into a hierarchy Drupal » Breadcrumbs. Required for both + // the menu links and the terms itself, since taxonomy_term_page() resets + // the breadcrumb based on taxonomy term hierarchy. + $parent_tid = 0; + foreach ($tags as $name => $null) { + $terms = taxonomy_term_load_multiple(NULL, array('name' => $name)); + $term = reset($terms); + $tags[$name]['term'] = $term; + if ($parent_tid) { + $edit = array( + 'parent[]' => array($parent_tid), + ); + $this->drupalPost("taxonomy/term/{$term->tid}/edit", $edit, t('Save')); + } + $parent_tid = $term->tid; + } + $parent_mlid = 0; + foreach ($tags as $name => $data) { + $term = $data['term']; + $edit = array( + 'link_title' => "$name link", + 'link_path' => "taxonomy/term/{$term->tid}", + 'parent' => "$menu:{$parent_mlid}", + ); + $this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save')); + $tags[$name]['link'] = db_query('SELECT * FROM {menu_links} WHERE link_title = :title AND link_path = :href', array( + ':title' => $edit['link_title'], + ':href' => $edit['link_path'], + ))->fetchAssoc(); + $tags[$name]['link']['link_path'] = $edit['link_path']; + $parent_mlid = $tags[$name]['link']['mlid']; + } + + // Verify expected breadcrumbs for menu links. + $trail = $home; + $tree = array(); + foreach ($tags as $name => $data) { + $term = $data['term']; + $link = $data['link']; + + $tree += array( + $link['link_path'] => $link['link_title'], + ); + // @todo Normally, you'd expect $term->name as page title here. + $this->assertBreadcrumb($link['link_path'], $trail, $link['link_title'], $tree); + $this->assertRaw(check_plain($parent->title), 'Tagged node found.'); + + // Additionally make sure that this link appears only once; i.e., the + // untranslated menu links automatically generated from menu router items + // ('taxonomy/term/%') should never be translated and appear in any menu + // other than the breadcrumb trail. + $elements = $this->xpath('//div[@id=:menu]/descendant::a[@href=:href]', array( + ':menu' => 'block-system-navigation', + ':href' => url($link['link_path']), + )); + $this->assertTrue(count($elements) == 1, "Link to {$link['link_path']} appears only once."); + + // Next iteration should expect this tag as parent link. + // Note: Term name, not link name, due to taxonomy_term_page(). + $trail += array( + $link['link_path'] => $term->name, + ); + } + + // Verify breadcrumbs on user and user/%. + // We need to log back in and out below, and cannot simply grant the + // 'administer users' permission, since user_page() makes your head explode. + user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array( + 'access user profiles', + )); + $this->drupalLogout(); + + // Verify breadcrumb on front page. + $this->assertBreadcrumb('<front>', array()); + + $trail = $home; + $this->assertBreadcrumb('user', $trail, t('User account')); + $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name); + + $this->drupalLogin($this->admin_user); + $trail += array( + 'user/' . $this->admin_user->uid => $this->admin_user->name, + ); + $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $this->admin_user->name); + + // Add a Navigation menu links for 'user' and $this->admin_user. + // Although it may be faster to manage these links via low-level API + // functions, there's a lot that can go wrong in doing so. + $edit = array( + 'link_title' => 'User', + 'link_path' => 'user', + ); + $this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save')); + $link_user = db_query('SELECT * FROM {menu_links} WHERE link_title = :title AND link_path = :href', array( + ':title' => $edit['link_title'], + ':href' => $edit['link_path'], + ))->fetchAssoc(); + + $edit = array( + 'link_title' => $this->admin_user->name . ' link', + 'link_path' => 'user/' . $this->admin_user->uid, + ); + $this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save')); + $link_admin_user = db_query('SELECT * FROM {menu_links} WHERE link_title = :title AND link_path = :href', array( + ':title' => $edit['link_title'], + ':href' => $edit['link_path'], + ))->fetchAssoc(); + + // Verify expected breadcrumbs for the two separate links. + $this->drupalLogout(); + $trail = $home; + $tree = array( + $link_user['link_path'] => $link_user['link_title'], + ); + $this->assertBreadcrumb('user', $trail, $link_user['link_title'], $tree); + $tree = array( + $link_admin_user['link_path'] => $link_admin_user['link_title'], + ); + $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree); + + $this->drupalLogin($this->admin_user); + $trail += array( + $link_admin_user['link_path'] => $link_admin_user['link_title'], + ); + $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE); + + // Move 'user/%' below 'user' and verify again. + $edit = array( + 'parent' => "$menu:{$link_user['mlid']}", + ); + $this->drupalPost("admin/structure/menu/item/{$link_admin_user['mlid']}/edit", $edit, t('Save')); + + $this->drupalLogout(); + $trail = $home; + $tree = array( + $link_user['link_path'] => $link_user['link_title'], + ); + $this->assertBreadcrumb('user', $trail, $link_user['link_title'], $tree); + $trail += array( + $link_user['link_path'] => $link_user['link_title'], + ); + $tree += array( + $link_admin_user['link_path'] => $link_admin_user['link_title'], + ); + $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree); + + $this->drupalLogin($this->admin_user); + $trail += array( + $link_admin_user['link_path'] => $link_admin_user['link_title'], + ); + $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE); + + // Create an only slightly privileged user being able to access site reports + // but not administration pages. + $this->web_user = $this->drupalCreateUser(array( + 'access site reports', + )); + $this->drupalLogin($this->web_user); + + // Verify that we can access recent log entries, there is a corresponding + // page title, and that the breadcrumb is empty (because the user is not + // able to access "Administer", so the trail cannot recurse into it). + $trail = array(); + $this->assertBreadcrumb('admin', $trail, t('Access denied')); + $this->assertResponse(403); + + $trail = $home; + $this->assertBreadcrumb('admin/reports', $trail, t('Reports')); + $this->assertNoResponse(403); + + $this->assertBreadcrumb('admin/reports/dblog', $trail, t('Recent log messages')); + $this->assertNoResponse(403); + } + + /** + * Assert that a given path shows certain breadcrumb links. + * + * @param string $goto + * (optional) A system path to pass to DrupalWebTestCase::drupalGet(). + * @param array $trail + * An associative array whose keys are expected breadcrumb link paths and + * whose values are expected breadcrumb link texts (not sanitized). + * @param string $page_title + * (optional) A page title to additionally assert via + * DrupalWebTestCase::assertTitle(). Without site name suffix. + * @param array $tree + * (optional) An associative array whose keys are link paths and whose + * values are link titles (not sanitized) of an expected active trail in a + * menu tree output on the page. + * @param $last_active + * (optional) Whether the last link in $tree is expected to be active (TRUE) + * or just to be in the active trail (FALSE). + */ + protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, array $tree = array(), $last_active = TRUE) { + if (isset($goto)) { + $this->drupalGet($goto); + } + // Compare paths with actual breadcrumb. + $parts = $this->getParts(); + $pass = TRUE; + foreach ($trail as $path => $title) { + $url = url($path); + $part = array_shift($parts); + $pass = ($pass && $part['href'] === $url && $part['text'] === check_plain($title)); + } + // No parts must be left, or an expected "Home" will always pass. + $pass = ($pass && empty($parts)); + + $this->assertTrue($pass, t('Breadcrumb %parts found on @path.', array( + '%parts' => implode(' » ', $trail), + '@path' => $this->getUrl(), + ))); + + // Additionally assert page title, if given. + if (isset($page_title)) { + $this->assertTitle(strtr('@title | Drupal', array('@title' => $page_title))); + } + + // Additionally assert active trail in a menu tree output, if given. + if ($tree) { + end($tree); + $active_link_path = key($tree); + $active_link_title = array_pop($tree); + $xpath = ''; + if ($tree) { + $i = 0; + foreach ($tree as $link_path => $link_title) { + $part_xpath = (!$i ? '//' : '/following-sibling::ul/descendant::'); + $part_xpath .= 'li[contains(@class, :class)]/a[contains(@href, :href) and contains(text(), :title)]'; + $part_args = array( + ':class' => 'active-trail', + ':href' => url($link_path), + ':title' => $link_title, + ); + $xpath .= $this->buildXPathQuery($part_xpath, $part_args); + $i++; + } + $elements = $this->xpath($xpath); + $this->assertTrue(!empty($elements), t('Active trail to current page was found in menu tree.')); + + // Append prefix for active link asserted below. + $xpath .= '/following-sibling::ul/descendant::'; + } + else { + $xpath .= '//'; + } + $xpath_last_active = ($last_active ? 'and contains(@class, :class-active)' : ''); + $xpath .= 'li[contains(@class, :class-trail)]/a[contains(@href, :href) ' . $xpath_last_active . 'and contains(text(), :title)]'; + $args = array( + ':class-trail' => 'active-trail', + ':class-active' => 'active', + ':href' => url($active_link_path), + ':title' => $active_link_title, + ); + $elements = $this->xpath($xpath, $args); + $this->assertTrue(!empty($elements), t('Active link %title was found in menu tree, including active trail links %tree.', array( + '%title' => $active_link_title, + '%tree' => implode(' » ', $tree), + ))); + } + } + + /** + * Returns the breadcrumb contents of the current page in the internal browser. + */ + protected function getParts() { + $parts = array(); + $elements = $this->xpath('//div[@class="breadcrumb"]/a'); + if (!empty($elements)) { + foreach ($elements as $element) { + $parts[] = array( + 'text' => (string) $element, + 'href' => (string) $element['href'], + 'title' => (string) $element['title'], + ); + } + } + return $parts; + } +} diff --git a/modules/simpletest/tests/menu_test.module b/modules/simpletest/tests/menu_test.module index 8bab8a208..340b8067a 100644 --- a/modules/simpletest/tests/menu_test.module +++ b/modules/simpletest/tests/menu_test.module @@ -77,7 +77,7 @@ function menu_test_menu() { 'access arguments' => array('access content'), ); $items['menu-test/hidden'] = array( - 'title' => 'Menu test parent', + 'title' => 'Hidden test root', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), ); @@ -110,7 +110,6 @@ function menu_test_menu() { 'title' => 'Customize menu', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, ); $items['menu-test/hidden/menu/manage/%menu/list'] = array( 'title' => 'List links', @@ -135,7 +134,6 @@ function menu_test_menu() { 'title' => 'Delete menu', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, ); // Hidden tests; two dynamic arguments. @@ -173,6 +171,41 @@ function menu_test_menu() { 'context' => MENU_CONTEXT_NONE, ); + // Breadcrumbs tests. + // @see MenuBreadcrumbTestCase + $base = array( + 'page callback' => 'menu_test_callback', + 'access callback' => TRUE, + ); + // Local tasks: Second level below default local task. + $items['menu-test/breadcrumb/tasks'] = array( + 'title' => 'Breadcrumbs test: Local tasks', + ) + $base; + $items['menu-test/breadcrumb/tasks/first'] = array( + 'title' => 'First', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ) + $base; + $items['menu-test/breadcrumb/tasks/second'] = array( + 'title' => 'Second', + 'type' => MENU_LOCAL_TASK, + ) + $base; + $items['menu-test/breadcrumb/tasks/first/first'] = array( + 'title' => 'First first', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ) + $base; + $items['menu-test/breadcrumb/tasks/first/second'] = array( + 'title' => 'First second', + 'type' => MENU_LOCAL_TASK, + ) + $base; + $items['menu-test/breadcrumb/tasks/second/first'] = array( + 'title' => 'Second first', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ) + $base; + $items['menu-test/breadcrumb/tasks/second/second'] = array( + 'title' => 'Second second', + 'type' => MENU_LOCAL_TASK, + ) + $base; + // File inheritance tests. This menu item should inherit the page callback // system_admin_menu_block_page() and therefore render its children as links // on the page. diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index e40e16fd9..0e093fe5f 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -163,7 +163,6 @@ function statistics_menu() { 'page callback' => 'statistics_access_log', 'page arguments' => array(3), 'access arguments' => array('access statistics'), - 'type' => MENU_CALLBACK, 'file' => 'statistics.admin.inc', ); $items['admin/config/system/statistics'] = array( diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 31b13b95a..cbc58ae13 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -10,7 +10,15 @@ class StatisticsTestCase extends DrupalWebTestCase { parent::setUp('statistics'); // Create user. - $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics', 'administer blocks', 'administer statistics', 'administer users')); + $this->blocking_user = $this->drupalCreateUser(array( + 'access administration pages', + 'access site reports', + 'access statistics', + 'block IP addresses', + 'administer blocks', + 'administer statistics', + 'administer users', + )); $this->drupalLogin($this->blocking_user); // Enable access logging. diff --git a/modules/system/system.api.php b/modules/system/system.api.php index e7903e86d..3fc5bbfe2 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1200,6 +1200,53 @@ function hook_menu_local_tasks_alter(&$data, $router_item, $root_path) { } /** + * Alter links in the active trail before it is rendered as the breadcrumb. + * + * This hook is invoked by menu_get_active_breadcrumb() and allows alteration + * of the breadcrumb links for the current page, which may be preferred instead + * of setting a custom breadcrumb via drupal_set_breadcrumb(). + * + * Implementations should take into account that menu_get_active_breadcrumb() + * subsequently performs the following adjustments to the active trail *after* + * this hook has been invoked: + * - The last link in $active_trail is removed, if its 'href' is identical to + * the 'href' of $item. This happens, because the breadcrumb normally does + * not contain a link to the current page. + * - The (second to) last link in $active_trail is removed, if the current $item + * is a MENU_DEFAULT_LOCAL_TASK. This happens in order to do not show a link + * to the current page, when being on the path for the default local task; + * e.g. when being on the path node/%/view, the breadcrumb should not contain + * a link to node/%. + * + * Each link in the active trail must contain: + * - title: The localized title of the link. + * - href: The system path to link to. + * - localized_options: An array of options to pass to url(). + * + * @param $active_trail + * An array containing breadcrumb links for the current page. + * @param $item + * The menu router item of the current page. + * + * @see drupal_set_breadcrumb() + * @see menu_get_active_breadcrumb() + * @see menu_get_active_trail() + * @see menu_set_active_trail() + */ +function hook_menu_breadcrumb_alter(&$active_trail, $item) { + // Always display a link to the current page by duplicating the last link in + // the active trail. This means that menu_get_active_breadcrumb() will remove + // the last link (for the current page), but since it is added once more here, + // it will appear. + if (!drupal_is_front_page()) { + $end = end($active_trail); + if ($item['href'] == $end['href']) { + $active_trail[] = $end; + } + } +} + +/** * Alter contextual links before they are rendered. * * This hook is invoked by menu_contextual_links(). The system-determined diff --git a/modules/system/system.module b/modules/system/system.module index 134a51e5f..865eec1f1 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -648,7 +648,6 @@ function system_menu() { $items['admin/modules/list/confirm'] = array( 'title' => 'List', 'access arguments' => array('administer modules'), - 'type' => MENU_CALLBACK, ); $items['admin/modules/uninstall'] = array( 'title' => 'Uninstall', @@ -661,7 +660,6 @@ function system_menu() { $items['admin/modules/uninstall/confirm'] = array( 'title' => 'Uninstall', 'access arguments' => array('administer modules'), - 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); @@ -688,7 +686,6 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_ip_blocking_delete', 5), 'access arguments' => array('block IP addresses'), - 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); @@ -829,7 +826,6 @@ function system_menu() { $items['admin/config/regional/date-time/types/%/delete'] = array( 'title' => 'Delete date type', 'description' => 'Allow users to delete a configured date type.', - 'type' => MENU_CALLBACK, 'page callback' => 'drupal_get_form', 'page arguments' => array('system_delete_date_format_type_form', 5), 'access arguments' => array('administer site configuration'), @@ -857,7 +853,6 @@ function system_menu() { $items['admin/config/regional/date-time/formats/%/edit'] = array( 'title' => 'Edit date format', 'description' => 'Allow users to edit a configured date format.', - 'type' => MENU_CALLBACK, 'page callback' => 'drupal_get_form', 'page arguments' => array('system_configure_date_formats_form', 5), 'access arguments' => array('administer site configuration'), @@ -866,7 +861,6 @@ function system_menu() { $items['admin/config/regional/date-time/formats/%/delete'] = array( 'title' => 'Delete date format', 'description' => 'Allow users to delete a configured date format.', - 'type' => MENU_CALLBACK, 'page callback' => 'drupal_get_form', 'page arguments' => array('system_date_delete_format_form', 5), 'access arguments' => array('administer site configuration'), @@ -874,7 +868,6 @@ function system_menu() { ); $items['admin/config/regional/date-time/formats/lookup'] = array( 'title' => 'Date and time lookup', - 'type' => MENU_CALLBACK, 'page callback' => 'system_date_time_lookup', 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', @@ -938,7 +931,6 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_actions_configure'), 'access arguments' => array('administer actions'), - 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); $items['admin/config/system/actions/delete/%actions'] = array( @@ -947,7 +939,6 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_actions_delete_form', 5), 'access arguments' => array('administer actions'), - 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); $items['admin/config/system/actions/orphan'] = array( diff --git a/modules/system/system.test b/modules/system/system.test index 5e75910d1..3fe9ac11d 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -653,8 +653,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase { parent::setUp(); // Create an administrative user. - $this->admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer blocks')); - $this->drupalLogin($this->admin_user); + $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration', 'administer blocks')); } function testAccessDenied() { @@ -662,6 +661,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase { $this->assertText(t('Access denied'), t('Found the default 403 page')); $this->assertResponse(403); + $this->drupalLogin($this->admin_user); $edit = array( 'title' => $this->randomName(10), 'body' => array(LANGUAGE_NONE => array(array('value' => $this->randomName(100)))), @@ -671,6 +671,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase { // Use a custom 403 page. $this->drupalPost('admin/config/system/site-information', array('site_403' => 'node/' . $node->nid), t('Save configuration')); + $this->drupalLogout(); $this->drupalGet('admin'); $this->assertText($node->title, t('Found the custom 403 page')); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 3d06f111f..ae3debc19 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -287,7 +287,6 @@ function taxonomy_menu() { 'page callback' => 'taxonomy_term_page', 'page arguments' => array(2), 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, 'file' => 'taxonomy.pages.inc', ); $items['taxonomy/term/%taxonomy_term/view'] = array( diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index 1af17db7e..47433a6a8 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -19,6 +19,8 @@ function taxonomy_term_page($term) { $current = (object) array( 'tid' => $term->tid, ); + // @todo This overrides any other possible breadcrumb and is a pure hard-coded + // presumption. Make this behavior configurable per vocabulary or term. $breadcrumb = array(); while ($parents = taxonomy_get_parents($current->tid)) { $current = array_shift($parents); diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test index a9938b087..b71cc62c5 100644 --- a/modules/taxonomy/taxonomy.test +++ b/modules/taxonomy/taxonomy.test @@ -557,7 +557,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase { // the first edit link found on the listing page is to our term. $this->clickLink(t('edit')); - $this->assertText($edit['name'], t('The randomly generated term name is present.')); + $this->assertRaw($edit['name'], t('The randomly generated term name is present.')); $this->assertText($edit['description[value]'], t('The randomly generated term description is present.')); $edit = array( @@ -939,7 +939,7 @@ class TaxonomyTermFieldTestCase extends TaxonomyWebTestCase { "{$this->field_name}[$langcode]" => array($term->tid), ); $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/(\d+)/edit|', $this->url, $match); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); $id = $match[1]; $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created')); diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module index 7a55e623e..852c23d9c 100644 --- a/modules/trigger/trigger.module +++ b/modules/trigger/trigger.module @@ -80,7 +80,6 @@ function trigger_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('trigger_unassign'), 'access arguments' => array('administer actions'), - 'type' => MENU_CALLBACK, 'file' => 'trigger.admin.inc', ); diff --git a/modules/user/user.module b/modules/user/user.module index b43b689fd..53172a83c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1522,7 +1522,12 @@ function user_menu() { 'title' => 'User account', 'page callback' => 'user_page', 'access callback' => TRUE, - 'type' => MENU_CALLBACK, + // Edge-case: No menu links should be auto-generated for this and below + // items, which makes it a MENU_CALLBACK. However, this item's title is + // expected to appear on user login, register, and password pages, so we + // need to use MENU_VISIBLE_IN_BREADCRUMB to make + // menu_get_active_breadcrumb() account for it. + 'type' => MENU_VISIBLE_IN_BREADCRUMB, 'file' => 'user.pages.inc', ); @@ -1617,7 +1622,6 @@ function user_menu() { 'page arguments' => array('user_admin_role', 5), 'access callback' => 'user_role_edit_access', 'access arguments' => array(5), - 'type' => MENU_CALLBACK, ); $items['admin/people/permissions/roles/delete/%user_role'] = array( 'title' => 'Delete role', @@ -1625,7 +1629,6 @@ function user_menu() { 'page arguments' => array('user_admin_role_delete_confirm', 5), 'access callback' => 'user_role_edit_access', 'access arguments' => array(5), - 'type' => MENU_CALLBACK, 'file' => 'user.admin.inc', ); @@ -1688,7 +1691,6 @@ function user_menu() { 'page arguments' => array('user_cancel_confirm_form', 1), 'access callback' => 'user_cancel_access', 'access arguments' => array(1), - 'type' => MENU_CALLBACK, 'file' => 'user.pages.inc', ); @@ -1698,7 +1700,6 @@ function user_menu() { 'page arguments' => array(1, 4, 5), 'access callback' => 'user_cancel_access', 'access arguments' => array(1), - 'type' => MENU_CALLBACK, 'file' => 'user.pages.inc', ); |