diff --git a/browsertest-convert.php b/browsertest-convert.php index a2c3dfb..0cd825b 100644 --- a/browsertest-convert.php +++ b/browsertest-convert.php @@ -93,6 +93,7 @@ 'EditorSecurityTest', 'QuickEditAutocompleteTermTest', 'QuickEditLoadingTest', + 'QuickEditImageControllerTest', 'DisplayTest', // https://www.drupal.org/node/2795037 'AggregatorCronTest', @@ -499,6 +500,9 @@ // Installer tests 'ConfigInstallProfileUnmetDependenciesTest', '/Installer/', + + // Simpletest UI + 'UiPhpUnitOutputTest', ]; function isTestExcluded($test_name, array $excluded_tests) { diff --git a/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php b/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php index 68e7047..12a6843 100644 --- a/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php +++ b/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php @@ -2,13 +2,8 @@ namespace Drupal\Tests\language\Functional; -<<<<<<< HEAD:core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php -use Drupal\config\Tests\SchemaCheckTestTrait; -use Drupal\Tests\BrowserTestBase; -======= use Drupal\Tests\SchemaCheckTestTrait; -use Drupal\simpletest\WebTestBase; ->>>>>>> origin/8.3.x:core/modules/language/src/Tests/LanguageConfigSchemaTest.php +use Drupal\Tests\BrowserTestBase; /** * Ensures the language config schema is correct.