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

Commit

Permalink
Merge branch '0.4.0' of github.com:meanjs/mean into 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhutchison
rhutchison committed Jul 9, 2015
2 parents d0bb4a3 + ade074c commit 16aa646
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 124 deletions.
18 changes: 0 additions & 18 deletions config/env/production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,6 @@ module.exports = {
stream: 'access.log'
}
},
assets: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
],
js: [
'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js'
]
},
css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
Expand Down
40 changes: 30 additions & 10 deletions modules/articles/tests/server/article.server.routes.tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (signinErr, signinRes) {
// Handle signin error
if (signinErr) done(signinErr);
if (signinErr) {
return done(signinErr);
}

// Get the userId
var userId = user.id;
Expand All @@ -71,13 +73,17 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (articleSaveErr, articleSaveRes) {
// Handle article save error
if (articleSaveErr) done(articleSaveErr);
if (articleSaveErr) {
return done(articleSaveErr);
}

// Get a list of articles
agent.get('/api/articles')
.end(function (articlesGetErr, articlesGetRes) {
// Handle article save error
if (articlesGetErr) done(articlesGetErr);
if (articlesGetErr) {
return done(articlesGetErr);
}

// Get articles list
var articles = articlesGetRes.body;
Expand Down Expand Up @@ -112,7 +118,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (signinErr, signinRes) {
// Handle signin error
if (signinErr) done(signinErr);
if (signinErr) {
return done(signinErr);
}

// Get the userId
var userId = user.id;
Expand All @@ -137,7 +145,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (signinErr, signinRes) {
// Handle signin error
if (signinErr) done(signinErr);
if (signinErr) {
return done(signinErr);
}

// Get the userId
var userId = user.id;
Expand All @@ -148,7 +158,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (articleSaveErr, articleSaveRes) {
// Handle article save error
if (articleSaveErr) done(articleSaveErr);
if (articleSaveErr) {
return done(articleSaveErr);
}

// Update article title
article.title = 'WHY YOU GOTTA BE SO MEAN?';
Expand All @@ -159,7 +171,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (articleUpdateErr, articleUpdateRes) {
// Handle article update error
if (articleUpdateErr) done(articleUpdateErr);
if (articleUpdateErr) {
return done(articleUpdateErr);
}

// Set assertions
(articleUpdateRes.body._id).should.equal(articleSaveRes.body._id);
Expand Down Expand Up @@ -227,7 +241,9 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (signinErr, signinRes) {
// Handle signin error
if (signinErr) done(signinErr);
if (signinErr) {
return done(signinErr);
}

// Get the userId
var userId = user.id;
Expand All @@ -238,15 +254,19 @@ describe('Article CRUD tests', function () {
.expect(200)
.end(function (articleSaveErr, articleSaveRes) {
// Handle article save error
if (articleSaveErr) done(articleSaveErr);
if (articleSaveErr) {
return done(articleSaveErr);
}

// Delete an existing article
agent.delete('/api/articles/' + articleSaveRes.body._id)
.send(article)
.expect(200)
.end(function (articleDeleteErr, articleDeleteRes) {
// Handle article error error
if (articleDeleteErr) done(articleDeleteErr);
if (articleDeleteErr) {
return done(articleDeleteErr);
}

// Set assertions
(articleDeleteRes.body._id).should.equal(articleSaveRes.body._id);
Expand Down
192 changes: 96 additions & 96 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
{
"name": "meanjs",
"description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
"version": "0.4.0",
"private": false,
"author": "https://github.com/meanjs/mean/graphs/contributors",
"repository": {
"type": "git",
"url": "https://github.com/meanjs/mean.git"
},
"engines": {
"node": ">=0.10.28",
"npm": ">=1.4.28"
},
"scripts": {
"start": "grunt",
"test": "grunt test",
"postinstall": "bower install --config.interactive=false"
},
"dependencies": {
"acl": "~0.4.4",
"async": "^1.3.0",
"body-parser": "^1.13.1",
"bower": "^1.4.1",
"chalk": "^1.1.0",
"compression": "^1.5.0",
"connect-flash": "~0.1.1",
"connect-mongo": "~0.8.1",
"consolidate": "~0.13.1",
"cookie-parser": "^1.3.2",
"express": "^4.13.0",
"express-session": "^1.11.3",
"forever": "~0.14.2",
"glob": "^5.0.13",
"grunt-cli": "~0.1.13",
"helmet": "~0.9.1",
"lodash": "^3.10.0",
"method-override": "^2.3.3",
"mongoose": "^4.0.6",
"morgan": "^1.6.1",
"multer": "0.1.8",
"nodemailer": "^1.4.0",
"passport": "~0.2.2",
"passport-facebook": "^2.0.0",
"passport-github": "~0.1.5",
"passport-google-oauth": "~0.2.0",
"passport-linkedin": "~0.1.3",
"passport-local": "^1.0.0",
"passport-twitter": "^1.0.2",
"serve-favicon": "^2.3.0",
"socket.io": "^1.3.5",
"swig": "^1.4.2"
},
"devDependencies": {
"grunt-concurrent": "^2.0.0",
"grunt-contrib-copy": "~0.8.0",
"grunt-contrib-csslint": "~0.4.0",
"grunt-contrib-cssmin": "~0.12.3",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-sass": "~0.9.2",
"grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~0.6.1",
"grunt-env": "~0.4.4",
"grunt-karma": "~0.11.2",
"grunt-mocha-test": "~0.12.7",
"grunt-ng-annotate": "^1.0.1",
"grunt-node-inspector": "~0.2.0",
"grunt-nodemon": "~0.4.0",
"grunt-protractor-runner": "^2.0.0",
"gulp": "^3.9.0",
"gulp-concat": "^2.6.0",
"gulp-csslint": "~0.1.5",
"gulp-cssmin": "~0.1.7",
"gulp-jshint": "^1.11.2",
"gulp-karma": "~0.0.4",
"gulp-less": "^3.0.3",
"gulp-livereload": "^3.8.0",
"gulp-load-plugins": "^1.0.0-rc.1",
"gulp-mocha": "^2.1.2",
"gulp-ng-annotate": "^1.0.0",
"gulp-nodemon": "^2.0.3",
"gulp-protractor": "^1.0.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.3",
"gulp-uglify": "^1.2.0",
"karma": "~0.12.37",
"karma-chrome-launcher": "~0.2.0",
"karma-coverage": "~0.4.2",
"karma-firefox-launcher": "~0.1.6",
"karma-jasmine": "~0.3.6",
"karma-phantomjs-launcher": "~0.2.0",
"load-grunt-tasks": "^3.2.0",
"run-sequence": "^1.1.1",
"should": "^7.0.1",
"supertest": "^1.0.1"
}
"name": "meanjs",
"description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
"version": "0.4.0",
"private": false,
"author": "https://github.com/meanjs/mean/graphs/contributors",
"repository": {
"type": "git",
"url": "https://github.com/meanjs/mean.git"
},
"engines": {
"node": ">=0.10.28",
"npm": ">=1.4.28"
},
"scripts": {
"start": "grunt",
"test": "grunt test",
"postinstall": "bower install --config.interactive=false"
},
"dependencies": {
"acl": "~0.4.4",
"async": "^1.3.0",
"body-parser": "^1.13.1",
"bower": "^1.4.1",
"chalk": "^1.1.0",
"compression": "^1.5.0",
"connect-flash": "~0.1.1",
"connect-mongo": "~0.8.1",
"consolidate": "~0.13.1",
"cookie-parser": "^1.3.2",
"express": "^4.13.1",
"express-session": "^1.11.3",
"forever": "~0.14.2",
"glob": "^5.0.13",
"grunt-cli": "~0.1.13",
"helmet": "~0.9.1",
"lodash": "^3.10.0",
"method-override": "^2.3.3",
"mongoose": "^4.0.6",
"morgan": "^1.6.1",
"multer": "0.1.8",
"nodemailer": "^1.4.0",
"passport": "~0.2.2",
"passport-facebook": "^2.0.0",
"passport-github": "~0.1.5",
"passport-google-oauth": "~0.2.0",
"passport-linkedin": "~0.1.3",
"passport-local": "^1.0.0",
"passport-twitter": "^1.0.2",
"serve-favicon": "^2.3.0",
"socket.io": "^1.3.5",
"swig": "^1.4.2"
},
"devDependencies": {
"grunt-concurrent": "^2.0.0",
"grunt-contrib-copy": "~0.8.0",
"grunt-contrib-csslint": "~0.4.0",
"grunt-contrib-cssmin": "~0.12.3",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-sass": "~0.9.2",
"grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~0.6.1",
"grunt-env": "~0.4.4",
"grunt-karma": "~0.11.2",
"grunt-mocha-test": "~0.12.7",
"grunt-ng-annotate": "^1.0.1",
"grunt-node-inspector": "~0.2.0",
"grunt-nodemon": "~0.4.0",
"grunt-protractor-runner": "^2.0.0",
"gulp": "^3.9.0",
"gulp-concat": "^2.6.0",
"gulp-csslint": "~0.1.5",
"gulp-cssmin": "~0.1.7",
"gulp-jshint": "^1.11.2",
"gulp-karma": "~0.0.4",
"gulp-less": "^3.0.3",
"gulp-livereload": "^3.8.0",
"gulp-load-plugins": "^1.0.0-rc.1",
"gulp-mocha": "^2.1.2",
"gulp-ng-annotate": "^1.0.0",
"gulp-nodemon": "^2.0.3",
"gulp-protractor": "^1.0.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.3",
"gulp-uglify": "^1.2.0",
"karma": "~0.12.37",
"karma-chrome-launcher": "~0.2.0",
"karma-coverage": "~0.4.2",
"karma-firefox-launcher": "~0.1.6",
"karma-jasmine": "~0.3.6",
"karma-phantomjs-launcher": "~0.2.0",
"load-grunt-tasks": "^3.2.0",
"run-sequence": "^1.1.1",
"should": "^7.0.1",
"supertest": "^1.0.1"
}
}

0 comments on commit 16aa646

Please sign in to comment.