mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge 790faa6260
into ba97de9458
This commit is contained in:
commit
598356a0a4
@ -391,7 +391,7 @@ class Deprecation
|
||||
}
|
||||
|
||||
// Getting a backtrace is slow, so we only do it if we need it
|
||||
$backtrace = null;
|
||||
$backtrace = [];
|
||||
|
||||
// Get the calling scope
|
||||
if ($scope == Deprecation::SCOPE_METHOD) {
|
||||
|
@ -111,8 +111,8 @@ class DeprecationTest extends SapphireTest
|
||||
'Will be removed without equivalent functionality to replace it.',
|
||||
'Called from SilverStripe\Dev\Tests\DeprecationTest->testNoticeNoReplacement.'
|
||||
]);
|
||||
$this->expectDeprecation();
|
||||
$this->expectDeprecationMessage($message);
|
||||
$this->expectException(DeprecationTestException::class);
|
||||
$this->expectExceptionMessage($message);
|
||||
$this->enableDeprecationNotices(true);
|
||||
$ret = $this->myDeprecatedMethodNoReplacement();
|
||||
$this->assertSame('abc', $ret);
|
||||
|
@ -138,16 +138,36 @@ class SearchContextTest extends SapphireTest
|
||||
public function testUserDefinedFieldsAppearInSearchContext()
|
||||
{
|
||||
$company = SearchContextTest\Company::singleton();
|
||||
$searchName = $company->getGeneralSearchFieldName();
|
||||
$expected = new FieldList(
|
||||
new HiddenField($searchName, 'General Search'),
|
||||
(new TextField("Name", 'Name'))
|
||||
->setMaxLength(255),
|
||||
new TextareaField("Industry", 'Industry'),
|
||||
new NumericField("AnnualProfit", 'The Almighty Annual Profit')
|
||||
);
|
||||
$context = $company->getDefaultSearchContext();
|
||||
$actual = $context->getFields();
|
||||
$this->assertSame($expected->count(), $actual->count());
|
||||
$this->assertEquals(
|
||||
new FieldList(
|
||||
new HiddenField($company->getGeneralSearchFieldName(), 'General Search'),
|
||||
(new TextField("Name", 'Name'))
|
||||
->setMaxLength(255),
|
||||
new TextareaField("Industry", 'Industry'),
|
||||
new NumericField("AnnualProfit", 'The Almighty Annual Profit')
|
||||
),
|
||||
$context->getFields()
|
||||
$expected->fieldByName($searchName)->Title,
|
||||
$actual->fieldByName($searchName)->Title
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected->fieldByName('Name')->Title,
|
||||
$actual->fieldByName('Name')->Title
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected->fieldByName('Name')->getMaxLength(),
|
||||
$actual->fieldByName('Name')->getMaxLength()
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected->fieldByName('Industry')->Title,
|
||||
$actual->fieldByName('Industry')->Title
|
||||
);
|
||||
$this->assertEquals(
|
||||
$expected->fieldByName('AnnualProfit')->Title,
|
||||
$actual->fieldByName('AnnualProfit')->Title
|
||||
);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user