tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #399 from creative-commoners/pulls/2.1/separate-test 

Update testDomainProtocol to use a dataProvider
This commit is contained in:
Daniel Hensby 2018-10-19 22:50:43 +01:00 committed by GitHub
parent 810ee63ea6 5e79abdbbc
commit 2bf4812947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tests/php/SubsiteTest.php
View File

@ -307,46 +307,42 @@ class SubsiteTest extends BaseSubsiteTest
/** /**
* Tests that Subsite and SubsiteDomain both respect http protocol correctly * Tests that Subsite and SubsiteDomain both respect http protocol correctly
*
* @param string $class Fixture class name
* @param string $identifier Fixture identifier
* @param bool $currentIsSecure Whether the current base URL should be secure
* @param string $expected The expected base URL for the subsite or subsite domain
* @dataProvider domainProtocolProvider
*/ */
public function testDomainProtocol() public function testDomainProtocol($class, $identifier, $currentIsSecure, $expected)
{ {
// domaintest2 has 'protocol' /** @var Subsite|SubsiteDomain $model */
$subsite2 = $this->objFromFixture(Subsite::class, 'domaintest2'); $model = $this->objFromFixture($class, $identifier);
$domain2a = $this->objFromFixture(SubsiteDomain::class, 'dt2a'); $protocol = $currentIsSecure ? 'https' : 'http';
$domain2b = $this->objFromFixture(SubsiteDomain::class, 'dt2b'); Config::modify()->set(Director::class, 'alternate_base_url', $protocol . '://www.mysite.com');
$this->assertSame($expected, $model->absoluteBaseURL());
}
// domaintest4 is 'https' (primary only) public function domainProtocolProvider()
$subsite4 = $this->objFromFixture(Subsite::class, 'domaintest4'); {
$domain4a = $this->objFromFixture(SubsiteDomain::class, 'dt4a'); return [
$domain4b = $this->objFromFixture(SubsiteDomain::class, 'dt4b'); // secondary domain is http only though [Subsite::class, 'domaintest2', false, 'http://two.mysite.com/'],
[SubsiteDomain::class, 'dt2a', false, 'http://two.mysite.com/'],
// domaintest5 is 'http' [SubsiteDomain::class, 'dt2b', false, 'http://subsite.mysite.com/'],
$subsite5 = $this->objFromFixture(Subsite::class, 'domaintest5'); [Subsite::class, 'domaintest4', false, 'https://www.primary.com/'],
$domain5a = $this->objFromFixture(SubsiteDomain::class, 'dt5'); [SubsiteDomain::class, 'dt4a', false, 'https://www.primary.com/'],
[SubsiteDomain::class, 'dt4b', false, 'http://www.secondary.com/'],
// Check protocol when current protocol is http:// [Subsite::class, 'domaintest5', false, 'http://www.tertiary.com/'],
Config::modify()->set(Director::class, 'alternate_base_url', 'http://www.mysite.com'); [SubsiteDomain::class, 'dt5', false, 'http://www.tertiary.com/'],
[Subsite::class, 'domaintest2', true, 'https://two.mysite.com/'],
$this->assertEquals('http://two.mysite.com/', $subsite2->absoluteBaseURL()); [SubsiteDomain::class, 'dt2a', true, 'https://two.mysite.com/'],
$this->assertEquals('http://two.mysite.com/', $domain2a->absoluteBaseURL()); [SubsiteDomain::class, 'dt2b', true, 'https://subsite.mysite.com/'],
$this->assertEquals('http://subsite.mysite.com/', $domain2b->absoluteBaseURL()); [Subsite::class, 'domaintest4', true, 'https://www.primary.com/'],
$this->assertEquals('https://www.primary.com/', $subsite4->absoluteBaseURL()); [SubsiteDomain::class, 'dt4a', true, 'https://www.primary.com/'],
$this->assertEquals('https://www.primary.com/', $domain4a->absoluteBaseURL()); [SubsiteDomain::class, 'dt4b', true, 'http://www.secondary.com/'],
$this->assertEquals('http://www.secondary.com/', $domain4b->absoluteBaseURL()); [Subsite::class, 'domaintest5', true, 'http://www.tertiary.com/'],
$this->assertEquals('http://www.tertiary.com/', $subsite5->absoluteBaseURL()); [SubsiteDomain::class, 'dt5', true, 'http://www.tertiary.com/'],
$this->assertEquals('http://www.tertiary.com/', $domain5a->absoluteBaseURL()); ];
// Check protocol when current protocol is https://
Config::modify()->set(Director::class, 'alternate_base_url', 'https://www.mysite.com');
$this->assertEquals('https://two.mysite.com/', $subsite2->absoluteBaseURL());
$this->assertEquals('https://two.mysite.com/', $domain2a->absoluteBaseURL());
$this->assertEquals('https://subsite.mysite.com/', $domain2b->absoluteBaseURL());
$this->assertEquals('https://www.primary.com/', $subsite4->absoluteBaseURL());
$this->assertEquals('https://www.primary.com/', $domain4a->absoluteBaseURL());
$this->assertEquals('http://www.secondary.com/', $domain4b->absoluteBaseURL());
$this->assertEquals('http://www.tertiary.com/', $subsite5->absoluteBaseURL());
$this->assertEquals('http://www.tertiary.com/', $domain5a->absoluteBaseURL());
} }
public function testAllSites() public function testAllSites()