WEBDIENSTE/YellowLabTools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a device option to ylt's core

Browse Source
This commit is contained in:
Gaël Métais
2015-04-27 18:43:04 +02:00
parent cae23d61e2
commit 491c8ebe77
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/server/controllers/apiController.js
+4 -2
View File
@@ -33,7 +33,8 @@ var ApiController = function(app) {
waitForResponse: req.body.waitForResponse !== false && req.body.waitForResponse !== 'false' && req.body.waitForResponse !== 0,
partialResult: req.body.partialResult || null,
screenshot: req.body.screenshot || false,
jsTimeline: req.body.jsTimeline || false
jsTimeline: req.body.jsTimeline || false,
device: req.body.device || 'desktop'
}
};
@@ -66,7 +67,8 @@ var ApiController = function(app) {
var runOptions = {
screenshot: run.params.screenshot ? screenshot.getTmpFilePath() : false,
jsDeepAnalysis: run.params.jsTimeline
jsDeepAnalysis: run.params.jsTimeline,
device: run.params.device
};
return ylt(run.params.url, runOptions);
lib/tools/phantomas/phantomasWrapper.js
+10 -7
View File
@@ -11,11 +11,6 @@ var PhantomasWrapper = function() {
/**
* This is the phantomas launcher. It merges user chosen options into the default options
* Available options :
*
* - timeout : in seconds (default 60)
* - jsDeepAnalysis : should we inspect subrequests in the javascript execution tree?
*
*/
this.execute = function(data) {
@@ -27,7 +22,9 @@ var PhantomasWrapper = function() {
// Cusomizable options
'timeout': task.options.timeout || 60,
'js-deep-analysis': task.options.jsDeepAnalysis || false,
'user-agent': 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36',
'user-agent': (task.options.device === 'desktop') ? 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36' : null,
'tablet': (task.options.device === 'tablet'),
'phone': (task.options.device === 'phone'),
'screenshot': task.options.screenshot || false,
// Mandatory
@@ -64,7 +61,13 @@ var PhantomasWrapper = function() {
value = '"' + value + '"';
}
optionsString += ' ' + '--' + opt + '=' + value;
if (value === true) {
optionsString += ' ' + '--' + opt;
} else if (value === false || value === null) {
// Nothing
} else {
optionsString += ' ' + '--' + opt + '=' + value;
}
}
debug('node node_modules/phantomas/bin/phantomas.js --url=' + task.url + optionsString + ' --verbose');