Rename local_tasks.yml, replaced removed functions, updated tests

.travis.yml

@@ -76,7 +76,7 @@ script:
   - cd $TRAVIS_BUILD_DIR/../drupal
   - ls -la $TRAVIS_BUILD_DIR/../drupal/sites/default
   # Run the tests
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --php `which php` --url http://localhost "Token" | tee /tmp/test.txt
+  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --php `which php` --url http://localhost "token" | tee /tmp/test.txt
   - TEST_EXIT=${PIPESTATUS[0]}
   - echo $TEST_EXIT
   # Check if we had fails in the run-tests.sh script

src/Tests/TokenArrayTestCase.php

@@ -9,16 +9,9 @@
 /**
  * Tests array tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenArrayTestCase extends TokenTestBase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Array token tests',
-      'description' => 'Test the array tokens.',
-      'group' => 'Token',
-    );
-  }
 
   function testArrayTokens() {
     // Test a simple array.

src/Tests/TokenBlockTestCase.php

@@ -11,19 +11,20 @@
 /**
  * Tests block tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenBlockTestCase extends TokenTestBase {
-  protected static $modules = array('path', 'token', 'token_test', 'block', 'node', 'views', 'block_content');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Block token tests',
-      'description' => 'Test the block title token replacement.',
-      'group' => 'Token',
-    );
-  }
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = array('path', 'token', 'token_test', 'block', 'node', 'views', 'block_content');
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp($modules = array()) {
     parent::setUp();
     $this->admin_user = $this->drupalCreateUser(array('access content', 'administer blocks'));
@@ -63,7 +64,7 @@ public function testBlockTitleTokens() {
     // Ensure that tokens are not double-escaped when output as a block title.
     $node = $this->drupalCreateNode(array('title' => "Site's first node"));
     $this->drupalGet('node/' . $node->id());
-    // The apostraphe should only be escaped once via check_plain().
+    // The apostraphe should only be escaped once via \Drupal\Component\Utility\String::checkPlain().
     $this->assertRaw("Site's first node block title");
   }
 }

src/Tests/TokenCommentTestCase.php

@@ -9,19 +9,11 @@
 /**
  * Tests comment tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenCommentTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'node', 'comment');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Comment token tests',
-      'description' => 'Test the comment tokens.',
-      'group' => 'Token',
-    );
-  }
-
   function testCommentTokens() {
     $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Page')));
     \Drupal::service('comment.manager')->addDefaultField('node', 'page');

src/Tests/TokenCurrentPageTestCase.php

@@ -7,22 +7,14 @@
 namespace Drupal\token\Tests;
 
 /**
- * Tests current page tokens.
+ * Test the [current-page:*] tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenCurrentPageTestCase extends TokenTestBase {
 
   protected static $modules = array('path', 'token', 'token_test', 'node');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Current page token tests',
-      'description' => 'Test the [current-page:*] tokens.',
-      'group' => 'Token',
-    );
-  }
-
   function testCurrentPageTokens() {
     $this->drupalGet('user');
     $tokens = array(

src/Tests/TokenDateTestCase.php

@@ -9,16 +9,9 @@
 /**
  * Tests date tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenDateTestCase extends TokenTestBase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Date token tests',
-      'description' => 'Test the date tokens.',
-      'group' => 'Token',
-    );
-  }
 
   function testDateTokens() {
     $tokens = array(

src/Tests/TokenEntityTestCase.php

@@ -15,14 +15,9 @@
 class TokenEntityTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'node', 'taxonomy');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity token tests',
-      'description' => 'Test the entity tokens.',
-      'group' => 'Token',
-    );
-  }
-
+  /**
+   * {@inheritdoc}
+   */
   public function setUp($modules = array()) {
     parent::setUp();
 

src/Tests/TokenFileTestCase.php

@@ -9,19 +9,11 @@
 /**
  * Tests file tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenFileTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'file');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'File token tests',
-      'description' => 'Test the file tokens.',
-      'group' => 'Token',
-    );
-  }
-
   function testFileTokens() {
     // Create a test file object.
     $file = entity_create('file', array(

src/Tests/TokenMenuTestCase.php

@@ -9,19 +9,11 @@
 /**
  * Tests menu tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenMenuTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'menu_ui', 'node');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Menu link and menu token tests',
-      'description' => 'Test the menu tokens.',
-      'group' => 'Token',
-    );
-  }
-
   function testMenuTokens() {
     // Add a menu.
     $menu = entity_create('menu', array(

src/Tests/TokenNodeTestCase.php

@@ -4,24 +4,17 @@
  * @file
  * Contains \Drupal\token\Tests\TokenNodeTestCase.
  */
+
 namespace Drupal\token\Tests;
 
 /**
- * Tests node tokens.
+ * Test the node and content type tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenNodeTestCase extends TokenTestBase {
   protected $profile = 'standard';
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Node and content type token tests',
-      'description' => 'Test the node and content type tokens.',
-      'group' => 'Token',
-    );
-  }
-
   function testNodeTokens() {
     $source_node = $this->drupalCreateNode(array('log' => $this->randomName(), 'path' => array('alias' => 'content/source-node')));
     $tokens = array(

src/Tests/TokenRandomTestCase.php

@@ -9,16 +9,9 @@
 /**
  * Tests random tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenRandomTestCase extends TokenTestBase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Random token tests',
-      'description' => 'Test the random tokens.',
-      'group' => 'Token',
-    );
-  }
 
   function testRandomTokens() {
     $tokens = array(

src/Tests/TokenTaxonomyTestCase.php

@@ -10,21 +10,16 @@
 /**
  * Tests taxonomy tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenTaxonomyTestCase extends TokenTestBase {
   protected $vocab;
 
   protected static $modules = array('path', 'token', 'token_test', 'taxonomy');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Taxonomy and vocabulary token tests',
-      'description' => 'Test the taxonomy tokens.',
-      'group' => 'Token',
-    );
-  }
-
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
 

src/Tests/TokenURLTestCase.php

@@ -9,19 +9,14 @@
 /**
  * Tests url tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenURLTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'node');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'URL token tests',
-      'description' => 'Test the URL tokens.',
-      'group' => 'Token',
-    );
-  }
-
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
     $this->saveAlias('node/1', 'first-node');

src/Tests/TokenUnitTestCase.php

@@ -7,21 +7,13 @@
 namespace Drupal\token\Tests;
 
 /**
- * Token unit tests.
+ * Test basic, low-level token functions.
  *
- * @group Token
+ * @group token
  */
 class TokenUnitTestCase extends TokenTestBase {
   protected static $modules = array('path', 'token', 'token_test', 'file', 'node');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Token unit tests',
-      'description' => 'Test basic, low-level token functions.',
-      'group' => 'Token',
-    );
-  }
-
   /**
    * Test token_get_invalid_tokens() and token_get_invalid_tokens_by_context().
    */

src/Tests/TokenUserTestCase.php

@@ -4,30 +4,30 @@
  * @file
  * Contains \Drupal\token\Tests\TokenUserTestCase.
  */
+
 namespace Drupal\token\Tests;
+
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Field;
 
 /**
  * Tests user tokens.
  *
- * @group Token
+ * @group token
  */
 class TokenUserTestCase extends TokenTestBase {
   protected $account = NULL;
 
-  // User pictures only exist in standard now.
-  protected $profile = 'standard';
-
-  public static function getInfo() {
-    return array(
-      'name' => 'User token tests',
-      'description' => 'Test the user tokens.',
-      'group' => 'Token',
-    );
-  }
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = array('token_user_picture');
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
 

tests/token_user_picture/config/install/entity.form_display.user.user.default.yml

@@ -0,0 +1,23 @@
+langcode: de
+status: true
+dependencies:
+  module:
+    - image
+    - user
+id: user.user.default
+targetEntityType: user
+bundle: user
+mode: default
+content:
+  account:
+    weight: -10
+  user_picture:
+    type: image_image
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+    weight: -1
+  timezone:
+    weight: 6
+hidden: {  }