Merge branch '1'

This commit is contained in:
Daniel Hensby 2017-07-26 14:24:11 +01:00
commit d7118b6267
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 5 additions and 3 deletions

View File

@ -9,7 +9,7 @@ php:
env: env:
global: global:
- DB="POSTGRESQL" - DB="PGSQL"
- CORE_RELEASE="4" - CORE_RELEASE="4"
before_script: before_script:
@ -24,7 +24,7 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer install --prefer-dist - composer install --prefer-dist
- composer require --prefer-dist --no-update symfony/config:^3.2 silverstripe/framework:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev - composer require --prefer-dist --no-update symfony/config:^3.2 silverstripe/framework:4.0.x-dev silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev
- composer update - composer update
script: script:

View File

@ -1,4 +1,4 @@
<phpunit bootstrap="framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="cms/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>tests</directory> <directory>tests</directory>

View File

@ -11,6 +11,8 @@ use SilverStripe\PostgreSQL\PostgreSQLDatabase;
*/ */
class PostgreSQLDatabaseTest extends SapphireTest class PostgreSQLDatabaseTest extends SapphireTest
{ {
protected $usesDatabase = true;
public function testReadOnlyTransaction() public function testReadOnlyTransaction()
{ {
if ( if (