Skip to content
This repository has been archived by the owner on Aug 25, 2018. It is now read-only.

Install npm and karma-cli on Travis CI #156

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ node_js:
- '0.10'
- '0.12'
- stable
before_install:
- npm install -g npm
- npm install -g karma-cli
sudo: false
install:
- npm install -g bower
Expand Down
5 changes: 2 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,17 @@ module.exports = function(grunt) {
});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-notify');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-copy');
grunt.loadNpmTasks('grunt-serve');

// Unit tests
grunt.registerTask('test', ['karma:unit']);

grunt.registerTask('build', ['jshint', 'concat', 'uglify']);
grunt.registerTask('default', ['build', 'test']);
grunt.registerTask('todo', ['build', 'serve']);
grunt.registerTask('todo', ['build', 'connect']);
};
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbonefire",
"description": "The officially supported Backbone binding for Firebase",
"version": "0.0.0",
"version": "0.5.1",
"authors": [
"Firebase (https://firebase.google.com/)"
],
Expand Down Expand Up @@ -32,9 +32,9 @@
"index.html"
],
"dependencies": {
"firebase": "2.0.x",
"backbone": "<=1.1.0",
"underscore": "~1.5.2"
"firebase": "2.0.x",
"underscore": "~1.8.3"
},
"devDependencies": {
"mockfirebase": "~0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/todos/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "todomvc-backbonefire",
"version": "0.0.0",
"version": "0.5.1",
"private": true,
"dependencies": {
"backbone": "~1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/todos/js/backbonefire.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ define([
* bindings let you use special model and collection types that allow for
* synchronizing data with Firebase.
*
* BackboneFire 0.0.0
* BackboneFire 0.5.1
* https://github.com/firebase/backbonefire/
* License: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion examples/todos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backbone-fire-todo",
"version": "0.0.0",
"version": "0.5.1",
"description": "Todo example using Backbone Fire.",
"main": "index.html",
"scripts": {
Expand Down
55 changes: 28 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbonefire",
"description": "The officially supported Backbone binding for Firebase",
"version": "0.0.0",
"version": "0.5.1",
"author": "Firebase (https://firebase.google.com/)",
"homepage": "https://github.com/firebase/backbonefire/",
"repository": {
Expand Down Expand Up @@ -33,32 +33,33 @@
"firebase": "2.0.x"
},
"devDependencies": {
"chai-backbone": "~0.9.2",
"coveralls": "^2.11.1",
"grunt": "~0.4.1",
"grunt-cli": "0.1.13",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-jshint": "~0.6.2",
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-watch": "~0.5.1",
"grunt-karma": "^0.8.3",
"grunt-notify": "~0.2.7",
"istanbul": "^0.3.2",
"karma": "~0.12.8",
"karma-chai": "0.0.2",
"karma-coverage": "^0.2.6",
"karma-failed-reporter": "0.0.2",
"karma-mocha": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.0",
"karma-requirejs": "~0.2.0",
"karma-sinon": "~1.0.0",
"karma-spec-reporter": "0.0.13",
"mocha": "~1.14.0",
"requirejs": "~2.1.9",
"karma-chrome-launcher": "^0.1.4",
"grunt-copy": "^0.1.0",
"grunt-contrib-connect": "^0.9.0",
"grunt-serve": "^0.1.6"
"chai": "~3.5.0",
"chai-backbone": "~0.9.4",
"coveralls": "^2.11.14",
"grunt": "~1.0.1",
"grunt-cli": "1.2.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "~1.0.0",
"grunt-contrib-jshint": "~1.0.0",
"grunt-contrib-uglify": "~2.0.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-karma": "^2.0.0",
"grunt-notify": "~0.4.5",
"istanbul": "^0.4.5",
"karma": "~1.3.0",
"karma-chai": "0.1.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-failed-reporter": "0.0.3",
"karma-mocha": "~1.2.0",
"karma-phantomjs-launcher": "~1.0.2",
"karma-requirejs": "~1.1.0",
"karma-sinon": "~1.0.5",
"karma-spec-reporter": "0.0.26",
"mocha": "~3.1.2",
"requirejs": "~2.3.2",
"sinon" : "~1.17.6"
},
"scripts": {
"test": "grunt test",
Expand Down
2 changes: 1 addition & 1 deletion src/backbonefire.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* bindings let you use special model and collection types that allow for
* synchronizing data with Firebase.
*
* BackboneFire 0.0.0
* BackboneFire 0.5.1
* https://github.com/firebase/backbonefire/
* License: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion test/specs/collection_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ describe('Backbone.Firebase.Collection', function() {
collection.fetch();
collection.on('sync', function() {
successCalled = true;
expect(successCalled).to.be.ok;
});
collection.firebase.flush();
expect(successCalled).to.be.ok;
});

});
Expand Down