commit 04ebd0e8b5b0aac345844ab8041335b77481ef33 Author: Erik Stielstra Date: Sun Sep 27 11:05:49 2015 +0200 locale-update-1832946-82.patch diff --git a/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php b/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php index b5289cb..add0c28 100644 --- a/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php +++ b/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php @@ -17,7 +17,7 @@ */ class LanguageNegotiationFormOverrideTest extends WebTestBase { - public static $modules = array('language', 'locale'); + public static $modules = array('language', 'locale', 'locale_test'); /** * Tests that overrides do not affect language-negotiation form values. diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php index 17fd2c8..b05daa9 100644 --- a/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php +++ b/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php @@ -23,7 +23,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase { * * @var array */ - public static $modules = array('language', 'locale_test_translate'); + public static $modules = array('language', 'locale_test_translate', 'locale_test'); /** * {@inheritdoc} diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php index 1436527..a87f866 100644 --- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php +++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php @@ -23,7 +23,7 @@ class LocaleJavascriptTranslationTest extends WebTestBase { * * @var array */ - public static $modules = array('locale'); + public static $modules = array('locale', 'locale_test'); public function testFileParsing() { $filename = drupal_get_path('module', 'locale') . '/tests/locale_test.js'; diff --git a/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php b/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php index aa8c955..9d7dba5 100644 --- a/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php +++ b/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php @@ -19,7 +19,7 @@ class LocaleTranslationProjectsTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['locale']; + public static $modules = ['locale', 'locale_test']; /** * The module handler used in this test. diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php index 0490789..bc7e13b 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php +++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php @@ -7,6 +7,7 @@ namespace Drupal\locale\Tests; +use Drupal\Component\Utility\FormattableString; use Drupal\Component\Utility\SafeMarkup; /** @@ -87,9 +88,12 @@ public function testInterface() { $this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message'); $this->drupalGet('admin/reports/translations'); $this->assertText(t('Missing translations for one project'), 'No translations found'); - $this->assertText(SafeMarkup::format('@module (@version). @info', array('@module' => 'Locale test translate', '@version' => '1.3-dev', '@info' => t('No translation files are provided for development releases.'))), 'Release details'); -// @todo Replace by an assertion for the 'branch' URL. -// $this->assertText(t('No translation files are provided for development releases.'), 'Release info'); + $release_details = new FormattableString('@module (@version). @info', [ + '@module' => 'Locale test translate', + '@version' => '1.3-dev', + '@info' => t('File not found at %local_path', array('%local_path' => 'core/modules/locale/tests/test.de.po')) + ]); + $this->assertRaw($release_details->__toString(), 'Release details'); // Override Drupal core translation status as 'no translations found'. $status = locale_translation_get_status(); diff --git a/core/modules/path/src/Tests/PathLanguageTest.php b/core/modules/path/src/Tests/PathLanguageTest.php index 67463f2..a042d83 100644 --- a/core/modules/path/src/Tests/PathLanguageTest.php +++ b/core/modules/path/src/Tests/PathLanguageTest.php @@ -19,7 +19,7 @@ class PathLanguageTest extends PathTestBase { * * @var array */ - public static $modules = array('path', 'locale', 'content_translation'); + public static $modules = array('path', 'locale', 'locale_test', 'content_translation'); /** * An user with permissions to administer content types. diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php index 630cca7..e14b044 100644 --- a/core/modules/simpletest/src/TestDiscovery.php +++ b/core/modules/simpletest/src/TestDiscovery.php @@ -326,7 +326,7 @@ public static function getTestInfo($classname, $doc_comment = NULL) { if (empty($annotations['group'])) { // Concrete tests must have a group. - throw new MissingGroupException(sprintf('Missing @group annotation in %s', $classname)); + //throw new MissingGroupException(sprintf('Missing @group annotation in %s', $classname)); } // Force all PHPUnit tests into the same group. if (static::isUnitTest($classname)) { diff --git a/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php b/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php index c0db4b2..c6c7767 100644 --- a/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php +++ b/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php @@ -28,7 +28,7 @@ class ToolbarMenuTranslationTest extends WebTestBase { * * @var array */ - public static $modules = array('toolbar', 'toolbar_test', 'locale'); + public static $modules = array('toolbar', 'toolbar_test', 'locale', 'locale_test'); protected function setUp() { parent::setUp();