Skip to content

Commit ccfffbc

Browse files
committed
Deploy test modules before api-functional tests
1 parent 4349d02 commit ccfffbc

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
# - TEST_SUITE=integration INTEGRATION_INDEX=2
3434
# - TEST_SUITE=integration INTEGRATION_INDEX=3
3535
# - TEST_SUITE=functional
36-
- TEST_SUITE=api-functional
36+
- TEST_SUITE=graphql-api-functional
3737
matrix:
3838
exclude:
3939
- php: 7.1
@@ -66,4 +66,4 @@ script:
6666
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6767
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "api" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6868
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
69-
- if [ $TEST_SUITE == "api-functional" ]; then phpunit -c dev/tests/api-functional; fi
69+
- if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

dev/travis/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ $TEST_SUITE == "js" ]; then
3434
yarn global add grunt-cli
3535
fi
3636

37-
if [ $TEST_SUITE = "functional" ] || [ $TEST_SUITE = "api-functional" ]; then
37+
if [ $TEST_SUITE = "functional" ] || [ $TEST_SUITE = "graphql-api-functional" ]; then
3838
# Install apache
3939
sudo apt-get update
4040
sudo apt-get install apache2 libapache2-mod-fastcgi

dev/travis/before_script.sh

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -135,34 +135,35 @@ case $TEST_SUITE in
135135
cd ../../..
136136
;;
137137

138-
api-functional)
138+
graphql-api-functional)
139139
echo "Installing Magento"
140140
mysql -uroot -e 'CREATE DATABASE magento2;'
141-
# php bin/magento setup:install -q \
142-
# --language="en_US" \
143-
# --timezone="UTC" \
144-
# --currency="USD" \
145-
# --base-url="http://${MAGENTO_HOST_NAME}/" \
146-
# --admin-firstname="John" \
147-
# --admin-lastname="Doe" \
148-
# --backend-frontname="backend" \
149-
# --admin-email="[email protected]" \
150-
# --admin-user="admin" \
151-
# --use-rewrites=1 \
152-
# --admin-use-security-key=0 \
153-
# --admin-password="123123q"
154-
155-
# echo "Enabling production mode"
156-
# php bin/magento deploy:mode:set production
141+
php bin/magento setup:install -q \
142+
--language="en_US" \
143+
--timezone="UTC" \
144+
--currency="USD" \
145+
--base-url="http://${MAGENTO_HOST_NAME}/" \
146+
--admin-firstname="John" \
147+
--admin-lastname="Doe" \
148+
--backend-frontname="backend" \
149+
--admin-email="[email protected]" \
150+
--admin-user="admin" \
151+
--use-rewrites=1 \
152+
--admin-use-security-key=0 \
153+
--admin-password="123123q"
154+
155+
echo "Enabling production mode"
156+
php bin/magento deploy:mode:set production
157157

158158
echo "Prepare api-functional tests for running"
159159
cd dev/tests/api-functional
160-
cp config/install-config-mysql.php.dist config/install-config-mysql.php
161-
sed -e "s?http://localhost/?http://${MAGENTO_HOST_NAME}/?g" --in-place ./config/install-config-mysql.php
160+
cp -r _files/Magento/* ../../../app/code/Magento # Deploy and enable test modules before running tests
161+
php ../../../bin/magento setup:upgrade
162162

163163
cp ./phpunit_graphql.xml.dist ./phpunit.xml
164164
sed -e "s?magento.url?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
165165

166166
cd ../../..
167+
php bin/magento setup:upgrade
167168
;;
168169
esac

0 commit comments

Comments
 (0)