Fixed merge conflicts

This commit is contained in:
Fergal Moran
2014-03-20 20:22:09 +00:00
2 changed files with 40 additions and 45 deletions

View File

@@ -13,9 +13,4 @@ var PromotionSchema = new Schema({
/* Indexes */
PromotionSchema.index({title: 1, user: 1}, {unique: true});
/* Operations */
PromotionSchema.statics.findByTitle = function(title, cb){
this.findOne({title: title}, cb);
};
mongoose.model('Promotion', PromotionSchema);

View File

@@ -1,83 +1,83 @@
'use strict';
var should = require('should'),
mongoose = require('mongoose'),
Promotion = mongoose.model('Promotion'),
User = mongoose.model('User');
mongoose = require('mongoose'),
Promotion = mongoose.model('Promotion'),
User = mongoose.model('User');
var promotion, promotion2;
var user;
describe('Promotion Model', function() {
before(function(done) {
user = new User({
provider: 'local',
name: 'Fake User',
email: 'test@test.com',
password: 'password'
});
promotion = new Promotion({
title: 'Test Prom 1',
user: user
});
promotion2 = new Promotion({
title: 'Test Prom 1',
user: user
});
// Clear promotions before testing
Promotion.remove().exec();
User.remove().exec();
done();
describe('Promotion Model', function () {
before(function (done) {
user = new User({
provider: 'local',
name: 'Fake User',
email: 'test@test.com',
password: 'password'
});
promotion = new Promotion({
title: 'Test Prom 1',
user: user
});
promotion2 = new Promotion({
title: 'Test Prom 1',
user: user
});
// Clear promotions before testing
Promotion.remove().exec();
User.remove().exec();
done();
});
afterEach(function(done) {
afterEach(function (done) {
//going to leave the data intact post test
//as it is removed in before()
//Promotion.remove().exec();
done();
});
it('should begin with no promotions', function(done) {
Promotion.find({}, function(err, promotions) {
it('should begin with no promotions', function (done) {
Promotion.find({}, function (err, promotions) {
promotions.should.have.length(0);
done();
});
});
describe('Save methods', function(){
it('should be able to save', function(done){
promotion.save(function(err){
describe('Save methods', function () {
it('should be able to save', function (done) {
promotion.save(function (err) {
should.not.exist(err);
done();
});
});
it('should fail when saving without a user', function(done) {
it('should fail when saving without a user', function (done) {
promotion.user = '';
promotion.save(function(err) {
promotion.save(function (err) {
should.exist(err);
done();
});
});
it('should fail when saving without a title', function(done) {
it('should fail when saving without a title', function (done) {
promotion.title = '';
promotion.save(function(err) {
promotion.save(function (err) {
should.exist(err);
done();
});
});
it('should fail when saving a duplicate promotion', function(done){
promotion.save(function(err){
promotion2.save(function(err){
it('should fail when saving a duplicate promotion', function (done) {
promotion.save(function (err) {
promotion2.save(function (err) {
should.exist(err);
done();
});
});
});
});
describe('Search methods', function(){
it('should find promotion by title', function(done){
debugger;
Promotion.findByTitle('Test Prom 1', function(result){
describe('Search methods', function () {
it('should find promotion by title', function (done) {
Promotion.findOne({title: 'Test Prom 1', user: user}, function (err, result) {
should.exist(result);
should.not.exist(err);
result.title.should.equal('Test Prom 1');
done();
});