Skip to content

Commit

Permalink
Merge branch 'release/0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dwenzel committed Aug 2, 2017
2 parents a15ac90 + 3b71839 commit dded736
Show file tree
Hide file tree
Showing 24 changed files with 307 additions and 84 deletions.
3 changes: 0 additions & 3 deletions .coveralls.yml

This file was deleted.

17 changes: 2 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ cache:
directories:
- $HOME/.composer/cache

before_install:
- composer self-update
- composer --version

before_script:
- composer require typo3/cms=$TYPO3_VERSION
- git checkout composer.json
Expand All @@ -42,7 +38,7 @@ script:
if [[ "$COVERAGE" != "1" ]]; then
echo;
echo "Running unit tests";
.Build/bin/phpunit --colors -c Tests/Build/UnitTests.xml Tests/Unit/
.Build/bin/phpunit --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/
fi
- >
Expand All @@ -58,16 +54,7 @@ script:
export typo3DatabaseHost="localhost";
export typo3DatabaseUsername="root";
export typo3DatabasePassword="";
find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --coverage-clover=.Build/log/coverage/{}functionaltest.clover --colors -c .Build/vendor/typo3/cms/typo3/sysext/core/Build/FunctionalTests.xml {}'
after_script:
- >
if [[ "$COVERAGE" == "1" ]]; then
export COVERALLS_SERVICE_NAME=travis-ci;
echo;
echo "Running coveralls";
.Build/bin/coveralls -v
fi
find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --coverage-clover=.Build/log/coverage/{}functionaltest.clover --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml {}'
after_success:
- >
Expand Down
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2017-08-02 [RELEASE] Release of t3events_course 0.8.0 (Dirk Wenzel)
2017-04-25 d1442f0 [BUGFIX] save unit test coverage file in folder .Build/log/coverage/Unit (Dirk Wenzel)
2017-04-25 8c6f708 [TASK] travis-ci: use custom UnitTests.xml instead of those from testing frame work (Dirk Wenzel)
2017-04-19 6bae961 [BUGFIX] travis-ci: fix path of configuration file for functional tests (Dirk Wenzel)
2017-04-19 a0d0966 [TASK] allow TYPO3 8.7.x (Dirk Wenzel)
2017-04-19 cd297bf [TASK] use nimut/testing-framework, drop coveralls reports (Dirk Wenzel)
2017-03-07 57edd6e [TASK] require-dev phpunit/phpunit:<=4.8.0,<5.4 (Dirk Wenzel)
2017-01-17 8f563f8 [TASK] composer.json: restore preferred-install 'source' for typo3/cms (functional test class does not exist in dist) (Dirk Wenzel)
2017-01-17 52004ac [TASK] composer.json updated. Obsolete package mikey179/vfsStream removed, typo3/cms-core replaced by typo3/cms (Dirk Wenzel)
2017-01-17 5a705b3 [TASK] SVG icons for backend modules added. (Dirk Wenzel)

2017-01-05 [RELEASE] Release of t3events_course 0.7.1 (Dirk Wenzel)
2016-12-30 31cd59c [TASK] deprecated settings replaced in table configuration (Dirk Wenzel)
2016-12-30 0662cb3 [TASK] deprecated settings replaced in table configuration. Made configuration of of TCA wizards compatible with TYPO3 version 6.2 and newer. (Dirk Wenzel)
Expand Down
104 changes: 104 additions & 0 deletions Resources/Public/Icons/calendar-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
132 changes: 132 additions & 0 deletions Resources/Public/Icons/open-book.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 26 additions & 26 deletions Tests/Build/UnitTests.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="../../.Build/Web/typo3/sysext/core/Build/UnitTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
verbose="false">
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../../.Build/vendor/nimut/testing-framework/res/Configuration/UnitTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
verbose="false">

<testsuites>
<testsuite name="EXT:t3events_course tests">
<directory>../Unit/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="false">
<directory suffix=".php">../../Classes/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
</logging>
<testsuites>
<testsuite name="EXT:t3events_course tests">
<directory>../Unit/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="false">
<directory suffix=".php">../../Classes/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
</logging>

</phpunit>
4 changes: 2 additions & 2 deletions Tests/Unit/Controller/Backend/CourseBackendControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use DWenzel\T3events\Domain\Model\Dto\DemandInterface;
use DWenzel\T3events\Domain\Model\Dto\ModuleData;
use CPSIT\T3eventsCourse\Domain\Repository\CourseRepository;
use TYPO3\CMS\Core\Tests\UnitTestCase;
use Nimut\TestingFramework\TestCase\UnitTestCase;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;

Expand Down Expand Up @@ -210,4 +210,4 @@ public function listActionAssignsTemplateVariablesToView()
$this->subject->listAction();
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use DWenzel\T3events\Domain\Model\Dto\DemandInterface;
use DWenzel\T3events\Domain\Model\Dto\ModuleData;
use DWenzel\T3events\Domain\Repository\PerformanceRepository;
use TYPO3\CMS\Core\Tests\UnitTestCase;
use Nimut\TestingFramework\TestCase\UnitTestCase;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;

/**
Expand Down Expand Up @@ -183,4 +183,4 @@ public function listActionAssignsTemplateVariablesToView()
$this->subject->listAction();
}

}
}
2 changes: 1 addition & 1 deletion Tests/Unit/Controller/CourseControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use DWenzel\T3events\Domain\Model\Dto\ModuleData;
use CPSIT\T3eventsCourse\Domain\Repository\CourseRepository;
use DWenzel\T3events\Session\SessionInterface;
use TYPO3\CMS\Core\Tests\UnitTestCase;
use Nimut\TestingFramework\TestCase\UnitTestCase;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Mvc\Request;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
Expand Down
Loading

0 comments on commit dded736

Please sign in to comment.