From f3d64abd55be59c9d337705ade8575641ea7972c Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 4 Apr 2017 16:02:44 +1200
Subject: [PATCH] Add combined test suite for installer Remove teamcity config
 from default install Partial implementation of #164 Fixes #166

---
 .gitattributes             | 15 ++++------
 .travis.yml                | 57 ++++++++++++++++++++++++++++++++++++++
 phpunit.teamcity.mssql.xml | 32 ---------------------
 phpunit.xml.dist           | 18 ++++++++++++
 4 files changed, 81 insertions(+), 41 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 phpunit.teamcity.mssql.xml

diff --git a/.gitattributes b/.gitattributes
index 4ff3c7d..d33a7e9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,14 +1,11 @@
-.gitattributes export-ignore
 .cow.json export-ignore
+.editorconfig export-ignore
+.env.example export-ignore
+.gitattributes export-ignore
+.travis.yml export-ignore
 behat.yml export-ignore
-build.properties.default export-ignore
 build.xml export-ignore
-changelog-definitions.default export-ignore
 CONTRIBUTING.md export-ignore
-dependent-modules.default export-ignore
-Makefile export-ignore
-phpunit.teamcity.mssql.xml export-ignore
-phpunit.teamcity.postgresql.xml export-ignore
-phpunit.teamcity.sqlite3.xml export-ignore
-phpunit.teamcity.xml export-ignore
+LICENSE export-ignore
 phpunit.xml.dist export-ignore
+README.md
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..a1ce9dc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,57 @@
+language: php
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - tidy
+
+env:
+  global:
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
+    - DB=MYSQL
+
+matrix:
+  fast_finish: true
+  include:
+    # Core php tests
+    - php: 5.6
+      env:
+        - PHPUNIT_TEST=core
+    - php: 7.1.2
+      env:
+        - PHPUNIT_TEST=core
+        - PDO=1
+    # admin php tests
+    - php: 5.6
+      env:
+        - PHPUNIT_TEST=admin
+    - php: 7.1.2
+      env:
+        - PHPUNIT_TEST=admin
+        - PDO=1
+    # @todo behat tests
+
+before_script:
+# Init PHP
+  - export CORE_RELEASE=$TRAVIS_BRANCH
+  - printf "\n" | pecl install imagick
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+# Install composer dependencies
+  - composer install --prefer-dist
+  - composer require silverstripe/framework 4.0.x-dev silverstripe/config:1.0.x-dev embed/embed ^3.0 silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist
+  - if [[ $PHPUNIT_TEST == admin ]]; then composer require silverstripe/cms:4.0.x-dev silverstripe/asset-admin:1.0.x-dev silverstripe/campaign-admin:1.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/reports:4.0.x-dev --prefer-dist; fi
+
+# Bootstrap dependencies
+  - if [[ $PHPUNIT_TEST == admin ]]; then php ./cms/tests/bootstrap/mysite.php; fi
+
+script:
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite $PHPUNIT_TEST; fi
+
+notifications:
+  slack: silverstripeltd:Cls1xnypKBLFhv0YIRtNLzlQ
+
diff --git a/phpunit.teamcity.mssql.xml b/phpunit.teamcity.mssql.xml
deleted file mode 100644
index 8778e28..0000000
--- a/phpunit.teamcity.mssql.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
-
-	<testsuite name="Default">
-		<directory>mysite/tests</directory>
-		<directory>cms/tests</directory>
-		<directory>framework/tests</directory>
-		<directory>mssql/tests</directory>
-	</testsuite>
-
-	<listeners>
-    	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
-	</listeners>
-
-	<groups>
-		<exclude>
-			<group>sanitychecks</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<!-- 
-			Set different database connection.
-			Relies on the presence of the 'zframeworktest_dbswitcher' module
-			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-			as well as on constants in _ss_environment.php (see module README).
-		-->
-	  <get name="db" value="mssql"/>
-	  <!-- Always flush the manifest -->
-	  <get name="flush" value="1"/>
-	</php>
-
-</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8cde0ae..586da26 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -24,6 +24,24 @@
 		<directory>framework/tests</directory>
 	</testsuite>
 
+    <!-- core components -->
+    <testsuite name="core">
+		<directory>framework/tests/php/</directory>
+		<directory>silverstripe-assets/tests/php/</directory>
+        <directory>versioned/tests/php/</directory>
+    </testsuite>
+
+    <!-- admin components -->
+    <testsuite name="admin">
+        <directory>cms/tests/</directory>
+        <directory>silverstripe-admin/tests/php/</directory>
+        <directory>campaign-admin/tests/php/</directory>
+        <directory>asset-admin/tests/php/</directory>
+        <directory>graphql/tests/</directory>
+        <directory>siteconfig/tests/</directory>
+        <directory>reports/tests/</directory>
+    </testsuite>
+
 	<groups>
 		<exclude>
 			<group>sanitychecks</group>