Fix scripts

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

Author: AenBleidd

.scrutinizer.yml

@@ -13,6 +13,7 @@ build:
                 override:
                     - command: phpcs-run
                       use_website_config: true
+                    - command: phpunit
                     - php-scrutinizer-run
                     - js-scrutinizer-run
 filter:
@@ -27,6 +28,7 @@ filter:
         - '*.min.js'
         - 'drupal/sites/default/modules/boinc/*'
         - 'drupal/sites/default/themes/boinc/*'
+        - 'tests/server-test/*'
     dependency_paths:
         - 'html/inc/htmLawed.php'
         - 'drupal/sites/all/libraries/*'

tests/integration_test/executeTestSuite.sh

@@ -56,13 +56,13 @@ isPathSubpath() {
 }
 
 # check working directory because the script needs to be called like: ./integration_test/installTestSuite.sh
-if [ ! -d "integration_test" ]; then
+if [ ! -d "tests/integration_test" ]; then
     echo "start this script in the source root directory"
     exit 1
 fi
 
 ROOTDIR=$(pwd)
-PREFIX=$(realpath -s $ROOTDIR/../bst)
+PREFIX=$(realpath -s $ROOTDIR/tests/server-test)
 test_dir=""
 while [[ $# -gt 0 ]]; do
     key="$1"

tests/integration_test/installTestSuite.sh

@@ -57,7 +57,7 @@ isPathSubpath() {
 }
 
 # check working directory because the script needs to be called like: ./integration_test/installTestSuite.sh
-if [ ! -d "integration_test" ]; then
+if [ ! -d "tests/integration_test" ]; then
     echo "start this script in the source root directory"
     exit 1
 fi
@@ -94,11 +94,11 @@ if [ "x$test_dir" != "x" ]; then
 fi
 
 cd "${PREFIX}/tests" || exit 1
-composer require phpunit/phpunit
+composer require --dev phpunit/phpunit
 if [ $? -ne 0 ]; then exit 1; fi
-composer require guzzlehttp/guzzle
+composer require --dev guzzlehttp/guzzle
 if [ $? -ne 0 ]; then exit 1; fi
-composer update
+composer update --dev
 if [ $? -ne 0 ]; then exit 1; fi
 cd .. || exit 1
 

tests/server-test/manage/roles/clone-boinc-server-docker/tasks/clone_boinc_server_docker.yml

@@ -2,10 +2,7 @@
   file: path="{{base_dir}}/boinc-server-docker" state=absent
 
 - name: "Clone boinc-server-docker to {{base_dir}}"
-  command: git clone https://github.com/marius311/boinc-server-docker.git chdir="{{base_dir}}"
-
-- name: "Use 28df02f75c07650c53a7c5f0a389118f48698fda commit of boinc-server-docker"
-  command: git checkout 28df02f75c07650c53a7c5f0a389118f48698fda chdir="{{base_dir}}/boinc-server-docker"
+  command: git clone https://github.com/BOINC/boinc-server-docker.git chdir="{{base_dir}}"
 
 - name: Init some submodules
   command: git submodule init images/makeproject/boinc2docker images/makeproject/html/inc/phpmailer chdir="{{base_dir}}/boinc-server-docker"