jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Squashed commit of the following (unittest-refactor):

Browse source 
commit 9887e45976fc5211a4393e588d278a5e10baf06c
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Tue Sep 3 10:54:13 2013 -0700

    FIX: Ellipse getBounds method is not static

commit b3b359ad1c0fae412209705b01081dd231383656
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Tue Sep 3 10:53:41 2013 -0700

    More unit testing

commit dafbd1dbb03364b6d54db0cad26c4f02a8b9efe1
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 16:04:29 2013 -0700

    Remove unused karma plugin

commit 43209bfb59263278d2dc3561d06926ad515c4147
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 15:28:21 2013 -0700

    Add Travis CI status image to README

commit 2e38ba370bc05c239736155dcb06e34b47abf938
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 15:16:54 2013 -0700

    typo

commit b8898030da4d3e7b446ebb4ddeb30e8fc0adcf39
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 15:13:33 2013 -0700

    Lint test files, jsthint:test is now part of the test task

commit ea414dd1d734b39523174bd86d0cc58e920a89d2
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 15:11:50 2013 -0700

    Make all boilerplate tests, and an actual start to writing some real tests

commit 9e09c87997ae924989da4e1685f3a94636ab64de
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 14:37:51 2013 -0700

    Add back serving png files, convert to spaces

commit b45b1650c2e812a9cdb1165d96fba7b14bbdfab7
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sun Sep 1 00:55:57 2013 -0700

    Comment out functional tests for now

commit 3a350bf9e4d9fea470ad8e734dfc3542db74ccc8
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sat Aug 31 23:53:35 2013 -0700

    Removed quint, added karma, added resemble.js, refactored unit tests for mocha, added first example visual test

    run with:
    grunt travis

    You should see a brewer open and eventually see the spinning bunny. Then in the terminal, you should see the tests running where it matches frames 30, 60, and 90.

    Conflicts:
    	package.json

commit ac4c6de388e7a37786c9c4a6b2c95e22ec26b05d
Author: Dr. Kibitz <info@drkibitz.com>
Date:   Sat Aug 31 23:33:23 2013 -0700

    Remove trailing whitespace
This commit is contained in:
Dr. Kibitz 2013-09-24 09:37:17 -07:00
parent 56df185471
commit da4c67d38b
98 changed files with 1829 additions and 2585 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Gruntfile.js
View file

@ -1,10 +1,12 @@
'use strict';
module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-yuidoc');
grunt.loadTasks('tasks');
var root = 'src/pixi/',
debug = 'bin/pixi.dev.js',
@ -79,7 +81,7 @@ module.exports = function(grunt) {
},
files: {
srcBlob: '<%= dirs.src %>/**/*.js',
testBlob: '<%= dirs.test %>/unit/**/*.js',
testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit}/**/*.js',
build: '<%= dirs.build %>/pixi.dev.js',
buildMin: '<%= dirs.build %>/pixi.js'
},
@ -94,7 +96,12 @@ module.exports = function(grunt) {
},
jshint: {
beforeconcat: srcFiles,
test: ['<%= files.testBlob %>'],
test: {
src: ['<%= files.testBlob %>'],
options: {
expr: true
}
},
options: {
asi: true,
smarttabs: true
@ -128,12 +135,6 @@ module.exports = function(grunt) {
]
},
connect: {
qunit: {
options: {
port: grunt.option('port-test') || 9002,
base: './'
}
},
test: {
options: {
port: grunt.option('port-test') || 9002,
@ -142,13 +143,6 @@ module.exports = function(grunt) {
}
}
},
qunit: {
all: {
options: {
urls: ['http://localhost:' + (grunt.option('port-test') || 9002) + '/test/index.html']
}
}
},
yuidoc: {
compile: {
name: '<%= pkg.name %>',
@ -161,6 +155,13 @@ module.exports = function(grunt) {
outdir: '<%= dirs.docs %>'
}
}
},
karma: {
unit: {
configFile: 'test/karma.conf.js',
// browsers: ['Chrome'],
singleRun: true
}
}
});
@ -182,9 +183,10 @@ module.exports = function(grunt) {
}
)
grunt.registerTask('default', ['concat', 'uglify', 'distribute']);
grunt.registerTask('build', ['concat', 'uglify', 'distribute']);
grunt.registerTask('test', ['build', 'connect:qunit', 'qunit']);
grunt.registerTask('test', ['concat', 'jshint:test', 'karma']);
grunt.registerTask('docs', ['yuidoc']);
}
grunt.registerTask('default', ['test', 'uglify', 'distribute']);
// Travis CI task.
grunt.registerTask('travis', ['test']);
}