tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.5' into 1

Browse Source
This commit is contained in:
Robbie Averill 2019-07-23 15:23:58 +02:00
commit 8584040e4d
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@ -2,26 +2,18 @@
language: php language: php
sudo: false dist: trusty
dist: precise
php:
- 5.4
env:
- DB=MYSQL CORE_RELEASE=3.5
matrix: matrix:
include: include:
- php: 5.3 - php: '7.1'
env: DB=PGSQL CORE_RELEASE=3.4 env: DB=PGSQL CORE_RELEASE=3.7
- php: 5.6 - php: '7.1'
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.7
- php: 5.4 - php: '7.2'
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.7
- php: 7.1 - php: '7.3'
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.7
before_script: before_script:
- composer self-update || true - composer self-update || true

12
composer.json
View File

@ -15,15 +15,11 @@
} }
], ],
"require": { "require": {
"silverstripe/framework": "~3.2", "silverstripe/framework": "~3.7",
"silverstripe/cms": "~3.2" "silverstripe/cms": "~3.7"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7@stable" "phpunit/phpunit": "^5.7"
}, },
"extra": { "extra": []
"branch-alias": {
"1.x-dev": "1.5.x-dev"
}
}
} }

7
tests/SubsiteXHRControllerTest.php
View File

@ -1,10 +1,7 @@
<?php <?php
/** /**
* Created by PhpStorm. * @mixin PHPUnit_Framework_TestCase
* User: dmooyman
* Date: 27/05/16
* Time: 3:10 PM
*/ */
class SubsiteXHRControllerTest extends FunctionalTest class SubsiteXHRControllerTest extends FunctionalTest
{ {
@ -34,7 +31,7 @@ class SubsiteXHRControllerTest extends FunctionalTest
'X-Requested-With' => 'XMLHttpRequest' 'X-Requested-With' => 'XMLHttpRequest'
)); ));
$this->assertEquals(200, $result->getStatusCode()); $this->assertEquals(200, $result->getStatusCode());
$this->assertEquals('text/json', $result->getHeader('Content-Type')); $this->assertEquals('application/json', $result->getHeader('Content-Type'));
$body = $result->getBody(); $body = $result->getBody();
$this->assertContains('Main site', $body); $this->assertContains('Main site', $body);
$this->assertContains('Test 1', $body); $this->assertContains('Test 1', $body);