Merge pull request #122 from NeillM/app

Mobile app support

Author: stronk7

.travis.yml

@@ -55,13 +55,17 @@ env:
     - "PHP=7.1 DB=mariadb GIT=v3.8.0 SUITE=behat BROWSER=firefox"
     - "PHP=7.1 DB=mariadb GIT=v3.7.2 SUITE=behat BROWSER=chrome"
     - "PHP=7.0 DB=mariadb GIT=v3.5.8 SUITE=behat BROWSER=firefox"
+    # Mobile app
+    - "PHP=7.3 DB=pgsql GIT=master SUITE=app BROWSER=chrome MOBILE=next"
+    - "PHP=7.3 DB=pgsql GIT=master SUITE=app BROWSER=chrome MOBILE=latest"
 install:
     - git clone --branch $GIT --depth 1 git://github.com/moodle/moodle $HOME/moodle
     - cp config.docker-template.php $HOME/moodle/config.php
     - export MOODLE_DOCKER_DB=$DB
     - export MOODLE_DOCKER_BROWSER=$BROWSER
     - export MOODLE_DOCKER_WWWROOT="$HOME/moodle"
     - export MOODLE_DOCKER_PHP_VERSION=$PHP
+    - export MOODLE_APP_VERSION=$MOBILE
 before_script:
     - tests/setup.sh
 script:

README.md

@@ -134,6 +134,7 @@ You can change the configuration of the docker images by setting various environ
 | `MOODLE_DOCKER_WEB_HOST`                  | no        | any valid hostname                    | localhost     | The hostname for web                                |
 | `MOODLE_DOCKER_WEB_PORT`                  | no        | any integer value (or bind_ip:integer)| 127.0.0.1:8000| The port number for web. If set to 0, no port is used.<br/>If you want to bind to any host IP different from the default 127.0.0.1, you can specify it with the bind_ip:port format (0.0.0.0 means bind to all) |
 | `MOODLE_DOCKER_SELENIUM_VNC_PORT`         | no        | any integer value (or bind_ip:integer)| not set       | If set, the selenium node will expose a vnc session on the port specified. Similar to MOODLE_DOCKER_WEB_PORT, you can optionally define the host IP to bind to. If you just set the port, VNC binds to 127.0.0.1 |
+| `MOODLE_APP_VERSION`                      | no        | next, latest, or an app version number| not set       | If set will start an instance of the Mmodle app if the chrome browser is selected |
 
 ## Advanced usage
 

bin/moodle-docker-compose

@@ -44,6 +44,12 @@ if [ -f $filename ]; then
     dockercompose="${dockercompose} -f ${filename}"
 fi
 
+# Mobile app
+if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_APP_VERSION" ]];
+then
+    dockercompose="${dockercompose} -f ${basedir}/moodle-app.yml"
+fi
+
 # Selenium browser
 if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" != "firefox" ]];
 then

bin/moodle-docker-compose.cmd

@@ -34,6 +34,12 @@ if exist %filename% (
     SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%filename%"
 )
 
+IF "%MOODLE_DOCKER_BROWSER%"=="chrome" (
+    IF NOT "%MOODLE_APP_VERSION%"=="" (
+        SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\moodle-app.yml"
+    )
+)
+
 IF NOT "%MOODLE_DOCKER_BROWSER%"=="" (
     IF NOT "%MOODLE_DOCKER_BROWSER%"=="firefox" (
         SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\selenium.%MOODLE_DOCKER_BROWSER%.yml"

bin/moodle-docker-wait-for-app

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
+
+if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_APP_VERSION" ]];
+then
+    until $basedir/bin/moodle-docker-compose logs moodleapp | grep -q 'dev server running: ';
+    do
+        echo 'Waiting for Moodle app to come up...'
+        sleep 15
+    done
+fi

config.docker-template.php

@@ -58,6 +58,10 @@
 
 define('PHPUNIT_LONGTEST', true);
 
+if (getenv('MOODLE_DOCKER_APP')) {
+    $CFG->behat_ionic_wwwroot = 'http://moodleapp:8100';
+}
+
 if (getenv('MOODLE_DOCKER_PHPUNIT_EXTRAS')) {
     define('TEST_SEARCH_SOLR_HOSTNAME', 'solr');
     define('TEST_SEARCH_SOLR_INDEXNAME', 'test');

moodle-app.yml

@@ -0,0 +1,7 @@
+version: "2"
+services:
+  webserver:
+    environment:
+      MOODLE_DOCKER_APP: "true"
+  moodleapp:
+    image: "moodlehq/moodleapp:${MOODLE_APP_VERSION}"

tests/setup.sh

@@ -12,6 +12,9 @@ elif [ "$SUITE" = "phpunit-full" ];
 then
     export MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES=true
     initcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/phpunit/cli/init.php"
+elif [ "$SUITE" = "app" ];
+then
+    initcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/behat/cli/init.php"
 else
     echo "Error, unknown suite '$SUITE'"
     exit 1
@@ -23,5 +26,7 @@ echo "Starting up container"
 $basedir/bin/moodle-docker-compose up -d
 echo "Waiting for DB to come up"
 $basedir/bin/moodle-docker-wait-for-db
+echo "Waiting for Moodle app to come up"
+$basedir/bin/moodle-docker-wait-for-app
 echo "Running: $initcmd"
 $basedir/$initcmd

tests/test.sh

@@ -12,6 +12,9 @@ then
 elif [ "$SUITE" = "phpunit-full" ];
 then
     testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit --verbose"
+elif [ "$SUITE" = "app" ];
+then
+    testcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/behat/cli/run.php --tags=@app"
 else
     echo "Error, unknown suite '$SUITE'"
     exit 1