From 7571220f3ccafb1c8343f11dc72030840a3d62b3 Mon Sep 17 00:00:00 2001 From: Jen Lampton Date: Wed, 18 Jan 2017 21:21:53 -0800 Subject: [PATCH] Update config menu location for metatag module. --- README.md | 4 +-- metatag.admin.inc | 26 +++++++++---------- metatag.i18n.inc | 6 ++--- metatag.info | 2 +- metatag.module | 26 +++++++++---------- .../tests/metatag_app_links.test | 2 +- metatag_dc/tests/metatag_dc.test | 2 +- .../tests/metatag_dc_advanced.test | 2 +- metatag_devel/tests/metatag_devel.test | 2 +- metatag_facebook/tests/metatag_facebook.test | 2 +- metatag_favicons/tests/metatag_favicons.test | 4 +-- .../tests/metatag_google_plus.test | 2 +- metatag_hreflang/README.txt | 2 +- metatag_hreflang/tests/metatag_hreflang.test | 2 +- metatag_importer/README.txt | 2 +- metatag_importer/metatag_importer.module | 24 ++++++++++++++--- metatag_importer/tests/metatag_importer.test | 2 +- metatag_mobile/tests/metatag_mobile.test | 2 +- .../tests/metatag_opengraph.test | 2 +- .../tests/metatag_opengraph_products.test | 2 +- .../tests/metatag_twitter_cards.test | 2 +- .../tests/metatag_verification.test | 2 +- metatag_views/metatag_views.i18n.inc | 6 ++--- tests/metatag.bulk_revert.test | 2 +- tests/metatag.helper.test | 8 +++--- tests/metatag.node.test | 4 +-- tests/metatag.string_handling.test | 2 +- tests/metatag.tags.test | 4 +-- tests/metatag.term.test | 4 +-- tests/metatag.tests.info | 8 +++--- tests/metatag.user.test | 6 ++--- tests/metatag.with_i18n_config.test | 2 +- tests/metatag.with_views.test | 4 +-- 33 files changed, 95 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 948d65b..7ea0cc5 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,13 @@ Installation meta tags on each individual page (node, term, etc). - The main administrative page ("Administer >> Configuration >> Search and - metadata >> Metatag" or admin/config/search/metatags) controls the site-wide + metadata >> Metatag" or admin/config/metadata/metatags) controls the site-wide defaults. Global settings, Home page settings, and specific defaults for different kinds of content are defined here. - The list of configured sets of metatags may be controlled from the Settings page ("Administer >> Configuration >> Search and metadata >> Settings" or - admin/config/search/metatags/settings) + admin/config/metadata/metatags/settings) - In order to provide a specific configuration per content type, vocabulary, etc, click "Add default meta tags". diff --git a/metatag.admin.inc b/metatag.admin.inc index 219e1f1..2fccf0f 100644 --- a/metatag.admin.inc +++ b/metatag.admin.inc @@ -106,7 +106,7 @@ function metatag_config_overview() { if (metatag_config_access('edit', $config)) { $operations['edit'] = array( 'title' => t('Edit'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'], + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'], ); if ($config['storage'] == METATAG_STORAGE_DEFAULT) { $operations['edit']['title'] = t('Override'); @@ -115,7 +115,7 @@ function metatag_config_overview() { if (metatag_config_access('enable', $config)) { $operations['enable'] = array( 'title' => t('Enable'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'] . '/enable', + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'] . '/enable', 'query' => array( 'token' => backdrop_get_token('enable-' . $config['instance']), ) + backdrop_get_destination(), @@ -124,7 +124,7 @@ function metatag_config_overview() { if (metatag_config_access('disable', $config)) { $operations['disable'] = array( 'title' => t('Disable'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'] . '/disable', + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'] . '/disable', 'query' => array( 'token' => backdrop_get_token('disable-' . $config['instance']), ) + backdrop_get_destination(), @@ -133,19 +133,19 @@ function metatag_config_overview() { if (metatag_config_access('revert', $config)) { $operations['revert'] = array( 'title' => t('Revert'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'] . '/revert', + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'] . '/revert', ); } if (metatag_config_access('delete', $config)) { $operations['delete'] = array( 'title' => t('Delete'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'] . '/delete', + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'] . '/delete', ); } if (module_exists('i18n_string') && !$settings->get('i18n_disabled', FALSE)) { $operations['translate'] = array( 'title' => t('Translate'), - 'href' => 'admin/config/search/metatags/config/' . $config['instance'] . '/translate', + 'href' => 'admin/config/metadata/metatags/config/' . $config['instance'] . '/translate', ); } $row['data']['operations'] = array( @@ -158,7 +158,7 @@ function metatag_config_overview() { $rows[$config['instance']] = $row; } - $suffix = '' . t('Items marked as "Unknown" will not be used. They are likely for types of pages that have been deleted or disabled on the Settings page.', array('@url' => url('admin/config/search/metatags/settings'))) . ''; + $suffix = '' . t('Items marked as "Unknown" will not be used. They are likely for types of pages that have been deleted or disabled on the Settings page.', array('@url' => url('admin/config/metadata/metatags/settings'))) . ''; $build['config_table'] = array( '#theme' => 'table', @@ -240,7 +240,7 @@ function metatag_config_add_form($form, &$form_state) { $form['actions']['cancel'] = array( '#type' => 'link', '#title' => t('Cancel'), - '#href' => isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/search/metatags', + '#href' => isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/metadata/metatags', ); return $form; @@ -250,7 +250,7 @@ function metatag_config_add_form_submit($form, &$form_state) { form_state_values_clean($form_state); $config = $form_state['values']; metatag_config_save($config); - $form_state['redirect'] = 'admin/config/search/metatags/config/' . $config['instance']; + $form_state['redirect'] = 'admin/config/metadata/metatags/config/' . $config['instance']; } function metatag_config_edit_form($form, &$form_state, $config) { @@ -299,7 +299,7 @@ function metatag_config_edit_form($form, &$form_state, $config) { $form['actions']['cancel'] = array( '#type' => 'link', '#title' => t('Cancel'), - '#href' => isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/search/metatags', + '#href' => isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/metadata/metatags', ); $form['#submit'][] = 'metatag_config_edit_form_submit'; @@ -317,7 +317,7 @@ function metatag_config_edit_form_submit($form, &$form_state) { $label = metatag_config_instance_label($config['instance']); backdrop_set_message(t('The meta tag defaults for @label have been saved.', array('@label' => $label))); - $form_state['redirect'] = 'admin/config/search/metatags'; + $form_state['redirect'] = 'admin/config/metadata/metatags'; } function metatag_config_enable($data) { @@ -367,7 +367,7 @@ function metatag_config_delete_form($form, &$form_state, $config) { return confirm_form( $form, $title, - 'admin/config/search/metatags', + 'admin/config/metadata/metatags', t('This action cannot be undone.') ); } @@ -386,7 +386,7 @@ function metatag_config_delete_form_submit($form, &$form_state) { $title = t('The meta tag defaults for @label have been reverted.', array('@label' => $label)); } - $form_state['redirect'] = 'admin/config/search/metatags'; + $form_state['redirect'] = 'admin/config/metadata/metatags'; } /** diff --git a/metatag.i18n.inc b/metatag.i18n.inc index e6141ae..79a18ae 100644 --- a/metatag.i18n.inc +++ b/metatag.i18n.inc @@ -88,9 +88,9 @@ function metatag_i18n_object_info() { '%instance' => 'instance', ), // To produce edit links automatically. - 'edit path' => 'admin/config/search/metatags/config/%instance', + 'edit path' => 'admin/config/metadata/metatags/config/%instance', // Auto-generate a 'translate' tab. - 'translate tab' => 'admin/config/search/metatags/config/%instance/translate', + 'translate tab' => 'admin/config/metadata/metatags/config/%instance/translate', // Properties for string translation. 'string translation' => array( @@ -103,7 +103,7 @@ function metatag_i18n_object_info() { // Translatable properties of these objects. 'properties' => $config_properties, // The path to translate individual strings. - 'translate path' => 'admin/config/search/metatags/config/%instance/translate/%i18n_language', + 'translate path' => 'admin/config/metadata/metatags/config/%instance/translate/%i18n_language', ), ); diff --git a/metatag.info b/metatag.info index 5b6955d..e1b363c 100644 --- a/metatag.info +++ b/metatag.info @@ -4,7 +4,7 @@ description = Adds support and an API to implement meta tags. package = SEO backdrop = 1.x -configure = admin/config/search/metatags +configure = admin/config/metadata/metatags ; The custom Bulk Revert functionality. files[] = tests/metatag.bulk_revert.test diff --git a/metatag.module b/metatag.module index 2d9f299..7f4d144 100644 --- a/metatag.module +++ b/metatag.module @@ -109,19 +109,19 @@ function metatag_permission() { * Implements hook_menu(). */ function metatag_menu() { - $items['admin/config/search/metatags'] = array( + $items['admin/config/metadata/metatags'] = array( 'title' => 'Metatag', 'description' => 'Configure Metatag defaults.', 'page callback' => 'metatag_config_overview', 'access arguments' => array('administer meta tags'), 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config'] = array( + $items['admin/config/metadata/metatags/config'] = array( 'title' => 'Defaults', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/config/search/metatags/settings'] = array( + $items['admin/config/metadata/metatags/settings'] = array( 'title' => 'Settings', 'page callback' => 'backdrop_get_form', 'page arguments' => array('metatag_admin_settings_form'), @@ -130,7 +130,7 @@ function metatag_menu() { 'weight' => 30, 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/bulk-revert'] = array( + $items['admin/config/metadata/metatags/bulk-revert'] = array( 'title' => 'Bulk revert', 'page callback' => 'backdrop_get_form', 'page arguments' => array('metatag_bulk_revert_form'), @@ -140,7 +140,7 @@ function metatag_menu() { 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config/add'] = array( + $items['admin/config/metadata/metatags/config/add'] = array( 'title' => 'Add default meta tags', 'page callback' => 'backdrop_get_form', 'page arguments' => array('metatag_config_add_form'), @@ -148,7 +148,7 @@ function metatag_menu() { 'file' => 'metatag.admin.inc', 'type' => MENU_LOCAL_ACTION, ); - $items['admin/config/search/metatags/config/%metatag_config'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config'] = array( 'title callback' => 'metatag_config_title', 'title arguments' => array(5), 'page callback' => 'backdrop_get_form', @@ -156,12 +156,12 @@ function metatag_menu() { 'access arguments' => array('administer meta tags'), 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config/%metatag_config/edit'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/edit'] = array( 'title' => 'Edit', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/config/search/metatags/config/%metatag_config/enable'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/enable'] = array( 'title' => 'Enable', 'page callback' => 'metatag_config_enable', 'page arguments' => array(5), @@ -169,7 +169,7 @@ function metatag_menu() { 'access arguments' => array('enable', 5), 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config/%metatag_config/disable'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/disable'] = array( 'title' => 'Disable', 'page callback' => 'metatag_config_disable', 'page arguments' => array(5), @@ -177,7 +177,7 @@ function metatag_menu() { 'access arguments' => array('disable', 5), 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config/%metatag_config/revert'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/revert'] = array( 'title' => 'Revert', 'page callback' => 'backdrop_get_form', 'page arguments' => array('metatag_config_delete_form', 5), @@ -185,7 +185,7 @@ function metatag_menu() { 'access arguments' => array('revert', 5), 'file' => 'metatag.admin.inc', ); - $items['admin/config/search/metatags/config/%metatag_config/delete'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/delete'] = array( 'title' => 'Delete', 'page callback' => 'backdrop_get_form', 'page arguments' => array('metatag_config_delete_form', 5), @@ -201,14 +201,14 @@ function metatag_menu() { // these pages on the config pages *do* check the setting, which is close // enough. if (module_exists('i18n_string')) { - $items['admin/config/search/metatags/config/%metatag_config/translate'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/translate'] = array( 'title' => 'Translate', 'access arguments' => array('administer meta tags'), 'page callback' => 'i18n_string_object_translate_page', 'page arguments' => array('metatag_config', 5), 'type' => MENU_LOCAL_TASK, ); - $items['admin/config/search/metatags/config/%metatag_config/translate/%i18n_language'] = array( + $items['admin/config/metadata/metatags/config/%metatag_config/translate/%i18n_language'] = array( 'title' => 'Translate', 'access arguments' => array('administer meta tags'), 'page callback' => 'i18n_string_object_translate_page', diff --git a/metatag_app_links/tests/metatag_app_links.test b/metatag_app_links/tests/metatag_app_links.test index 028e7a2..4cd9d3e 100644 --- a/metatag_app_links/tests/metatag_app_links.test +++ b/metatag_app_links/tests/metatag_app_links.test @@ -34,7 +34,7 @@ class MetatagAppLinksTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_dc/tests/metatag_dc.test b/metatag_dc/tests/metatag_dc.test index 748975b..afd0297 100644 --- a/metatag_dc/tests/metatag_dc.test +++ b/metatag_dc/tests/metatag_dc.test @@ -34,7 +34,7 @@ class MetatagDcTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_dc_advanced/tests/metatag_dc_advanced.test b/metatag_dc_advanced/tests/metatag_dc_advanced.test index f8b99f8..7180113 100644 --- a/metatag_dc_advanced/tests/metatag_dc_advanced.test +++ b/metatag_dc_advanced/tests/metatag_dc_advanced.test @@ -34,7 +34,7 @@ class MetatagDcAdvancedTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_devel/tests/metatag_devel.test b/metatag_devel/tests/metatag_devel.test index 3be2d63..3b2ba1f 100644 --- a/metatag_devel/tests/metatag_devel.test +++ b/metatag_devel/tests/metatag_devel.test @@ -23,7 +23,7 @@ class MetatagDevelest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->backdropGet('admin/config/search/metatags'); + $this->backdropGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_facebook/tests/metatag_facebook.test b/metatag_facebook/tests/metatag_facebook.test index 8cf5da6..785bfe9 100644 --- a/metatag_facebook/tests/metatag_facebook.test +++ b/metatag_facebook/tests/metatag_facebook.test @@ -34,7 +34,7 @@ class MetatagFacebookTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_favicons/tests/metatag_favicons.test b/metatag_favicons/tests/metatag_favicons.test index 31d53ca..b2bf54c 100644 --- a/metatag_favicons/tests/metatag_favicons.test +++ b/metatag_favicons/tests/metatag_favicons.test @@ -34,7 +34,7 @@ class MetatagFaviconsTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. @@ -61,7 +61,7 @@ class MetatagFaviconsTest extends MetatagTestHelper { metatag_config_save($config); // Load the config page. - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the meta tag's value is on the page. diff --git a/metatag_google_plus/tests/metatag_google_plus.test b/metatag_google_plus/tests/metatag_google_plus.test index a0e4a61..78ee5b4 100644 --- a/metatag_google_plus/tests/metatag_google_plus.test +++ b/metatag_google_plus/tests/metatag_google_plus.test @@ -34,7 +34,7 @@ class MetatagGooglePlusTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_hreflang/README.txt b/metatag_hreflang/README.txt index 8985502..4e35960 100644 --- a/metatag_hreflang/README.txt +++ b/metatag_hreflang/README.txt @@ -25,7 +25,7 @@ Configuration removed. It is possible to change this so that the meta tag is not removed by enabling the "Allow hreflang tag that matches the x-default tag" option on the main Metatag settings page: - admin/config/search/metatags/settings + admin/config/metadata/metatags/settings Credits / Contact diff --git a/metatag_hreflang/tests/metatag_hreflang.test b/metatag_hreflang/tests/metatag_hreflang.test index c27052f..817a514 100644 --- a/metatag_hreflang/tests/metatag_hreflang.test +++ b/metatag_hreflang/tests/metatag_hreflang.test @@ -34,7 +34,7 @@ class MetatagHreflangTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_importer/README.txt b/metatag_importer/README.txt index b8e6213..59bf0d8 100644 --- a/metatag_importer/README.txt +++ b/metatag_importer/README.txt @@ -1,7 +1,7 @@ Metatag: Importer ----------------- This module imports data from other modules. An administrative interface is -provided (admin/config/search/metatags/importer), as well as a series of Drush +provided (admin/config/metadata/metatags/importer), as well as a series of Drush commands: * metatag-convert-page-title - Convert data from the Page Title module. diff --git a/metatag_importer/metatag_importer.module b/metatag_importer/metatag_importer.module index 0ba21e0..eb1deeb 100644 --- a/metatag_importer/metatag_importer.module +++ b/metatag_importer/metatag_importer.module @@ -8,7 +8,7 @@ * Implements hook_menu(). */ function metatag_importer_menu() { - $items['admin/config/search/metatags/importer'] = array( + $items['admin/config/metadata/metatags/importer'] = array( 'title' => 'Importer', 'description' => 'Migrate settings and data from various modules to the Metatag module.', 'page callback' => 'metatag_importer_admin_page', @@ -16,8 +16,14 @@ function metatag_importer_menu() { 'file' => 'metatag_importer.admin.inc', 'type' => MENU_LOCAL_TASK, ); + // @deprecated: Remove backwards-compatibility redirect in 2.0. + $items['admin/config/search/metatags/importer'] = array( + 'page callback' => 'backdrop_goto_deprecated', + 'page arguments' => array('admin/config/metadata/metatags/importer'), + 'type' => MENU_CALLBACK, + ); - $items['admin/config/search/metatags/importer/nodewords'] = array( + $items['admin/config/metadata/metatags/importer/nodewords'] = array( 'title' => 'Import from Nodewords', 'description' => 'Migrate settings and data from the Drupal 6 Nodewords module to the Drupal 7 Metatag module.', 'page callback' => 'drupal_get_form', @@ -26,8 +32,14 @@ function metatag_importer_menu() { 'file' => 'metatag_importer.nodewords.inc', 'type' => MENU_LOCAL_ACTION, ); + // @deprecated: Remove backwards-compatibility redirect in 2.0. + $items['admin/config/search/metatags/importer/nodewords'] = array( + 'page callback' => 'backdrop_goto_deprecated', + 'page arguments' => array('admin/config/metadata/metatags/importer/nodewords'), + 'type' => MENU_CALLBACK, + ); - $items['admin/config/search/metatags/importer/page-title'] = array( + $items['admin/config/metadata/metatags/importer/page-title'] = array( 'title' => 'Import from Page Title', 'description' => 'Migrate settings and data from the Drupal 6 Nodewords module to the Drupal 7 Metatag module.', 'page callback' => 'drupal_get_form', @@ -36,6 +48,12 @@ function metatag_importer_menu() { 'file' => 'metatag_importer.page_title.inc', 'type' => MENU_LOCAL_ACTION, ); + // @deprecated: Remove backwards-compatibility redirect in 2.0. + $items['admin/config/search/metatags/importer/page-title'] = array( + 'page callback' => 'backdrop_goto_deprecated', + 'page arguments' => array('admin/config/metadata/metatags/importer/page-title'), + 'type' => MENU_CALLBACK, + ); return $items; } diff --git a/metatag_importer/tests/metatag_importer.test b/metatag_importer/tests/metatag_importer.test index f8d3741..1c8ebfb 100644 --- a/metatag_importer/tests/metatag_importer.test +++ b/metatag_importer/tests/metatag_importer.test @@ -34,7 +34,7 @@ class MetatagImporterTest extends MetatagTestHelper { * Confirm that it's possible to load the importer admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags/importer'); + $this->drupalGet('admin/config/metadata/metatags/importer'); $this->assertResponse(200); // Confirm the page is loaded. diff --git a/metatag_mobile/tests/metatag_mobile.test b/metatag_mobile/tests/metatag_mobile.test index 83c1985..39425ab 100644 --- a/metatag_mobile/tests/metatag_mobile.test +++ b/metatag_mobile/tests/metatag_mobile.test @@ -34,7 +34,7 @@ class MetatagMobileTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_opengraph/tests/metatag_opengraph.test b/metatag_opengraph/tests/metatag_opengraph.test index b576535..348fd09 100644 --- a/metatag_opengraph/tests/metatag_opengraph.test +++ b/metatag_opengraph/tests/metatag_opengraph.test @@ -34,7 +34,7 @@ class MetatagOpenGraphTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_opengraph_products/tests/metatag_opengraph_products.test b/metatag_opengraph_products/tests/metatag_opengraph_products.test index 21eb167..e09db07 100644 --- a/metatag_opengraph_products/tests/metatag_opengraph_products.test +++ b/metatag_opengraph_products/tests/metatag_opengraph_products.test @@ -34,7 +34,7 @@ class MetatagOpenGraphProductsTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_twitter_cards/tests/metatag_twitter_cards.test b/metatag_twitter_cards/tests/metatag_twitter_cards.test index 01ca1bc..7ecc79b 100644 --- a/metatag_twitter_cards/tests/metatag_twitter_cards.test +++ b/metatag_twitter_cards/tests/metatag_twitter_cards.test @@ -34,7 +34,7 @@ class MetatagTwitterCardsTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->drupalGet('admin/config/search/metatags'); + $this->drupalGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_verification/tests/metatag_verification.test b/metatag_verification/tests/metatag_verification.test index ef6e977..5f7a0c9 100644 --- a/metatag_verification/tests/metatag_verification.test +++ b/metatag_verification/tests/metatag_verification.test @@ -23,7 +23,7 @@ class MetatagVerificationTest extends MetatagTestHelper { * Confirm that it's possible to load the main admin page. */ public function testAdminPage() { - $this->backdropGet('admin/config/search/metatags'); + $this->backdropGet('admin/config/metadata/metatags'); $this->assertResponse(200); // Confirm the page is correct. diff --git a/metatag_views/metatag_views.i18n.inc b/metatag_views/metatag_views.i18n.inc index 752753a..5c1e535 100644 --- a/metatag_views/metatag_views.i18n.inc +++ b/metatag_views/metatag_views.i18n.inc @@ -29,9 +29,9 @@ function metatag_views_i18n_object_info() { // '%did' => 'did', // ), // To produce edit links automatically. - // 'edit path' => 'admin/config/search/metatags/config/%instance', + // 'edit path' => 'admin/config/metadata/metatags/config/%instance', // Auto-generate a 'translate' tab. - // 'translate tab' => 'admin/config/search/metatags/config/%instance/translate', + // 'translate tab' => 'admin/config/metadata/metatags/config/%instance/translate', // Properties for string translation. 'string translation' => array( @@ -44,7 +44,7 @@ function metatag_views_i18n_object_info() { // Translatable properties of these objects, this will be added later. 'properties' => array(), // The path to translate individual strings. - // 'translate path' => 'admin/config/search/metatags/config/%instance/translate/%i18n_language', + // 'translate path' => 'admin/config/metadata/metatags/config/%instance/translate/%i18n_language', ), ); diff --git a/tests/metatag.bulk_revert.test b/tests/metatag.bulk_revert.test index 2097a61..7769d87 100644 --- a/tests/metatag.bulk_revert.test +++ b/tests/metatag.bulk_revert.test @@ -23,7 +23,7 @@ class MetatagBulkRevertTest extends MetatagTestHelper { $this->adminUser = $this->createAdminUser(); $this->drupalLogin($this->adminUser); - $this->drupalGet('admin/config/search/metatags/bulk-revert'); + $this->drupalGet('admin/config/metadata/metatags/bulk-revert'); $this->assertResponse(200); // Confirm each of the entity checkboxes is present. diff --git a/tests/metatag.helper.test b/tests/metatag.helper.test index 47f6d68..7166af4 100644 --- a/tests/metatag.helper.test +++ b/tests/metatag.helper.test @@ -518,12 +518,12 @@ abstract class MetatagTestHelper extends BackdropWebTestCase { */ function generateByPathConfig($test_object) { // Verify the "add context" page works. - $this->backdropGet('admin/config/search/metatags/context'); + $this->backdropGet('admin/config/metadata/metatags/context'); $this->assertResponse(200); $this->assertText(t('Add a meta tag by path')); // Verify the "add context" page works. - $this->backdropGet('admin/config/search/metatags/context/add'); + $this->backdropGet('admin/config/metadata/metatags/context/add'); $this->assertResponse(200); $this->assertText(t('The unique ID for this metatag path context rule. This must contain only lower case letters, numbers and underscores.')); @@ -532,7 +532,7 @@ abstract class MetatagTestHelper extends BackdropWebTestCase { 'name' => $test_object->name, ); - $this->backdropPost('admin/config/search/metatags/context/add', $values, t('Add and configure')); + $this->backdropPost('admin/config/metadata/metatags/context/add', $values, t('Add and configure')); $this->assertResponse(200); } @@ -550,7 +550,7 @@ abstract class MetatagTestHelper extends BackdropWebTestCase { 'metatags[und][abstract][value]' => $test_object->abstract, 'metatags[und][keywords][value]' => $test_object->keywords, ); - $this->backdropPost('admin/config/search/metatags/context/' . $test_object->name, $edit, t('Save')); + $this->backdropPost('admin/config/metadata/metatags/context/' . $test_object->name, $edit, t('Save')); $this->assertResponse(200); } diff --git a/tests/metatag.node.test b/tests/metatag.node.test index c41a84c..11e2733 100644 --- a/tests/metatag.node.test +++ b/tests/metatag.node.test @@ -38,7 +38,7 @@ class MetatagCoreNodeTest extends MetatagTestHelper { // Assign default values for the new content type. // Load the "add default configuration" page. - $this->backdropGet('admin/config/search/metatags/config/add'); + $this->backdropGet('admin/config/metadata/metatags/config/add'); $this->assertResponse(200); // Verify the page loaded correct. @@ -63,7 +63,7 @@ class MetatagCoreNodeTest extends MetatagTestHelper { $this->assertText(strip_tags(t('The meta tag defaults for @label have been saved.', array('@label' => 'Node: ' . $label)))); // Verify that the user was redirected to the settings page again. - $this->assertEqual($this->getUrl(), url('admin/config/search/metatags', array('absolute' => TRUE))); + $this->assertEqual($this->getUrl(), url('admin/config/metadata/metatags', array('absolute' => TRUE))); // Create test node. $node = $this->backdropCreateNode(array('type' => $content_type)); diff --git a/tests/metatag.string_handling.test b/tests/metatag.string_handling.test index eb89964..f0ba86e 100644 --- a/tests/metatag.string_handling.test +++ b/tests/metatag.string_handling.test @@ -102,7 +102,7 @@ class MetatagCoreStringHandlingTest extends MetatagTestHelper { // Save the original string. 'metatags[und][description][value]' => $desc_original, ); - $this->drupalPost('admin/config/search/metatags/config/' . $instance, $edit, 'Save'); + $this->drupalPost('admin/config/metadata/metatags/config/' . $instance, $edit, 'Save'); $this->assertResponse(200); // Load the configuration object. diff --git a/tests/metatag.tags.test b/tests/metatag.tags.test index 8d30ccf..d363d68 100644 --- a/tests/metatag.tags.test +++ b/tests/metatag.tags.test @@ -27,7 +27,7 @@ abstract class MetatagTagsTestBase extends MetatagTestHelper { */ function testTagsArePresent() { // Load the global config. - $this->backdropGet('admin/config/search/metatags/config/global'); + $this->backdropGet('admin/config/metadata/metatags/config/global'); $this->assertResponse(200); // Confirm the various meta tags are available. @@ -54,7 +54,7 @@ abstract class MetatagTagsTestBase extends MetatagTestHelper { */ function testTagsAreSaveable() { // Load the global config. - $this->backdropGet('admin/config/search/metatags/config/global'); + $this->backdropGet('admin/config/metadata/metatags/config/global'); $this->assertResponse(200); // Update the Global defaults and test them. diff --git a/tests/metatag.term.test b/tests/metatag.term.test index cb92954..26f8f04 100644 --- a/tests/metatag.term.test +++ b/tests/metatag.term.test @@ -53,7 +53,7 @@ class MetatagCoreTermTest extends MetatagTestHelper { // Assign default values for the new vocabulary. // Load the "add default configuration" page. - $this->backdropGet('admin/config/search/metatags/config/add'); + $this->backdropGet('admin/config/metadata/metatags/config/add'); $this->assertResponse(200); // Verify the page loaded correct. @@ -76,7 +76,7 @@ class MetatagCoreTermTest extends MetatagTestHelper { $this->assertRaw(format_string('The meta tag defaults for @label have been saved.', array('@label' => 'Taxonomy term: ' . $vocabulary->name))); // Verify that the user was redirected to the settings page again. - $this->assertEqual($this->getUrl(), url('admin/config/search/metatags', array('absolute' => TRUE))); + $this->assertEqual($this->getUrl(), url('admin/config/metadata/metatags', array('absolute' => TRUE))); // Create a test term. $term = $this->createTerm($vocabulary, $term_name); diff --git a/tests/metatag.tests.info b/tests/metatag.tests.info index 005901f..0d9b459 100644 --- a/tests/metatag.tests.info +++ b/tests/metatag.tests.info @@ -11,25 +11,25 @@ group = Metatag file = metatag.tags.test [MetatagCoreNodeTest] -name = Metatag core tests for nodes +name = Metatag tests for nodes description = Test Metatag edit functionality for nodes. group = Metatag file = metatag.node.test [MetatagCoreTermTest] -name = Metatag core tests for terms +name = Metatag tests for terms description = Test Metatag edit functionality for terms. group = Metatag file = metatag.term.test [MetatagCoreUserTest] -name = Metatag core tests for users +name = Metatag tests for users description = Test Metatag edit functionality for users. group = Metatag file = metatag.user.test [MetatagCoreTagRemovalTest] -name = Metatag core tests for tag removal +name = Metatag tests for tag removal description = Test Metatag integration with the locale module. group = Metatag file = metatag.core_tag_removal.test diff --git a/tests/metatag.user.test b/tests/metatag.user.test index 17f1612..0bde848 100644 --- a/tests/metatag.user.test +++ b/tests/metatag.user.test @@ -19,7 +19,7 @@ class MetatagCoreUserTest extends MetatagTestHelper { // Assign default values for the new vocabulary. // Load the page for overriding the User configuration. - $this->backdropGet('admin/config/search/metatags/config/user'); + $this->backdropGet('admin/config/metadata/metatags/config/user'); $this->assertResponse(200); // Verify the page loaded correct. @@ -32,10 +32,10 @@ class MetatagCoreUserTest extends MetatagTestHelper { $this->assertResponse(200); // Verify the page loaded correctly. - $this->assertText(strip_tags(t('The meta tag defaults for @label have been saved.', array('@label' => 'User')))); + $this->assertText(strip_tags(t('The meta tag defaults for @label have been saved.', array('@label' => 'User account')))); // Verify that the user was redirected to the settings page again. - $this->assertEqual($this->getUrl(), url('admin/config/search/metatags', array('absolute' => TRUE))); + $this->assertEqual($this->getUrl(), url('admin/config/metadata/metatags', array('absolute' => TRUE))); // Load the user's edit form. $this->backdropGet('user/' . $this->adminUser->uid . '/edit'); diff --git a/tests/metatag.with_i18n_config.test b/tests/metatag.with_i18n_config.test index 95d0d17..a13699e 100644 --- a/tests/metatag.with_i18n_config.test +++ b/tests/metatag.with_i18n_config.test @@ -180,7 +180,7 @@ class MetatagCoreWithI18nConfigTest extends MetatagTestHelper { $this->searchTranslationPage($string_en, $config_name); // Load the 'delete' page. - $this->drupalGet('admin/config/search/metatags/config/' . $instance . '/delete'); + $this->drupalGet('admin/config/metadata/metatags/config/' . $instance . '/delete'); $this->assertResponse(200); // Confirm this is the correct page. diff --git a/tests/metatag.with_views.test b/tests/metatag.with_views.test index 34c96dc..3c3df93 100644 --- a/tests/metatag.with_views.test +++ b/tests/metatag.with_views.test @@ -61,7 +61,7 @@ class MetatagCoreWithViewsTest extends MetatagTestHelper { $this->drupalLogin($this->adminUser); // Load the "add default configuration" page. - $this->drupalGet('admin/config/search/metatags/config/add'); + $this->drupalGet('admin/config/metadata/metatags/config/add'); $this->assertResponse(200); // Verify the page loaded correct. @@ -86,7 +86,7 @@ class MetatagCoreWithViewsTest extends MetatagTestHelper { $this->assertText(strip_tags(t('The meta tag defaults for @label have been saved.', array('@label' => 'Taxonomy term: ' . $vocabulary->name)))); // Verify that the user was redirected to the settings page again. - $this->assertEqual($this->getUrl(), url('admin/config/search/metatags', array('absolute' => TRUE))); + $this->assertEqual($this->getUrl(), url('admin/config/metadata/metatags', array('absolute' => TRUE))); // Create a test term.