Merge pull request #159 from timhunt/fixes

Unit test fixes

Author: trampgeek

.github/workflows/ci.yml

@@ -9,16 +9,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - php: '8.0'
+            moodle-branch: 'master'
+            database: 'pgsql'
           - php: '7.4'
-            moodle-branch: 'MOODLE_400_STABLE'
+            moodle-branch: 'MOODLE_401_STABLE'
             database: 'pgsql'
           - php: '7.3'
             moodle-branch: 'MOODLE_400_STABLE'
             database: 'mariadb'
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:13
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -119,7 +122,7 @@ jobs:
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'MOODLE_400_STABLE' }}
         run: moodle-plugin-ci grunt
 
       - name: PHPUnit tests

tests/phpquestions_test.php

@@ -39,6 +39,7 @@
 class phpquestions_test extends \qtype_coderunner_testcase {
 
     public function test_good_sqr_function() {
+        $this->check_language_available('php');
         $q = $this->make_question('sqrphp');
         $response = array('answer' => "<?php\nfunction sqr(\$n) { return \$n * \$n; }\n");
         list($mark, $grade, $cache) = $q->grade_response($response);
@@ -52,6 +53,7 @@ public function test_good_sqr_function() {
 
 
     public function test_bad_sqr_function() {
+        $this->check_language_available('php');
         $q = $this->make_question('sqrphp');
         $response = array('answer' => "<?php\nfunction sqr(\$n) { return \$n; }\n");
         list($mark, $grade, $cache) = $q->grade_response($response);
@@ -65,6 +67,7 @@ public function test_bad_sqr_function() {
 
 
     public function test_bad_syntax() {
+        $this->check_language_available('php');
         $q = $this->make_question('sqrphp');
         $response = array('answer' => "<?php\nfunction sqr(\$n) { return \$n\n");
         list($mark, $grade, $cache) = $q->grade_response($response);

tests/walkthrough_test.php

@@ -24,8 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use qtype_coderunner\constants;
-
 namespace qtype_coderunner;
 
 defined('MOODLE_INTERNAL') || die();