Skip to content
Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
parkerj committed Oct 3, 2016
2 parents 95e67a3 + 13a11d1 commit 53ed300e367259ae0ca43f26eedf17b4e9e59ae1
Showing with 20 additions and 13 deletions.
  1. +8 −1 .travis.yml
  2. +9 −9 phpunit.xml
  3. +3 −3 tests/{TestCase.php → LitenTest.php}
@@ -1,8 +1,15 @@
language: php

php:
- "5.4"
- "5.5"
- "5.6"

before_script:
- composer self-update || true
- composer install
script: phpunit --configuration phpunit.xml --coverage-text

cache:
directories:
- vendor
- $COMPOSER_CACHE_DIR
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="Liten/Bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false">
syntaxCheck="false"
bootstrap="vendor/autoload.php">

<testsuites>
<testsuite name="Application Test Suite">
<directory suffix="Tests">./tests</directory>
<testsuite name="Liten">
<directory>tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory>./Liten</directory>
<whitelist>
<directory>Liten</directory>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="DEV"/>
</php>
</phpunit>
@@ -1,8 +1,8 @@
<?php namespace Tests;
<?php namespace Liten\Tests;
use \Liten;
use \Liten\Liten;
class RouterTest extends \PHPUnit_Framework_TestCase
class LitenTest extends \PHPUnit_Framework_TestCase
{
public function testMapRouting()

0 comments on commit 53ed300

Please sign in to comment.
You can’t perform that action at this time.