Skip to content

Commit

Permalink
converted all files to 2spaces indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@garris
garris committed Sep 8, 2015
1 parent 1b80c7c commit bb0850b
Show file tree
Hide file tree
Showing 9 changed files with 664 additions and 665 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
root = true

[*]
indent_style = tab
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_size = 4
indent_size = 2

[*.json]
indent_size = 2
2 changes: 1 addition & 1 deletion .jscsrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"disallowEmptyBlocks": true
"disallowEmptyBlocks": true
}
190 changes: 95 additions & 95 deletions capture/echoFiles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,120 +23,120 @@ if (config.misMatchThreshold) {
}

var casper = require("casper").create({
// clientScripts: ["jquery.js"] //lets try not to use this it's friggin 2014 already people...
// clientScripts: ["jquery.js"] //lets try not to use this it's friggin 2014 already people...
});

casper.on('resource.received', function(resource) {
//casper.echo(resource.url);
//casper.echo(resource.url);
});

casper.on("page.error", function(msg, trace) {
// this.echo("Remote Error > " + msg, "error");
// this.echo("file: " + trace[0].file, "WARNING");
// this.echo("line: " + trace[0].line, "WARNING");
// this.echo("function: " + trace[0]["function"], "WARNING");
// this.echo("Remote Error > " + msg, "error");
// this.echo("file: " + trace[0].file, "WARNING");
// this.echo("line: " + trace[0].line, "WARNING");
// this.echo("function: " + trace[0]["function"], "WARNING");
});

casper.on('remote.message', function(message) {
this.echo('remote console > ' + message);
this.echo('remote console > ' + message);
});

casper.on('resource.received', function(resource) {
var status = resource.status;
if(status >= 400) {
casper.log('remote error > ' + resource.url + ' failed to load (' + status + ')', 'error');
}
var status = resource.status;
if(status >= 400) {
casper.log('remote error > ' + resource.url + ' failed to load (' + status + ')', 'error');
}
});



function capturePageSelectors(url,scenarios,viewports,bitmaps_reference,bitmaps_test,isReference){

var
gotErrors = [],
screenshotNow = new Date(),
screenshotDateTime = screenshotNow.getFullYear() + pad(screenshotNow.getMonth() + 1) + pad(screenshotNow.getDate()) + '-' + pad(screenshotNow.getHours()) + pad(screenshotNow.getMinutes()) + pad(screenshotNow.getSeconds());
var
gotErrors = [],
screenshotNow = new Date(),
screenshotDateTime = screenshotNow.getFullYear() + pad(screenshotNow.getMonth() + 1) + pad(screenshotNow.getDate()) + '-' + pad(screenshotNow.getHours()) + pad(screenshotNow.getMinutes()) + pad(screenshotNow.getSeconds());

casper.start();
// casper.viewport(1280,1024);
casper.start();
// casper.viewport(1280,1024);


casper.each(scenarios,function(casper, scenario, scenario_index){
casper.each(scenarios,function(casper, scenario, scenario_index){

if (scenario.cookiesJsonFile && fs.isFile(scenario.cookiesJsonFile)) {
var cookiesJson = fs.read(scenario.cookiesJsonFile);
var cookies = JSON.parse(cookiesJson);
for (var i = 0; i < cookies.length; i++) {
phantom.addCookie(cookies[i]);
}
}
if (scenario.cookiesJsonFile && fs.isFile(scenario.cookiesJsonFile)) {
var cookiesJson = fs.read(scenario.cookiesJsonFile);
var cookies = JSON.parse(cookiesJson);
for (var i = 0; i < cookies.length; i++) {
phantom.addCookie(cookies[i]);
}
}

// casper.each(viewports, function(casper, vp, viewport_index) {
// this.then(function() {
// this.viewport(vp.viewport.width, vp.viewport.height);
// });
// casper.each(viewports, function(casper, vp, viewport_index) {
// this.then(function() {
// this.viewport(vp.viewport.width, vp.viewport.height);
// });

console.log('LOG> CASPER IS RUNNING')
casper.thenOpen(scenario.url, function() {
console.log('LOG> PHANTOM IS RUNNING')
casper.wait(500);
});
casper.then(function() {
this.echo('\n==================\nCurrent location is ' + scenario.url +'\n==================\n', 'warn');
console.log('LOG> CASPER IS RUNNING')
casper.thenOpen(scenario.url, function() {
console.log('LOG> PHANTOM IS RUNNING')
casper.wait(500);
});
casper.then(function() {
this.echo('\n==================\nCurrent location is ' + scenario.url +'\n==================\n', 'warn');

// var src = this.evaluate(function() {return document.body.outerHTML; });
var src = this.evaluate(function() {return document.all[0].outerHTML; });
this.echo('\n\n'+src);
});
// var src = this.evaluate(function() {return document.body.outerHTML; });
var src = this.evaluate(function() {return document.all[0].outerHTML; });
this.echo('\n\n'+src);
});

// this.then(function(){
// this.then(function(){

// this.echo('Screenshots for ' + vp.name + ' (' + vp.viewport.width + 'x' + vp.viewport.height + ')', 'info');
// this.echo('Screenshots for ' + vp.name + ' (' + vp.viewport.width + 'x' + vp.viewport.height + ')', 'info');

// //HIDE SELECTORS WE WANT TO AVOID
// scenario.hideSelectors.forEach(function(o,i,a){
// casper.evaluate(function(o){
// document.querySelector(o).style.visibility='hidden';
// },o);
// });
// //HIDE SELECTORS WE WANT TO AVOID
// scenario.hideSelectors.forEach(function(o,i,a){
// casper.evaluate(function(o){
// document.querySelector(o).style.visibility='hidden';
// },o);
// });

// //REMOVE UNWANTED SELECTORS FROM RENDER TREE
// scenario.removeSelectors.forEach(function(o,i,a){
// casper.evaluate(function(o){
// document.querySelector(o).style.display='none';
// },o);
// });
// //REMOVE UNWANTED SELECTORS FROM RENDER TREE
// scenario.removeSelectors.forEach(function(o,i,a){
// casper.evaluate(function(o){
// document.querySelector(o).style.display='none';
// },o);
// });

// //CREATE SCREEN SHOTS AND TEST COMPARE CONFIGURATION (CONFIG FILE WILL BE SAVED WHEN THIS PROCESS RETURNS)
// scenario.selectors.forEach(function(o,i,a){
// var cleanedSelectorName = o.replace(/[^a-zA-Z\d]/,'');//remove anything that's not a letter or a number
// //var cleanedUrl = scenario.url.replace(/[^a-zA-Z\d]/,'');//remove anything that's not a letter or a number
// var fileName = scenario_index + '_' + i + '_' + cleanedSelectorName + '_' + viewport_index + '_' + vp.name + '.png';;
// //CREATE SCREEN SHOTS AND TEST COMPARE CONFIGURATION (CONFIG FILE WILL BE SAVED WHEN THIS PROCESS RETURNS)
// scenario.selectors.forEach(function(o,i,a){
// var cleanedSelectorName = o.replace(/[^a-zA-Z\d]/,'');//remove anything that's not a letter or a number
// //var cleanedUrl = scenario.url.replace(/[^a-zA-Z\d]/,'');//remove anything that's not a letter or a number
// var fileName = scenario_index + '_' + i + '_' + cleanedSelectorName + '_' + viewport_index + '_' + vp.name + '.png';;

// var reference_FP = bitmaps_reference + '/' + fileName;
// var test_FP = bitmaps_test + '/' + screenshotDateTime + '/' + fileName;
// var reference_FP = bitmaps_reference + '/' + fileName;
// var test_FP = bitmaps_test + '/' + screenshotDateTime + '/' + fileName;

// var filePath = (isReference)?reference_FP:test_FP;
// var filePath = (isReference)?reference_FP:test_FP;

// if(!isReference)
// compareConfig.testPairs.push({
// reference:reference_FP,
// test:test_FP,
// selector:o,
// fileName:fileName,
// testName:scenario.testName
// })
// if(!isReference)
// compareConfig.testPairs.push({
// reference:reference_FP,
// test:test_FP,
// selector:o,
// fileName:fileName,
// testName:scenario.testName
// })

// casper.captureSelector(filePath, o);
// //casper.echo('remote capture to > '+filePath,'info');
// casper.captureSelector(filePath, o);
// //casper.echo('remote capture to > '+filePath,'info');

// });//end topLevelModules.forEach
// });
// });//end topLevelModules.forEach
// });


// });//end casper.each viewports
// });//end casper.each viewports

});//end casper.each scenario
});//end casper.each scenario

}

Expand Down Expand Up @@ -164,33 +164,33 @@ if(!exists){isReference=true; console.log('CREATING NEW REFERENCE FILES')}


capturePageSelectors(
'index.html'
,scenarios
,viewports
,bitmaps_reference
,bitmaps_test
,isReference
'index.html'
,scenarios
,viewports
,bitmaps_reference
,bitmaps_test
,isReference
);

casper.run(function(){
complete();
this.exit();
complete();
this.exit();
});

function complete(){
var configData = JSON.stringify(compareConfig,null,2);
fs.write(compareConfigFileName, configData, 'w');
console.log(
'\n======================\nechoFiles has completed \n=======================\n'
//,configData
);
var configData = JSON.stringify(compareConfig,null,2);
fs.write(compareConfigFileName, configData, 'w');
console.log(
'\n======================\nechoFiles has completed \n=======================\n'
//,configData
);
}

function pad(number) {
var r = String(number);
if ( r.length === 1 ) {
r = '0' + r;
}
return r;
var r = String(number);
if ( r.length === 1 ) {
r = '0' + r;
}
return r;
}

Loading

0 comments on commit bb0850b

Please sign in to comment.