mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
ENHANCEMENT: Enable tests disabled in 2.4, as they all work now
This commit is contained in:
parent
f6587c4ea2
commit
cc4d23061e
@ -218,10 +218,8 @@ after')
|
||||
// Dot syntax
|
||||
$this->assertEquals('ACD',
|
||||
$this->render('A<% if Foo.NotSet %>B<% else_if Foo.IsSet %>C<% end_if %>D'));
|
||||
|
||||
// Broken currently
|
||||
//$this->assertEquals('ACD',
|
||||
// $this->render('A<% if Foo.Bar.NotSet %>B<% else_if Foo.Bar.IsSet %>C<% end_if %>D'));
|
||||
$this->assertEquals('ACD',
|
||||
$this->render('A<% if Foo.Bar.NotSet %>B<% else_if Foo.Bar.IsSet %>C<% end_if %>D'));
|
||||
|
||||
// Params
|
||||
$this->assertEquals('ACD',
|
||||
@ -236,12 +234,10 @@ after')
|
||||
$this->render('A<% if NotSet || AlsoNotSet %>B<% else_if IsSet %>C<% end_if %>D'));
|
||||
$this->assertEquals('AD',
|
||||
$this->render('A<% if NotSet || AlsoNotSet %>B<% else_if NotSet3 %>C<% end_if %>D'));
|
||||
|
||||
// Broken currently
|
||||
//$this->assertEquals('ACD',
|
||||
// $this->render('A<% if NotSet || AlsoNotSet %>B<% else_if IsSet || NotSet %>C<% end_if %>D'));
|
||||
//$this->assertEquals('AD',
|
||||
// $this->render('A<% if NotSet || AlsoNotSet %>B<% else_if NotSet2 || NotSet3 %>C<% end_if %>D'));
|
||||
$this->assertEquals('ACD',
|
||||
$this->render('A<% if NotSet || AlsoNotSet %>B<% else_if IsSet || NotSet %>C<% end_if %>D'));
|
||||
$this->assertEquals('AD',
|
||||
$this->render('A<% if NotSet || AlsoNotSet %>B<% else_if NotSet2 || NotSet3 %>C<% end_if %>D'));
|
||||
|
||||
// And
|
||||
$this->assertEquals('ABD',
|
||||
@ -250,12 +246,10 @@ after')
|
||||
$this->render('A<% if IsSet && NotSet %>B<% else_if IsSet %>C<% end_if %>D'));
|
||||
$this->assertEquals('AD',
|
||||
$this->render('A<% if NotSet && NotSet2 %>B<% else_if NotSet3 %>C<% end_if %>D'));
|
||||
|
||||
// Broken currently
|
||||
//$this->assertEquals('ACD',
|
||||
// $this->render('A<% if IsSet && NotSet %>B<% else_if IsSet && AlsoSet %>C<% end_if %>D'));
|
||||
//$this->assertEquals('AD',
|
||||
// $this->render('A<% if NotSet && NotSet2 %>B<% else_if IsSet && NotSet3 %>C<% end_if %>D'));
|
||||
$this->assertEquals('ACD',
|
||||
$this->render('A<% if IsSet && NotSet %>B<% else_if IsSet && AlsoSet %>C<% end_if %>D'));
|
||||
$this->assertEquals('AD',
|
||||
$this->render('A<% if NotSet && NotSet2 %>B<% else_if IsSet && NotSet3 %>C<% end_if %>D'));
|
||||
|
||||
// Equality
|
||||
$this->assertEquals('ABC',
|
||||
@ -345,6 +339,7 @@ class SSViewerTestFixture extends ViewableData {
|
||||
|
||||
function __construct($name = null) {
|
||||
$this->name = $name;
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user