Merge v1.1.0

This commit is contained in:
Gaël Métais
2015-01-09 18:13:16 +01:00
5 changed files with 56 additions and 23 deletions
+1
View File
@@ -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'},
]
}
},
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

+1
View File
@@ -4,6 +4,7 @@
<title>Yellow Lab Tools</title>
<base href="/">
<link rel="icon" type="image/png" href="/img/favicon.png">
<meta property="og:image" content="/img/logo-large.png" />
<!-- build:css /css/styles.css-->
<link rel="stylesheet" type="text/css" href="/css/main.css">
@@ -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) {
+53
View File
@@ -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();
});
});
});