Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed May 19, 2020
2 parents 7d69b0d + d61ebd9 commit f3d5c67
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
4 changes: 3 additions & 1 deletion js/common/updateHTMLVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -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` );
}
};
9 changes: 9 additions & 0 deletions js/listContinuousTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit f3d5c67

Please sign in to comment.