update drupal
This commit is contained in:
+1
-1
@@ -44,7 +44,7 @@ class BlockCustomTranslation extends DrupalSqlBase {
|
||||
|
||||
// Add in the property, which is either title or body. Cast the bid to text
|
||||
// so PostgreSQL can make the join.
|
||||
$query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'i18n.objectid = CAST(b.bid as CHAR(255))');
|
||||
$query->leftJoin(static::I18N_STRING_TABLE, 'i18n', 'i18n.objectid = CAST(b.bid AS CHAR(255))');
|
||||
$query->condition('i18n.type', 'block');
|
||||
|
||||
// Add in the translation for the property.
|
||||
|
||||
@@ -204,7 +204,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
|
||||
$this->fail('Expected exception has not been thrown.');
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
$this->pass('Expected exception has been thrown.');
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
$connection = Database::getConnection();
|
||||
|
||||
+1
-3
@@ -145,12 +145,10 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
|
||||
$entity->addTranslation('it', $values);
|
||||
|
||||
try {
|
||||
$message = 'Blocks can have translations with the same "info" value.';
|
||||
$entity->save();
|
||||
$this->pass($message);
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
$this->fail($message);
|
||||
$this->fail('Blocks can have translations with the same "info" value.');
|
||||
}
|
||||
|
||||
// Check that the translate operation link is shown.
|
||||
|
||||
+4
-9
@@ -33,15 +33,10 @@ class MigrateBlockContentStubTest extends MigrateDrupalTestBase {
|
||||
* Tests creation of block content stubs with no block_content_type available.
|
||||
*/
|
||||
public function testStubFailure() {
|
||||
$message = 'Expected MigrateException thrown when no bundles exist.';
|
||||
try {
|
||||
$this->createEntityStub('block_content');
|
||||
$this->fail($message);
|
||||
}
|
||||
catch (MigrateException $e) {
|
||||
$this->pass($message);
|
||||
$this->assertEqual('Stubbing failed, no bundles available for entity type: block_content', $e->getMessage());
|
||||
}
|
||||
// Expected MigrateException thrown when no bundles exist.
|
||||
$this->expectException(MigrateException::class);
|
||||
$this->expectExceptionMessage('Stubbing failed, no bundles available for entity type: block_content');
|
||||
$this->createEntityStub('block_content');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user