Skip to content
This repository has been archived by the owner on Apr 2, 2019. It is now read-only.

Commit

Permalink
Version 0.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
wyuenho committed Mar 9, 2016
1 parent 3ddbf6d commit 6dd5476
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 3,327 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
language: node_js
node_js:
- 0.10
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
notifications:
email: false
email: false
48 changes: 9 additions & 39 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,42 +84,12 @@ module.exports = function (grunt) {
}
},

jasmine: {
test: {
version: "1.3.1",
src: [
"lib/backgrid.js",
],
options: {
specs: [
"test/preamble.js",
"test/column.js",
"test/formatter.js",
"test/cell.js",
"test/row.js",
"test/body.js",
"test/header.js",
"test/footer.js",
"test/grid.js"
],
template: require("grunt-template-jasmine-istanbul"),
templateOptions: {
coverage: "test/coverage/coverage.json",
report: {
type: "html",
options: {
dir: "test/coverage"
}
}
},
helpers: "vendor/js/jasmine-html.js",
vendor: [
"test/vendor/js/jquery.js",
"test/vendor/js/underscore.js",
"test/vendor/js/backbone.js",
"test/vendor/js/backbone-pageable.js"
]
}
karma: {
unit: {
configFile: 'karma.conf.js',
background: true,
singleRun: true,
reporter: 'dots'
}
},

Expand Down Expand Up @@ -196,11 +166,11 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-recess");
grunt.loadNpmTasks("grunt-jsduck");
grunt.loadNpmTasks("grunt-contrib-jasmine");
grunt.loadNpmTasks("grunt-contrib-connect");
grunt.loadNpmTasks("grunt-karma");

grunt.registerTask("doc", ["clean:api", "jsduck"]);
grunt.registerTask("dist", ["concat", "uglify", "recess"]);
grunt.registerTask("test", ["concat", "jasmine"]);
grunt.registerTask("default", ["clean", "doc", "dist", "jasmine"]);
grunt.registerTask("test", ["concat", "karma"]);
grunt.registerTask("default", ["clean", "doc", "dist", "karma"]);
};
84 changes: 84 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// Karma configuration
// Generated on Wed Mar 09 2016 13:20:18 GMT+0000 (GMT)

module.exports = function(config) {
config.set({

// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',


// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['jasmine'],


// list of files / patterns to load in the browser
files: [
'test/vendor/js/jquery.js',
'test/vendor/js/underscore.js',
'test/vendor/js/backbone.js',
'test/vendor/js/backbone-pageable.js',
'lib/backgrid.js',
'test/preamble.js',
'test/column.js',
'test/formatter.js',
'test/cell.js',
'test/row.js',
'test/body.js',
'test/header.js',
'test/grid.js'
],


// list of files to exclude
exclude: [
],


// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {

},


// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['progress'],


// web server port
port: 9876,


// enable / disable colors in the output (reporters and logs)
colors: true,


// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,


// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,


// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Chrome', 'Firefox', 'Safari'],


// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false,

// Concurrency level
// how many browser should be started simultaneous
concurrency: Infinity,

browserNoActivityTimeout: 30000
})
}
2 changes: 1 addition & 1 deletion lib/backgrid.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
backgrid 0.3.5
backgrid 0.3.6
http://github.com/wyuenho/backgrid
Copyright (c) 2016 Jimmy Yuen Ho Wong and contributors <[email protected]>
Expand Down
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backgrid",
"version": "0.3.5",
"version": "0.3.6",
"author": "Jimmy Yuen Ho Wong and contributors <[email protected]>",
"description": "Backgrid.js is a set of components for building semantic and easily stylable data grid widgets with Backbone.",
"homepage": "http://backgridjs.com/",
Expand All @@ -10,7 +10,7 @@
],
"main": "./lib/backgrid.js",
"scripts": {
"test": "grunt test",
"test": "karma start --single-run --browsers Chrome,Firefox",
"prepublish": "grunt dist"
},
"repository": {
Expand All @@ -27,17 +27,21 @@
"grunt-contrib-uglify": "~1.0.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-jsduck": "~1.0.1",
"grunt-karma": "^0.12.1",
"grunt-recess": "~1.0.1",
"grunt-template-jasmine-istanbul": "~0.4.0"
"grunt-template-jasmine-istanbul": "~0.4.0",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.2",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.1.6",
"karma-safari-launcher": "^0.1.1"
},
"license": "MIT",
"engines": {
"node": ">=0.10"
},
"private": true,
"dependencies": {
"backbone": "~1.1.2",
"jquery": ">= 1.7.0",
"underscore": "~1.8.3"
}
}
Loading

0 comments on commit 6dd5476

Please sign in to comment.