diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
index e979a5c2b6ba0e02bd8d5820639f0eea517498b3..35a935e4bca184a3170076e44e1ebb5149bc943f 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
@@ -25,13 +25,6 @@ class CommentLanguageTest extends WebTestBase {
*/
public static $modules = array('language', 'language_test', 'comment_test');
- /**
- * Use the standard profile.
- *
- * @todo Remove this dependency if possible.
- */
- protected $profile = 'standard';
-
public static function getInfo() {
return array(
'name' => 'Comment language',
@@ -43,8 +36,10 @@ public static function getInfo() {
function setUp() {
parent::setUp();
+ $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+
// Create and login user.
- $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content'));
+ $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval'));
$this->drupalLogin($admin_user);
// Add language.
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
index 9d30a2f81039089d9866b0fd79c7f90afcac4fac..7e9094f81f686b6dad989bb1a7d53bbea41e618e 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
@@ -11,6 +11,7 @@
* Tests that formatters are working properly.
*/
class FileFieldDisplayTest extends FileFieldTestBase {
+
public static function getInfo() {
return array(
'name' => 'File field display tests',
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php
index f69d9f7f943bfaeb52f34a02eb51096ad29acf02..12f4f08c647a72e2ff32c73a9a98681dab167206 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php
@@ -11,6 +11,7 @@
* Tests that formatters are working properly.
*/
class FileFieldRSSContentTest extends FileFieldTestBase {
+
public static function getInfo() {
return array(
'name' => 'File field RSS content',
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
index 60b5f52aea8227c6e8f22ec3128e0fa1b457c7a3..52df6f2e882b74c45ce06cdd152bf5555094a252 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
@@ -21,14 +21,13 @@ abstract class FileFieldTestBase extends WebTestBase {
*/
public static $modules = array('file', 'file_module_test', 'field_ui');
- protected $profile = 'standard';
-
protected $admin_user;
function setUp() {
parent::setUp();
- $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer comment fields', 'administer nodes', 'bypass node access'));
+ $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access'));
$this->drupalLogin($this->admin_user);
+ $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
}
/**
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
index 3d5f782f6fdf4434dc808e4d3f2c89dd1073524d..28a5d5d268c0d8223d038c8874d50b40292969a2 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
@@ -11,6 +11,14 @@
* Tests file field widget.
*/
class FileFieldWidgetTest extends FileFieldTestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = array('comment');
+
public static function getInfo() {
return array(
'name' => 'File field widget test',
@@ -23,11 +31,7 @@ public static function getInfo() {
* Tests upload and remove buttons for a single-valued File field.
*/
function testSingleValuedWidget() {
- // Use 'page' instead of 'article', so that the 'article' image field does
- // not conflict with this test. If in the future the 'page' type gets its
- // own default file or image field, this test can be made more robust by
- // using a custom node type.
- $type_name = 'page';
+ $type_name = 'article';
$field_name = strtolower($this->randomName());
$this->createFileField($field_name, $type_name);
$field = field_info_field($field_name);
@@ -83,11 +87,7 @@ function testSingleValuedWidget() {
* Tests upload and remove buttons for multiple multi-valued File fields.
*/
function testMultiValuedWidget() {
- // Use 'page' instead of 'article', so that the 'article' image field does
- // not conflict with this test. If in the future the 'page' type gets its
- // own default file or image field, this test can be made more robust by
- // using a custom node type.
- $type_name = 'page';
+ $type_name = 'article';
$field_name = strtolower($this->randomName());
$field_name2 = strtolower($this->randomName());
$this->createFileField($field_name, $type_name, array('cardinality' => 3));
@@ -204,11 +204,7 @@ function testMultiValuedWidget() {
* Tests a file field with a "Private files" upload destination setting.
*/
function testPrivateFileSetting() {
- // Use 'page' instead of 'article', so that the 'article' image field does
- // not conflict with this test. If in the future the 'page' type gets its
- // own default file or image field, this test can be made more robust by
- // using a custom node type.
- $type_name = 'page';
+ $type_name = 'article';
$field_name = strtolower($this->randomName());
$this->createFileField($field_name, $type_name);
$field = field_info_field($field_name);
@@ -245,11 +241,13 @@ function testPrivateFileSetting() {
function testPrivateFileComment() {
$user = $this->drupalCreateUser(array('access comments'));
- // Remove access comments permission from anon user.
- $edit = array(
- DRUPAL_ANONYMOUS_RID . '[access comments]' => FALSE,
- );
- $this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
+ // Grant the admin user required comment permissions.
+ user_role_grant_permissions(key($this->admin_user->roles), array('administer comment fields'));
+
+ // Revoke access comments permission from anon user, grant post to
+ // authenticated.
+ user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access comments'));
+ user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('post comments', 'skip comment approval'));
// Create a new field.
$edit = array(
diff --git a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
index 357d8bf0cc9e0c48ae1c35d26ca72ba6ee8260f2..42c0b098b8497b08f8a8930b4ae7798cd7fa7161 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
@@ -37,11 +37,7 @@ public function setUp() {
* Tests file access for file uploaded to a private node.
*/
function testPrivateFile() {
- // Use 'page' instead of 'article', so that the 'article' image field does
- // not conflict with this test. If in the future the 'page' type gets its
- // own default file or image field, this test can be made more robust by
- // using a custom node type.
- $type_name = 'page';
+ $type_name = 'article';
$field_name = strtolower($this->randomName());
$this->createFileField($field_name, $type_name, array('uri_scheme' => 'private'));
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index a0d8d2893dbd81ba012dda50ec9bff8c654d9f6f..93ceaaf1246a6643d7499302545083a8199f72ce 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -18,8 +18,6 @@ class MenuTest extends WebTestBase {
*/
public static $modules = array('menu', 'block');
- protected $profile = 'standard';
-
protected $big_user;
protected $std_user;
protected $menu;
@@ -36,6 +34,8 @@ public static function getInfo() {
function setUp() {
parent::setUp();
+ $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+
// Create users.
$this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
$this->std_user = $this->drupalCreateUser(array());
@@ -49,16 +49,15 @@ function testMenu() {
$this->drupalLogin($this->big_user);
$this->items = array();
- // Do standard menu tests.
- $this->doStandardMenuTests();
-
- // Do custom menu tests.
- $this->doCustomMenuTests();
+ $this->menu = $this->addCustomMenu();
+ $this->doMenuTests($this->menu->id());
+ $this->addInvalidMenuLink($this->menu->id());
+ $this->addCustomMenuCRUD();
// Do standard user tests.
// Login the user.
$this->drupalLogin($this->std_user);
- $this->verifyAccess(403);
+ $this->verifyAccess(403, $this->menu->id());
foreach ($this->items as $item) {
$node = node_load(substr($item['link_path'], 5)); // Paths were set as 'node/$nid'.
$this->verifyMenuLink($item, $node);
@@ -89,24 +88,6 @@ function testMenu() {
$this->resetMenuLink($item, $old_title);
}
- /**
- * Tests standard menu functionality using the Tools menu.
- */
- function doStandardMenuTests() {
- $this->doMenuTests();
- $this->addInvalidMenuLink();
- }
-
- /**
- * Tests custom menu functionality using the Tools menu.
- */
- function doCustomMenuTests() {
- $this->menu = $this->addCustomMenu();
- $this->doMenuTests($this->menu->id());
- $this->addInvalidMenuLink($this->menu->id());
- $this->addCustomMenuCRUD();
- }
-
/**
* Add custom menu using CRUD functions.
*/
@@ -204,9 +185,9 @@ function deleteCustomMenu($menu) {
}
/**
- * Tests menu functionality using the Tools menu.
+ * Tests menu functionality.
*/
- function doMenuTests($menu_name = 'tools') {
+ function doMenuTests($menu_name) {
// Add nodes to use as links for menu links.
$node1 = $this->drupalCreateNode(array('type' => 'article'));
$node2 = $this->drupalCreateNode(array('type' => 'article'));
@@ -552,7 +533,7 @@ private function getStandardMenuLink() {
*
* @param integer $response HTTP response code.
*/
- private function verifyAccess($response = 200) {
+ private function verifyAccess($response = 200, $menu_name = 'tools') {
// View menu help node.
$this->drupalGet('admin/help/menu');
$this->assertResponse($response);
@@ -568,7 +549,7 @@ private function verifyAccess($response = 200) {
}
// View tools menu customization node.
- $this->drupalGet('admin/structure/menu/manage/tools');
+ $this->drupalGet('admin/structure/menu/manage/' . $menu_name);
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Tools'), 'Tools menu node was displayed');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
index aab0858acb29aabd2d4367a3652d7c2655400312..c9e7b6dd962719c1bc7bc5d433571f8c21bbc985 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
@@ -19,8 +19,6 @@ class MultiFormTest extends AjaxTestBase {
*/
public static $modules = array('form_test');
- protected $profile = 'standard';
-
public static function getInfo() {
return array(
'name' => 'AJAX multi form',
@@ -32,6 +30,8 @@ public static function getInfo() {
function setUp() {
parent::setUp();
+ $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Page'));
+
// Create a multi-valued field for 'page' nodes to use for Ajax testing.
$field_name = 'field_ajax_test';
$field = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/FileMoveTest.php b/core/modules/system/lib/Drupal/system/Tests/Image/FileMoveTest.php
index e74b553a7963bcd3796fccef751c922b185e5baa..336888e6c108ce8fcdc8d7bd09d2f66bbda3bb87 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Image/FileMoveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Image/FileMoveTest.php
@@ -13,7 +13,13 @@
* @todo This test belongs to File module.
*/
class FileMoveTest extends ToolkitTestBase {
- protected $profile = 'standard';
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = array('image');
public static function getInfo() {
return array(
diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
index 5dfd181530d5c8f379c80e0bb62606a969fc9da9..6e3dccfbc3bd0b746b1d0dbfee3af0151fd7f77c 100644
--- a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
+++ b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
@@ -20,9 +20,7 @@ class TranslationTest extends WebTestBase {
*
* @var array
*/
- public static $modules = array('translation', 'translation_test');
-
- protected $profile = 'standard';
+ public static $modules = array('translation', 'translation_test', 'block');
protected $book;
@@ -37,6 +35,8 @@ public static function getInfo() {
function setUp() {
parent::setUp();
+ $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+
// Setup users.
$this->admin_user = $this->drupalCreateUser(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer blocks', 'access administration pages', 'translate all content'));
$this->translator = $this->drupalCreateUser(array('create page content', 'edit own page content', 'translate all content'));
@@ -460,11 +460,14 @@ function assertLanguageSwitchLinks($node, $translation, $find = TRUE, $types = N
$message = format_string('[%page_language] Language switch item not found for %translation_language language in the %type page area.', $args);
}
+ // node uses the article tag.
+ $tag = $type == 'node' ? 'article' : 'div';
+
if (!empty($translation->nid)) {
- $xpath = '//div[contains(@class, :type)]//a[@href=:url]';
+ $xpath = '//' . $tag . '[contains(@class, :type)]//a[@href=:url]';
}
else {
- $xpath = '//div[contains(@class, :type)]//span[contains(@class, "locale-untranslated")]';
+ $xpath = '//' . $tag . '[contains(@class, :type)]//span[contains(@class, "locale-untranslated")]';
}
$found = $this->findContentByXPath($xpath, array(':type' => $type, ':url' => $url), $translation_language->name);