sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

challenges: allow members to override challenge.tasks.notes, and sycning

Browse source 
challenge won't update those notes.
This commit is contained in:
Tyler Renelle 2014-01-03 13:10:56 -07:00
parent 5e321b0205
commit abd300199a
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/models/challenge.js
View file

@ -49,7 +49,7 @@ ChallengeSchema.methods.toJSON = function(){
function syncableAttrs(task) {
var t = (task.toObject) ? task.toObject() : task; // lodash doesn't seem to like _.omit on EmbeddedDocument
// only sync/compare important attrs
var omitAttrs = 'history tags completed streak'.split(' ');
var omitAttrs = 'history tags completed streak notes'.split(' ');
if (t.type != 'reward') omitAttrs.push('value');
return _.omit(t, omitAttrs);
}

29
test/api.mocha.coffee
View file

@ -134,7 +134,7 @@ describe 'API', ->
# Groups
############
describe 'Groups', ->
describe.only 'Groups', ->
group = undefined
it 'Creates a group', (done) ->
@ -145,15 +145,18 @@ describe 'API', ->
group = res.body
done()
describe 'Challenges', ->
describe.only 'Challenges', ->
challenge = undefined
updateTodo = undefined
it 'Creates a challenge', (done) ->
request.post("#{baseURL}/challenges")
.send({
group:group._id
dailys: [{type:'daily',text:'Challenge Daily'}]
todos: [], rewards: [], habits: []
todos: [{type:'todo', text:'Challenge Todo', notes:'Challenge Notes'}]
rewards: []
habits: []
})
.end (res) ->
expectCode res, 200
@ -163,10 +166,20 @@ describe 'API', ->
], (err, results) ->
[_user,challenge] = [results[0],results[1]]
expect(_user.dailys[_user.dailys.length-1].text).to.be('Challenge Daily')
updateTodo = _user.todos[_user.todos.length-1]
expect(updateTodo.text).to.be('Challenge Todo')
done()
it 'User updates challenge notes', (done) ->
updateTodo.notes = "User overriden notes"
request.put("#{baseURL}/user/tasks/#{updateTodo.id}")
.send(updateTodo)
.end (res) ->
done() #we'll do the check down below
it 'Change challenge daily', (done) ->
challenge.dailys[0].text = 'Updated Daily'
challenge.todos[0].notes = 'Challenge Updated Todo Notes'
request.post("#{baseURL}/challenges/#{challenge._id}")
.send(challenge)
.end (res) ->
@ -174,14 +187,22 @@ describe 'API', ->
User.findById _id, (err,_user) ->
expectCode res, 200
expect(_user.dailys[_user.dailys.length-1].text).to.be('Updated Daily')
expect(res.body.todos[0].notes).to.be('Challenge Updated Todo Notes')
expect(_user.todos[_user.todos.length-1].notes).to.be('User overriden notes')
done()
, 500 # we have to wait a while for users' tasks to be updated, called async on server
it 'Shows user notes on challenge page', (done) ->
request.get("#{baseURL}/challenges/#{challenge._id}/member/#{_id}")
.end (res) ->
expect(res.body.todos[res.body.todos.length-1].notes).to.be('User overriden notes')
done()
############
# Batch Update
############
describe.only 'Batch Update', ->
describe 'Batch Update', ->
it 'POST /api/v1/batch-update', (done) ->
userBefore = _.cloneDeep(currentUser)