diff --git a/Gruntfile.js b/Gruntfile.js index 9bcaea3..2584078 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -100,6 +100,7 @@ module.exports = function(grunt) { files: [ {src: ['./front/src/fonts/icons.woff'], dest: './front/build/fonts/icons.woff'}, {src: ['./front/src/img/favicon.png'], dest: './front/build/img/favicon.png'}, + {src: ['./front/src/img/logo-large.png'], dest: './front/build/img/logo-large.png'}, ] } }, diff --git a/front/src/img/logo-large.png b/front/src/img/logo-large.png new file mode 100644 index 0000000..f739504 Binary files /dev/null and b/front/src/img/logo-large.png differ diff --git a/front/src/main.html b/front/src/main.html index 508841a..d966016 100644 --- a/front/src/main.html +++ b/front/src/main.html @@ -4,6 +4,7 @@ Yellow Lab Tools + diff --git a/lib/tools/phantomas/custom_modules/modules/jQYLT/jQYLT.js b/lib/tools/phantomas/custom_modules/modules/jQYLT/jQYLT.js index b1014c3..a850312 100644 --- a/lib/tools/phantomas/custom_modules/modules/jQYLT/jQYLT.js +++ b/lib/tools/phantomas/custom_modules/modules/jQYLT/jQYLT.js @@ -62,6 +62,7 @@ exports.module = function(phantomas) { 'delegate', 'undelegate', 'one', + 'bind', 'unbind', // more events @@ -182,29 +183,6 @@ exports.module = function(phantomas) { phantomas.leaveContext(moreData); }) || phantomas.log('jQuery: can not measure jQuerySizzleCalls (jQuery used on the page is too old)!'); - - // $().bind - jQuery.bind - // works for jQuery v?.? - phantomas.spy(jQueryFn, 'bind', function(eventTypes, func) { - - phantomas.enterContext({ - type: 'jQuery - bind', - callDetails: { - context: { - length: this.length, - firstElementPath: phantomas.getDOMPath(this[0]), - selector: this.selector - }, - arguments: [eventTypes, func] - }, - backtrace: phantomas.getBacktrace() - }); - - }, function(result) { - phantomas.leaveContext(); - }) || phantomas.log('jQuery: can not measure jQueryBindCalls (jQuery used on the page is too old)!'); - - // Add spys on many jQuery functions jQueryFunctions.forEach(function(functionName) { diff --git a/test/server/phantomasWrapperTest.js b/test/server/phantomasWrapperTest.js new file mode 100644 index 0000000..4710774 --- /dev/null +++ b/test/server/phantomasWrapperTest.js @@ -0,0 +1,53 @@ +var should = require('chai').should(); +var phantomasWrapper = require('../../app/lib/phantomasWrapper.js'); + +describe('phantomasWrapper', function() { + + it('should have a method execute', function() { + phantomasWrapper.should.have.property('execute').that.is.a('function'); + }); + + it('should execute', function(done) { + var url = 'http://example.com/'; + + this.timeout(20000); + phantomasWrapper.execute({ + url: url, + testId: '123abc', + options:{ + + } + }, function(err, json, results) { + should.not.exist(err); + + json.should.be.an('object'); + json.should.have.a.property('generator'); + json.generator.should.contain('phantomas'); + json.should.have.a.property('url').that.equals(url); + json.should.have.a.property('metrics').that.is.an('object').not.empty; + json.should.have.a.property('offenders').that.is.an('object').not.empty; + json.offenders.should.have.a.property('javascriptExecutionTree').that.is.a('array').not.empty; + + done(); + }); + }); + + it('should fail with error 254', function(done) { + var url = 'http://www.not.existing'; + + this.timeout(15000); + phantomasWrapper.execute({ + url: url, + testId: '123abc', + options:{ + + } + }, function(err, json, results) { + should.exist(err); + err.should.equal(254); + should.not.exist(json); + + done(); + }); + }); +}); \ No newline at end of file