Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Minor config-related enhancements #203

Open
brettz9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor config-related enhancements #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions runner/runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(function() {
"use strict";
var runner;
var testharness_properties = {output:false,
var testharness_properties = window.testharness_properties || {output:false,
timeout_multiplier:1};

function Manifest(path) {
Expand Down Expand Up @@ -559,8 +559,8 @@ TestControl.prototype = {
},

get_testharness_settings: function() {
return {timeout_multiplier: parseFloat(this.timeout_input.value),
output: this.render_checkbox.checked};
return Object.assign({timeout_multiplier: parseFloat(this.timeout_input.value),
output: this.render_checkbox.checked}, testharness_properties);
},

get_use_regex: function() {
Expand Down Expand Up @@ -840,4 +840,6 @@ window.completion_callback = function(tests, status) {
};

window.addEventListener("DOMContentLoaded", setup, false);

window.VisualOutput = VisualOutput;
})();