Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
Cleanup testing
Browse files Browse the repository at this point in the history
- test folder restructured
- removes old phpunit tests
- adds a basic selenium test
- some travis adjustments
  • Loading branch information
fbergkemper committed Sep 28, 2016
1 parent 00a92bf commit 32af93e
Show file tree
Hide file tree
Showing 27 changed files with 247 additions and 1,725 deletions.
40 changes: 6 additions & 34 deletions .travis.yml
@@ -1,36 +1,8 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- hhvm

env:
- DB=postgres

before_install:
- composer self-update
- composer install --prefer-source --no-interaction --dev

before_script:
- psql -c 'create database bareos;' -U postgres
- psql bareos < tests/travis/pgsql/make_tables.sql -U postgres
- psql bareos < tests/travis/pgsql/grant_privileges.sql -U postgres
- tests/travis/config_db.sh

branches:
only:
- master

script:

after_script:

matrix:
allow_failures:
- php: hhvm
fast_finish: true

notifications:
email: false
- '5.3'
- '5.4'
- '5.5'
- '5.6'
- '7.0'
- nightly
26 changes: 13 additions & 13 deletions phpunit.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit bootstrap="tests/Bootstrap.php" colors="true">
<testsuites>
<testsuite name="bareos-webui">
<directory>./tests/JobTest</directory>
<directory>./tests/DashboardTest</directory>
<directory>./tests/DirectorTest</directory>
<directory>./tests/ClientTest</directory>
<directory>./tests/PoolTest</directory>
<directory>./tests/MediaTest</directory>
<directory>./tests/StorageTest</directory>
<directory>./tests/RestoreTest</directory>
</testsuite>
</testsuites>
<phpunit
bootstrap="tests/phpunit/Bootstrap.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
colors="true">

<testsuites>
<testsuite name="bareos-webui">
</testsuite>
</testsuites>

</phpunit>

107 changes: 0 additions & 107 deletions tests/Bootstrap.php

This file was deleted.

51 changes: 0 additions & 51 deletions tests/ClientTest/Controller/IndexControllerTest.php

This file was deleted.

59 changes: 0 additions & 59 deletions tests/ClientTest/Model/ClientTableTest.php

This file was deleted.

52 changes: 0 additions & 52 deletions tests/DashboardTest/Controller/IndexControllerTest.php

This file was deleted.

52 changes: 0 additions & 52 deletions tests/DirectorTest/Controller/IndexControllerTest.php

This file was deleted.

0 comments on commit 32af93e

Please sign in to comment.