From 93184c5f6666cb4d3b7f3860ef88cfd145cec537 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 1 Jul 2018 23:57:54 +0200 Subject: [PATCH] Fix travis --- .travis.yml | 14 ++------------ htdocs/core/modules/modSupplierProposal.class.php | 2 +- test/phpunit/SupplierProposalTest.php | 6 +++++- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea31a6cbe28..90a9f6355cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -341,11 +341,6 @@ script: cd - set +e echo - #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log - #cat $TRAVIS_BUILD_DIR/upgrade500600.log - #cat $TRAVIS_BUILD_DIR/upgrade500600-2.log - #cat $TRAVIS_BUILD_DIR/upgrade500600-3.log - #cat /tmp/dolibarr_install.log - | echo "Unit testing" @@ -356,17 +351,12 @@ script: echo "Phpunit return code = $phpunitresult" set +e -- | - echo "Output 50 latest lines of dolibarr.log" - ls $TRAVIS_BUILD_DIR/documents - tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log - after_script: - | - echo "After script - Debugging informations for file dolibarr.log (latest 50 lines)" + echo "After script - Output 50 latest lines of dolibarr.log" + ls $TRAVIS_BUILD_DIR/documents tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log - after_success: - | echo Success diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php index 34584ea3ffa..7b2a378019d 100644 --- a/htdocs/core/modules/modSupplierProposal.class.php +++ b/htdocs/core/modules/modSupplierProposal.class.php @@ -32,7 +32,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** - * Class to describe and enable module AskPriceSupllier + * Class to describe and enable module SupplierProposal */ class modSupplierProposal extends DolibarrModules { diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php index ee4729ed47f..292bba71497 100644 --- a/test/phpunit/SupplierProposalTest.php +++ b/test/phpunit/SupplierProposalTest.php @@ -134,6 +134,8 @@ class SupplierProposalTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; + $user->rights->supplier_proposal->creer = 1; // Not set after the reload of module done in 7.0 + $localobject=new SupplierProposal($this->savdb); $localobject->initAsSpecimen(); $result=$localobject->create($user); @@ -210,7 +212,9 @@ class SupplierProposalTest extends PHPUnit_Framework_TestCase $langs=$this->savlangs; $db=$this->savdb; - $result=$localobject->valid($user); + $user->rights->supplier_proposal->creer = 1; // Not set after the reload of module done in 7.0 + + $result=$localobject->valid($user); print __METHOD__." id=".$localobject->id." result=".$result."\n"; $this->assertLessThan($result, 0);