0ct0pu5/YellowLabTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Temporarily remove queue messages

Browse source
This commit is contained in:
Gaël Métais 2021-03-21 23:53:04 +00:00
parent 97099e9f65
commit d1681c3d88
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
front/src/views/queue.html
View file

@ -17,16 +17,17 @@
</div>
<div ng-if="status.statusCode == 'running'">
<div class="status">Test is running...</div>
<p class="statusSubMessage">(auto-refresh activated)</p>
<!--<div class="progress">
<div class="progressBarEmpty">
<div class="progressBarFilled" ng-style="{'width': (progress.estimatedProgress*100) + '%'}"></div>
</div>
</div>-->
</div>
<p class="statusSubMessage" ng-if="!progress">(Phantomas launched)</p>
<p class="statusSubMessage" ng-if="progress.milestone == 'domReady'">(DOM Ready fired)</p>
<p class="statusSubMessage" ng-if="progress.milestone == 'domComplete'">(page loaded, waiting for late requests)</p>
<p class="statusSubMessage" ng-if="progress.milestone == 'phantomas'">(now simulating compression, optimization and minification)</p>
<p class="statusSubMessage" ng-if="progress.milestone == 'redownload'">(calculating score and retrieving screenshot)</p>
<p class="statusSubMessage" ng-if="progress.milestone == 'redownload'">(calculating score and retrieving screenshot)</p>-->
</div>
<div ng-if="status.statusCode == 'complete'">
<div class="status">Test complete</div>

10
lib/index.js
View file

@ -29,18 +29,15 @@ var yellowLabTools = function(url, options) {
.then(function(data) {
// If a screenshot save function was provided in the options
// If a screenshot saveFunction was provided in the options
if (typeof options.saveFile === 'function') {
debug('Now optimizing screenshot...');
// Remove uneeded temp screenshot path
delete data.params.options.screenshot;
// Add the screenshot url instead
data.screenshotUrl = '/api/results/' + data.runId + '/screenshot.jpg';
// TODO: temporarily set all screenshot sizes to 600px, until we find a solution
ScreenshotHandler.findAndOptimizeScreenshot(600)
ScreenshotHandler.findAndOptimizeScreenshot(600);
.then(function(screenshotBuffer) {
debug('Screenshot optimized, now saving...');
@ -51,6 +48,9 @@ var yellowLabTools = function(url, options) {
.then(function(response) {
debug('Screenshot saved');
debug(response);
// Add the screenshot API url
data.screenshotUrl = '/api/results/' + data.runId + '/screenshot.jpg';
})
.catch(function(err) {