From b5f181bb18c81e7581a59ac36405eb988a6b7e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Thu, 29 Mar 2018 17:55:54 -0300 Subject: [PATCH] Improve tests --- .travis.yml | 1 + docs/dockers/docker-compose.yml | 19 +++++++++++++++++++ docs/dockers/php5/Dockerfile | 9 +++++++++ docs/dockers/php7.0/Dockerfile | 9 +++++++++ docs/dockers/php7.1/Dockerfile | 9 +++++++++ .../BuiltIn/DeployCommandWithReleasesTest.php | 6 +++--- tests/Resources/testhost-with-port.yml | 6 +++--- 7 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 docs/dockers/docker-compose.yml create mode 100644 docs/dockers/php5/Dockerfile create mode 100644 docs/dockers/php7.0/Dockerfile create mode 100644 docs/dockers/php7.1/Dockerfile diff --git a/.travis.yml b/.travis.yml index 3241d8c..51d78aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ php: - '5.6' - '7.0' - '7.1' + - '7.2' install: - composer install diff --git a/docs/dockers/docker-compose.yml b/docs/dockers/docker-compose.yml new file mode 100644 index 0000000..9bd212f --- /dev/null +++ b/docs/dockers/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' +services: + php5: + container_name: mage-php5 + build: ./php5 + volumes: + - ../../:/home/magephp + + php7.0: + container_name: mage-php7.0 + build: ./php7.0 + volumes: + - ../../:/home/magephp + + php7.1: + container_name: mage-php7.1 + build: ./php7.1 + volumes: + - ../../:/home/magephp diff --git a/docs/dockers/php5/Dockerfile b/docs/dockers/php5/Dockerfile new file mode 100644 index 0000000..c7918b4 --- /dev/null +++ b/docs/dockers/php5/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:14.04 + +RUN apt-get update && apt-get upgrade -y +RUN apt-get install -y vim curl git unzip +RUN apt-get install -y php5-cli php5-curl + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer + +WORKDIR /home/magephp diff --git a/docs/dockers/php7.0/Dockerfile b/docs/dockers/php7.0/Dockerfile new file mode 100644 index 0000000..f1da4b4 --- /dev/null +++ b/docs/dockers/php7.0/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get upgrade -y +RUN apt-get install -y vim curl git unzip +RUN apt-get install -y php7.0-cli php-zip php7.0-curl php7.0-xml + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer + +WORKDIR /home/magephp diff --git a/docs/dockers/php7.1/Dockerfile b/docs/dockers/php7.1/Dockerfile new file mode 100644 index 0000000..cb63a2b --- /dev/null +++ b/docs/dockers/php7.1/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:17.10 + +RUN apt-get update && apt-get upgrade -y +RUN apt-get install -y vim curl git unzip +RUN apt-get install -y php7.1-cli php-zip php7.1-curl php7.1-xml + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer + +WORKDIR /home/magephp diff --git a/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php b/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php index b498f6b..de3e201 100644 --- a/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php +++ b/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php @@ -94,9 +94,9 @@ class DeployCommandWithReleasesTest extends TestCase 7 => 'scp -P 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/mageXYZ tester@testhost:/var/www/test/releases/1234567890/mageXYZ', 8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && tar xfzop mageXYZ"', 9 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', - 10 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"', - 11 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"', - 12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"', + 10 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=prod"', + 11 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=prod --symlink --relative"', + 12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=prod"', 13 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', 15 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"', diff --git a/tests/Resources/testhost-with-port.yml b/tests/Resources/testhost-with-port.yml index 2c8a58d..c6e5ff6 100644 --- a/tests/Resources/testhost-with-port.yml +++ b/tests/Resources/testhost-with-port.yml @@ -19,9 +19,9 @@ magephp: - composer/install - composer/dump-autoload on-deploy: - - symfony/cache-warmup: { env: 'dev' } - - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-warmup: { env: 'prod' } + - symfony/assets-install: { env: 'prod' } + - symfony/assetic-dump: { env: 'prod' } on-release: post-release: post-deploy: \ No newline at end of file