Improve the way of setting jobehost during behat testing by moving th…

…e special case hack to ajax.php so that the test-sandbox-config file is always used.

ajax.php

@@ -33,8 +33,13 @@
  */
 
 define('AJAX_SCRIPT', true);
-
 require_once(__DIR__ . '/../../../config.php');
+
+// Hack to prevent AJAX calls from overwriting the test-sandbox-config during behat testing
+if ($CFG->prefix === $CFG->behat_prefix) {
+    require_once('/var/www/html/moodle/question/type/coderunner/tests/fixtures/test-sandbox-config.php');
+}
+
 require_once($CFG->dirroot . '/question/engine/lib.php');
 require_once($CFG->dirroot . '/question/type/coderunner/questiontype.php');
 

classes/jobesandbox.php

@@ -70,14 +70,7 @@ class qtype_coderunner_jobesandbox extends qtype_coderunner_sandbox {
     public function __construct() {
         global $CFG;
         qtype_coderunner_sandbox::__construct();
-
-        // Hack to force use of a local jobe host when behat testing.
-        if ($CFG->prefix == "bht_") {
-            $this->jobeserver = "localhost";
-        } else {
-            $this->jobeserver = get_config('qtype_coderunner', 'jobe_host');
-        }
-
+        $this->jobeserver = get_config('qtype_coderunner', 'jobe_host');
         $this->apikey = get_config('qtype_coderunner', 'jobe_apikey');
         $this->languages = null;
     }