From 4cb2bb42e2b9b9a09e20063a8f406a516ac2b80e Mon Sep 17 00:00:00 2001 From: pixelzoom Date: Mon, 18 May 2020 21:25:16 -0600 Subject: [PATCH 1/2] add query-parameter test for natural-selection --- js/listContinuousTests.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/js/listContinuousTests.js b/js/listContinuousTests.js index 7407f292..79a79c4a 100644 --- a/js/listContinuousTests.js +++ b/js/listContinuousTests.js @@ -336,6 +336,15 @@ tests.push( { } ); // natural-selection + +tests.push( { + test: [ 'natural-selection', 'fuzz', 'unbuilt', 'query-parameters' ], + type: 'sim-test', + url: 'natural-selection/natural-selection_en.html', + queryParameters: 'brand=phet&ea&fuzz&memoryLimit=1000&allelesVisible=false&introMutations=F&introPopulation=10Ff&labMutations=FeT&labPopulation=2FFeett,2ffEEtt,2ffeeTT' +} ); + +// To have one test where the generation clock is running faster, and more things are liable to happen tests.push( { test: [ 'natural-selection', 'fuzz', 'unbuilt', 'secondsPerGeneration' ], type: 'sim-test', From d61ebd95d0cf6b4dabd82e4b360385aaeb41ae1b Mon Sep 17 00:00:00 2001 From: Jonathan Olson Date: Tue, 19 May 2020 12:33:40 -0600 Subject: [PATCH 2/2] If updateHTMLVersion bumps to the same version, don't force a commit, see https://github.com/phetsims/perennial/issues/172 --- js/common/updateHTMLVersion.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/common/updateHTMLVersion.js b/js/common/updateHTMLVersion.js index ae091f42..c2bb3697 100644 --- a/js/common/updateHTMLVersion.js +++ b/js/common/updateHTMLVersion.js @@ -42,5 +42,7 @@ module.exports = async function( repo ) { await execute( gruntCommand, [ 'generate-test-html' ], `../${repo}` ); await gitAdd( repo, `${repo}-tests.html` ); } - await gitCommit( repo, `Bumping dev${packageObject.phet.generatedUnitTests ? '/test' : ''} HTML with new version` ); + if ( !gitIsClean( repo ) ) { + await gitCommit( repo, `Bumping dev${packageObject.phet.generatedUnitTests ? '/test' : ''} HTML with new version` ); + } };