Skip to content

Commit

Permalink
Updates tests, Gruntfile
Browse files Browse the repository at this point in the history
Removed defunct public directory for bower_components. Updated test
suite to use bower_components.
  • Loading branch information
jamesplease authored and samccone committed Mar 1, 2014
1 parent 1d6fa16 commit e13e912
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 13,580 deletions.
21 changes: 10 additions & 11 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ module.exports = function(grunt) {
},
build: {
src: [
'public/javascripts/backbone.babysitter.js',
'public/javascripts/backbone.wreqr.js',
'lib/core/backbone.marionette.js',
'<%= assets.babysitter %>',
'<%= assets.wreqr %>',
'lib/core/backbone.marionette.js',
],
dest: 'lib/backbone.marionette.js'
},
Expand Down Expand Up @@ -107,18 +107,17 @@ module.exports = function(grunt) {
jasmine : {
options : {
helpers : [
'bower_components/sinonjs/sinon.js',
'bower_components/jasmine-sinon/lib/jasmine-sinon.js',
'<%= assets.sinon %>',
'<%= assets.jasmineSinon %>',
'spec/javascripts/helpers/*.js'
],
specs : 'spec/javascripts/**/*.spec.js',
vendor : [
'public/javascripts/jquery.js',
'public/javascripts/json2.js',
'public/javascripts/underscore.js',
'public/javascripts/backbone.js',
'public/javascripts/backbone.babysitter.js',
'public/javascripts/backbone.wreqr.js',
'<%= assets.jquery %>',
'<%= assets.underscore %>',
'<%= assets.backbone %>',
'<%= assets.babysitter %>',
'<%= assets.wreqr %>',
],
},
coverage : {
Expand Down
26 changes: 12 additions & 14 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name" : "backbone.marionette",
"description" : "Make your Backbone.js apps dance with a composite application architecture!",
"homepage" : "http://marionettejs.org",
"main" : ["./lib/backbone.marionette.js", "./lib/core/amd/backbone.marionette.js"],
"version" : "1.6.2",

"keywords" : [
"name": "backbone.marionette",
"description": "Make your Backbone.js apps dance with a composite application architecture!",
"homepage": "http://marionettejs.org",
"main": [
"./lib/backbone.marionette.js",
"./lib/core/amd/backbone.marionette.js"
],
"version": "1.6.2",
"keywords": [
"backbone",
"framework",
"client",
"browser",
"composite"
],

"author": {
"name" : "Derick Bailey",
"email" : "derickbailey@gmail.com"
"name": "Derick Bailey",
"email": "derickbailey@gmail.com"
},

"ignore": [
"docs",
"reports",
Expand All @@ -34,15 +34,13 @@
"addrem",
"getdeps"
],

"dependencies" : {
"dependencies": {
"backbone": "1.0.0 - 1.1.2",
"underscore": "1.4.4 - 1.6.0",
"backbone.babysitter": "~0.1.0",
"backbone.wreqr": "~1.0.0",
"jquery": "1.8.0 - 1.11.0"
},

"devDependencies": {
"sinonjs": "1.7.3",
"jasmine-sinon": "0.3.1"
Expand Down
26 changes: 0 additions & 26 deletions public/javascripts/backbone.augment.js

This file was deleted.

157 changes: 0 additions & 157 deletions public/javascripts/backbone.babysitter.js

This file was deleted.

Loading

0 comments on commit e13e912

Please sign in to comment.