Issue #1375452 follow-up by swentel: Test improvements for renaming fields.

core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php

@@ -69,9 +69,13 @@ function testCRUDFields() {
 
   /**
    * Tests the manage fields page.
+   *
+   * @param string $type
+   *   (optional) The name of a content type.
    */
-  function manageFieldsPage() {
-    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields');
+  function manageFieldsPage($type = '') {
+    $type = empty($type) ? $this->type : $type;
+    $this->drupalGet('admin/structure/types/manage/' . $type . '/fields');
     // Check all table columns.
     $table_headers = array(
       t('Label'),
@@ -331,8 +335,7 @@ function testRenameBundle() {
       'type' => $type2,
     );
     $this->drupalPost('admin/structure/types/manage/' . $this->type, $options, t('Save content type'));
-
-    $this->drupalGet('admin/structure/types/manage/' . $type2 . '/fields');
+    $this->manageFieldsPage($type2);
   }
 
   /**