diff --git a/.travis.yml b/.travis.yml index 26b3e41..074ae4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ jobs: env: BRANCH=1.7.5.x - php: 7.2 env: BRANCH=1.7.5.x + after_success: bash <(curl -s https://codecov.io/bash) before_script: make before_script diff --git a/Makefile b/Makefile index 82aa8f4..65aee33 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ delete_archive: rm -f $(ARCHIVE_NAME) rm -f /tmp/retailcrm.zip -composer: clone_prestashop +composer: @cd $(PRESTASHOP_DIR) && git checkout $(BRANCH) ifeq ($(COMPOSER_IN_TESTS),1) @cd $(PRESTASHOP_DIR)/tests && composer install @@ -56,6 +56,6 @@ test: ifeq ($(COMPOSER_IN_TESTS),1) phpunit else - cd $(PRESTASHOP_DIR) && composer run-script create-test-db --timeout=0 +# cd $(PRESTASHOP_DIR) && composer run-script create-test-db --timeout=0 cd $(PRESTASHOP_DIR) && php vendor/bin/phpunit -c $(ROOT_DIR)/phpunit.xml.dist endif diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 08ad0ef..029c9de 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -30,4 +30,7 @@ + + + \ No newline at end of file diff --git a/tests/bootstrap.php b/tests/bootstrap.php index fb75d62..c2cafba 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,6 +1,6 @@