alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2014-04-28 16:27:19 +01:00
parent a0fb170878 64ab1a4f59
commit 3655e83ff9
9 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/test/UnitTests/coffee/Project/ProjectDeleterTests.coffee
+6 -2
View File
@@ -61,7 +61,7 @@ describe 'Project deleter', ->
describe "deleteProject", ->
beforeEach ->
@Project.remove.callsArgWith(1)
@Project.update.callsArgWith(2)
it "should flushProjectToMongoAndDelete in doc updater", (done)->
@deleter.deleteProject @project_id, =>
@@ -70,7 +70,11 @@ describe 'Project deleter', ->
it "should remove the project", (done)->
@deleter.deleteProject @project_id, =>
@Project.remove.calledWith(_id:@project_id).should.equal true
@Project.update.calledWith({
_id:@project_id
}, {
$set: { archived: true }
}).should.equal true
done()
it "should removeProjectFromAllTags", (done)->
services/web/test/UnitTests/coffee/Tags/TagsHandlerTests.coffee
+4 -4
View File
@@ -6,7 +6,7 @@ modulePath = require('path').join __dirname, '../../../../app/js/Features/Tags/T
_ = require('underscore')
describe 'Tags handler', ->
describe 'TagsHandler', ->
user_id = "123nd3ijdks"
project_id = "123njdskj9jlk"
tagsUrl = "tags.sharelatex.testing"
@@ -26,17 +26,17 @@ describe 'Tags handler', ->
it 'Should post the request to the tags api with the user id in the url', (done)->
@handler.addTag user_id, project_id, tag, =>
@request.post.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}/tag", json:{name:tag}}).should.equal true
@request.post.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}/tag", timeout:1000, json:{name:tag}}).should.equal true
done()
it 'should send a delete request when a delete has been recived with the body format standardised', (done)->
@handler.deleteTag user_id, project_id, tag, =>
@request.del.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}/tag", json:{name:tag}}).should.equal true
@request.del.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}/tag", timeout:1000, json:{name:tag}}).should.equal true
done()
it 'should tell the tags api to remove the project_id from all the users tags', (done)->
@handler.removeProjectFromAllTags user_id, project_id, =>
@request.del.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}"}).should.equal true
@request.del.calledWith({uri:"#{tagsUrl}/user/#{user_id}/project/#{project_id}", timeout:1000}).should.equal true
done()
describe "groupTagsByProject", ->