diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd67162b..f3d3fbaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,17 @@ variables: stages: - build + - test - deploy - - deploy + +unit_test: + stage: test + script: + - cp .env.example .env + - composer install + - php artisan key:generate + - php artisan migrate + - vendor/bin/phpunit build: stage: build diff --git a/.phpunit.result.cache b/.phpunit.result.cache index c6a7c98c..c6c092d1 100644 --- a/.phpunit.result.cache +++ b/.phpunit.result.cache @@ -1 +1 @@ -C:30:"PHPUnit\Runner\TestResultCache":187:{a:2:{s:7:"defects";a:1:{s:32:"Tests\Browser\UserTest::testUser";i:3;}s:5:"times";a:2:{s:34:"Tests\Browser\LoginTest::testLogin";d:5.605;s:32:"Tests\Browser\UserTest::testUser";d:14.139;}}} \ No newline at end of file +C:37:"PHPUnit\Runner\DefaultTestResultCache":272:{a:2:{s:7:"defects";a:2:{s:32:"Tests\Feature\AdminTest::testUrl";i:3;s:30:"Tests\Feature\ECCTest::testUrl";i:3;}s:5:"times";a:3:{s:32:"Tests\Feature\AdminTest::testUrl";d:0.098;s:30:"Tests\Feature\ECCTest::testUrl";d:0.014;s:33:"Tests\Feature\PublicTest::testUrl";d:0.03;}}} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d399c989..146a6e18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set the base image for subsequent instructions -FROM php:7.3 +FROM php:7.4 # Update packages RUN apt-get update diff --git a/Envoy.blade.php b/Envoy.blade.php index 9ac6ba0a..ba66908d 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -41,6 +41,7 @@ clone_repository_dev run_composer_dev update_symlinks_dev + remove_old_release_dev @endstory @story('deploy_227') @@ -160,6 +161,11 @@ @endtask +@task('remove_old_release_dev') + cd {{ $releases_dir_dev@ }} + rm -fr $(ls -t1 | tail -n +3) +@endtask + @task('clone_repository_227') echo 'Cloning repository' [ -d {{ $releases_dir_227 }} ] || mkdir {{ $releases_dir_227 }} diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php index bd8e499d..ae68668d 100644 --- a/tests/Feature/AdminTest.php +++ b/tests/Feature/AdminTest.php @@ -19,7 +19,7 @@ class AdminTest extends TestCase $urls = [ 'admin', - 'admin/calendar', + 'admin/schedule', 'admin/message', 'admin/message/add', 'admin/inventory', diff --git a/tests/Feature/ECCTest.php b/tests/Feature/ECCTest.php deleted file mode 100644 index 4eae8ddd..00000000 --- a/tests/Feature/ECCTest.php +++ /dev/null @@ -1,54 +0,0 @@ -get($url); - if((int)$response->status() === 404){ - echo $appURL . $url . ' (FAILED) return a 404.'; - $this->assertTrue(false); - } else { - echo $appURL . $url . ' (SUCCESS)'; - $this->assertTrue(true); - } - echo PHP_EOL; - } - - foreach ($urls as $url) { - $response = $this->get($url); - if((int)$response->status() === 500){ - echo $appURL . $url . ' (FAILED) return a 500.'; - $this->assertTrue(false); - } else { - echo $appURL . $url . ' (SUCCESS)'; - $this->assertTrue(true); - } - echo PHP_EOL; - } - } -}