instead of , but would need to adjust colors
diff --git a/app/views/play/level/tome/spell_palette_view.coffee b/app/views/play/level/tome/SpellPaletteView.coffee
similarity index 89%
rename from app/views/play/level/tome/spell_palette_view.coffee
rename to app/views/play/level/tome/SpellPaletteView.coffee
index 89914fb3e..769cd8f92 100644
--- a/app/views/play/level/tome/spell_palette_view.coffee
+++ b/app/views/play/level/tome/SpellPaletteView.coffee
@@ -2,9 +2,9 @@ CocoView = require 'views/kinds/CocoView'
template = require 'templates/play/level/tome/spell_palette'
{me} = require 'lib/auth'
filters = require 'lib/image_filter'
-SpellPaletteEntryView = require './spell_palette_entry_view'
+SpellPaletteEntryView = require './SpellPaletteEntryView'
LevelComponent = require 'models/LevelComponent'
-EditorConfigModal = require '../modal/editor_config_modal'
+EditorConfigModal = require '../modal/EditorConfigModal'
N_ROWS = 4
@@ -84,13 +84,16 @@ module.exports = class SpellPaletteView extends CocoView
snippets: 'programmableSnippets'
else
propStorage =
- 'this': 'apiProperties'
+ 'this': ['apiProperties', 'apiMethods']
count = 0
propGroups = {}
- for owner, storage of propStorage
- props = _.reject @thang[storage] ? [], (prop) -> prop[0] is '_' # no private properties
- added = propGroups[owner] = _.sortBy(props).slice()
- count += added.length
+ for owner, storages of propStorage
+ storages = [storages] if _.isString storages
+ for storage in storages
+ props = _.reject @thang[storage] ? [], (prop) -> prop[0] is '_' # no private properties
+ added = _.sortBy(props).slice()
+ propGroups[owner] = (propGroups[owner] ? []).concat added
+ count += added.length
shortenize = count > 6
tabbify = count >= 10
@@ -150,11 +153,11 @@ module.exports = class SpellPaletteView extends CocoView
toggleBackground: =>
# TODO: make the palette background an actual background and do the CSS trick
# used in spell_list_entry.sass for disabling
- background = @$el.find('.code-palette-background')[0]
+ background = @$el.find('img.code-palette-background')[0]
if background.naturalWidth is 0 # not loaded yet
return _.delay @toggleBackground, 100
- filters.revertImage background if @controlsEnabled
- filters.darkenImage background, 0.8 unless @controlsEnabled
+ filters.revertImage background, 'span.code-palette-background' if @controlsEnabled
+ filters.darkenImage background, 'span.code-palette-background', 0.8 unless @controlsEnabled
onFrameChanged: (e) ->
return unless e.selectedThang?.id is @thang.id
diff --git a/app/views/play/level/tome/spell_toolbar_view.coffee b/app/views/play/level/tome/SpellToolbarView.coffee
similarity index 100%
rename from app/views/play/level/tome/spell_toolbar_view.coffee
rename to app/views/play/level/tome/SpellToolbarView.coffee
diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/SpellView.coffee
similarity index 98%
rename from app/views/play/level/tome/spell_view.coffee
rename to app/views/play/level/tome/SpellView.coffee
index 46fb62e4e..ee979cc38 100644
--- a/app/views/play/level/tome/spell_view.coffee
+++ b/app/views/play/level/tome/SpellView.coffee
@@ -3,9 +3,9 @@ template = require 'templates/play/level/tome/spell'
{me} = require 'lib/auth'
filters = require 'lib/image_filter'
Range = ace.require('ace/range').Range
-Problem = require './problem'
-SpellDebugView = require './spell_debug_view'
-SpellToolbarView = require './spell_toolbar_view'
+Problem = require './Problem'
+SpellDebugView = require './SpellDebugView'
+SpellToolbarView = require './SpellToolbarView'
LevelComponent = require 'models/LevelComponent'
module.exports = class SpellView extends CocoView
@@ -167,6 +167,10 @@ module.exports = class SpellView extends CocoView
bindKey: {win: 'Ctrl-L', mac: 'Command-L'}
passEvent: true
exec: -> # just prevent default ACE go-to-line alert
+ addCommand
+ name: 'open-fullscreen-editor'
+ bindKey: {win: 'Alt-Shift-F', mac: 'Ctrl-Shift-F'}
+ exec: -> Backbone.Mediator.publish 'tome:fullscreen-view'
fillACE: ->
@ace.setValue @spell.source
@@ -630,11 +634,11 @@ module.exports = class SpellView extends CocoView
toggleBackground: =>
# TODO: make the background an actual background and do the CSS trick
# used in spell_list_entry.sass for disabling
- background = @$el.find('.code-background')[0]
+ background = @$el.find('img.code-background')[0]
if background.naturalWidth is 0 # not loaded yet
return _.delay @toggleBackground, 100
- filters.revertImage background if @controlsEnabled
- filters.darkenImage background, 0.8 unless @controlsEnabled
+ filters.revertImage background, 'span.code-background' if @controlsEnabled
+ filters.darkenImage background, 'span.code-background', 0.8 unless @controlsEnabled
onSpellBeautify: (e) ->
return unless @spellThang and (@ace.isFocused() or e.spell is @spell)
diff --git a/app/views/play/level/tome/thang_list_entry_view.coffee b/app/views/play/level/tome/ThangListEntryView.coffee
similarity index 98%
rename from app/views/play/level/tome/thang_list_entry_view.coffee
rename to app/views/play/level/tome/ThangListEntryView.coffee
index 06756c898..442dbe0e9 100644
--- a/app/views/play/level/tome/thang_list_entry_view.coffee
+++ b/app/views/play/level/tome/ThangListEntryView.coffee
@@ -2,7 +2,7 @@
# TODO: reordering based on errors isn't working yet
CocoView = require 'views/kinds/CocoView'
-ThangAvatarView = require 'views/play/level/thang_avatar_view'
+ThangAvatarView = require 'views/play/level/ThangAvatarView'
template = require 'templates/play/level/tome/thang_list_entry'
spellsPopoverTemplate = require 'templates/play/level/tome/thang_list_entry_spells'
{me} = require 'lib/auth'
diff --git a/app/views/play/level/tome/thang_list_view.coffee b/app/views/play/level/tome/ThangListView.coffee
similarity index 98%
rename from app/views/play/level/tome/thang_list_view.coffee
rename to app/views/play/level/tome/ThangListView.coffee
index 9f34e2977..03ab371c1 100644
--- a/app/views/play/level/tome/thang_list_view.coffee
+++ b/app/views/play/level/tome/ThangListView.coffee
@@ -4,7 +4,7 @@
CocoView = require 'views/kinds/CocoView'
template = require 'templates/play/level/tome/thang_list'
{me} = require 'lib/auth'
-ThangListEntryView = require './thang_list_entry_view'
+ThangListEntryView = require './ThangListEntryView'
module.exports = class ThangListView extends CocoView
className: 'thang-list-view'
diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/TomeView.coffee
similarity index 97%
rename from app/views/play/level/tome/tome_view.coffee
rename to app/views/play/level/tome/TomeView.coffee
index 3ef45258c..e0335cd70 100644
--- a/app/views/play/level/tome/tome_view.coffee
+++ b/app/views/play/level/tome/TomeView.coffee
@@ -30,11 +30,11 @@
CocoView = require 'views/kinds/CocoView'
template = require 'templates/play/level/tome/tome'
{me} = require 'lib/auth'
-Spell = require './spell'
-SpellListView = require './spell_list_view'
-ThangListView = require './thang_list_view'
-SpellPaletteView = require './spell_palette_view'
-CastButtonView = require './cast_button_view'
+Spell = require './Spell'
+SpellListView = require './SpellListView'
+ThangListView = require './ThangListView'
+SpellPaletteView = require './SpellPaletteView'
+CastButtonView = require './CastButtonView'
window.SHIM_WORKER_PATH = '/javascripts/workers/catiline_worker_shim.js'
diff --git a/app/views/user/JobProfileCodeModal.coffee b/app/views/user/JobProfileCodeModal.coffee
index 397de97cf..307f75847 100644
--- a/app/views/user/JobProfileCodeModal.coffee
+++ b/app/views/user/JobProfileCodeModal.coffee
@@ -1,7 +1,6 @@
ModalView = require 'views/kinds/ModalView'
template = require 'templates/account/job_profile_code_modal'
LevelSessionCodeView = require 'views/common/LevelSessionCodeView'
-console.log 'template', template
module.exports = class JobProfileCodeModal extends ModalView
id: 'job_profile_code_modal'
diff --git a/app/views/user/JobProfileView.coffee b/app/views/user/JobProfileView.coffee
index 488e8c397..47451d590 100644
--- a/app/views/user/JobProfileView.coffee
+++ b/app/views/user/JobProfileView.coffee
@@ -4,11 +4,11 @@ User = require 'models/User'
LevelSession = require 'models/LevelSession'
CocoCollection = require 'collections/CocoCollection'
{me} = require 'lib/auth'
-JobProfileContactView = require 'views/modal/job_profile_contact_modal'
-JobProfileView = require 'views/account/job_profile_view'
+JobProfileContactModal = require 'views/modal/JobProfileContactModal'
+JobProfileTreemaView = require 'views/account/JobProfileTreemaView'
UserRemark = require 'models/UserRemark'
forms = require 'lib/forms'
-ModelModal = require 'views/modal/model_modal'
+ModelModal = require 'views/modal/ModelModal'
JobProfileCodeModal = require './JobProfileCodeModal'
class LevelSessionsCollection extends CocoCollection
@@ -26,7 +26,7 @@ adminContacts = [
{id: '52a57252a89409700d0000d9', name: 'Ignore'}
]
-module.exports = class ProfileView extends UserView
+module.exports = class JobProfileView extends UserView
id: 'profile-view'
template: template
showBackground: false
@@ -70,7 +70,6 @@ module.exports = class ProfileView extends UserView
super()
finishInit: ->
- console.debug 'finishing that init'
return unless @userID
@uploadFilePath = "db/user/#{@userID}"
@highlightedContainers = []
@@ -79,7 +78,6 @@ module.exports = class ProfileView extends UserView
$.post "/db/user/#{@userID}/track/viewed_by_employer" unless me.isAdmin()
@sessions = @supermodel.loadCollection(new LevelSessionsCollection(@userID), 'candidate_sessions').model
if me.isAdmin()
- console.debug 'fetching that remark'
# Mimicking how the VictoryModal fetches LevelFeedback
@remark = new UserRemark()
@remark.setURL "/db/user/#{@userID}/remark"
@@ -277,7 +275,6 @@ module.exports = class ProfileView extends UserView
_.delay ->
justSavedSection.removeClass 'just-saved', duration: 1500, easing: 'easeOutQuad'
, 500
- console.debug @user
if me.isAdmin() and @user
visibleSettings = ['history', 'tasks']
data = _.pick (@remark.attributes), (value, key) -> key in visibleSettings
@@ -306,7 +303,7 @@ module.exports = class ProfileView extends UserView
initializeAutocomplete: (container) ->
(container ? @$el).find('input[data-autocomplete]').each ->
- $(@).autocomplete(source: JobProfileView[$(@).data('autocomplete')], minLength: parseInt($(@).data('autocomplete-min-length')), delay: 0, autoFocus: true)
+ $(@).autocomplete(source: JobProfileTreemaView[$(@).data('autocomplete')], minLength: parseInt($(@).data('autocomplete-min-length')), delay: 0, autoFocus: true)
toggleEditing: ->
@editing = not @editing
@@ -363,7 +360,7 @@ module.exports = class ProfileView extends UserView
null
onContactCandidate: (e) ->
- @openModalView new JobProfileContactView recipientID: @user.id, recipientUserName: @user.get('name')
+ @openModalView new JobProfileContactModal recipientID: @user.id, recipientUserName: @user.get('name')
showErrors: (errors) ->
section = @$el.find '.saving'
diff --git a/bower.json b/bower.json
index e979e2f49..32c815408 100644
--- a/bower.json
+++ b/bower.json
@@ -44,7 +44,7 @@
"bootstrap": "~3.1.1",
"validated-backbone-mediator": "~0.1.3",
"jquery.browser": "~0.0.6",
- "zatanna": "~0.0.2",
+ "zatanna": "~0.0.4",
"modernizr": "~2.8.3"
},
"overrides": {
diff --git a/server/commons/Handler.coffee b/server/commons/Handler.coffee
index 898e2dd4b..e6f29b30f 100644
--- a/server/commons/Handler.coffee
+++ b/server/commons/Handler.coffee
@@ -48,7 +48,7 @@ module.exports = class Handler
# sending functions
sendUnauthorizedError: (res) -> errors.forbidden(res) #TODO: rename sendUnauthorizedError to sendForbiddenError
sendForbiddenError: (res) -> errors.forbidden(res)
- sendNotFoundError: (res) -> errors.notFound(res)
+ sendNotFoundError: (res, message) -> errors.notFound(res, message)
sendMethodNotAllowed: (res) -> errors.badMethod(res)
sendBadInputError: (res, message) -> errors.badInput(res, message)
sendDatabaseError: (res, err) ->
diff --git a/server/plugins/plugins.coffee b/server/plugins/plugins.coffee
index 3aa5bcecf..238bcce3d 100644
--- a/server/plugins/plugins.coffee
+++ b/server/plugins/plugins.coffee
@@ -31,6 +31,9 @@ module.exports.NamedPlugin = (schema) ->
schema.add({name: String, slug: String})
schema.index({'slug': 1}, {unique: true, sparse: true, name: 'slug index'})
+ schema.statics.getBySlug = (slug, done) ->
+ @findOne {slug: slug}, done
+
schema.pre('save', (next) ->
if schema.uses_coco_versions
v = @get('version')
diff --git a/server/queues/scoring.coffee b/server/queues/scoring.coffee
index 9f68f0cc1..d6aa6f3cb 100644
--- a/server/queues/scoring.coffee
+++ b/server/queues/scoring.coffee
@@ -13,7 +13,7 @@ TaskLog = require './task/ScoringTask'
bayes = new (require 'bayesian-battle')()
scoringTaskQueue = undefined
-scoringTaskTimeoutInSeconds = 240
+scoringTaskTimeoutInSeconds = 600
module.exports.setup = (app) -> connectToScoringQueue()
@@ -124,7 +124,7 @@ module.exports.getTwoGames = (req, res) ->
#if userIsAnonymous req then return errors.unauthorized(res, 'You need to be logged in to get games.')
humansGameID = req.body.humansGameID
ogresGameID = req.body.ogresGameID
- ladderGameIDs = ['greed', 'criss-cross', 'brawlwood', 'dungeon-arena', 'gold-rush']
+ ladderGameIDs = ['greed', 'criss-cross', 'brawlwood', 'dungeon-arena', 'gold-rush', 'sky-span']
levelID = _.sample ladderGameIDs
unless ogresGameID and humansGameID
#fetch random games here
diff --git a/server/routes/mail.coffee b/server/routes/mail.coffee
index b75acfce7..4d905b4d1 100644
--- a/server/routes/mail.coffee
+++ b/server/routes/mail.coffee
@@ -361,7 +361,7 @@ employersEmailedDigestMoreThanWeekAgoFilter = (employer, cb) ->
"user": employer._id
"mailTask": @mailTaskName
"sent":
- $gt: new Date(@currentTime.getTime() - 7 * 24 * 60 * 60 * 1000)
+ $gt: new Date(@currentTime.getTime() - 14 * 24 * 60 * 60 * 1000)
MailSent.find(findParameters).lean().exec (err, sentMail) ->
if err?
log.error "Error finding mail sent for task #{@mailTaskName} and employer #employer._id}!"
@@ -384,6 +384,8 @@ sendEmployerNewCandidatesAvailableEmail = (employer, cb) ->
]
User.count countParameters, (err, numberOfCandidatesSinceLogin) =>
if err? then return cb err
+ if numberOfCandidatesSinceLogin < 4
+ return cb null
context =
email_id: "tem_CCcHKr95Nvu5bT7c7iHCtm"
recipient:
@@ -479,26 +481,30 @@ sendUserRemarkTaskEmail = (task, cb) ->
mailTaskName = @mailTaskName
User.findOne("_id":task.contact).select("email").lean().exec (err, contact) ->
if err? then return cb err
- context =
- email_id: "tem_aryDjyw6JmEmbKtCMTSwAM"
- recipient:
- address: contact.email
- email_data:
- candidate_link: "http://codecombat.com/account/profile/#{task.user}"
- due_date: task.date
- log.info "Sending recruitment task reminder to #{contact.email}"
- newSentMail =
- mailTask: mailTaskName
- user: task.contact
- "metadata":
- remarkID: task.remarkID
- taskAction: task.action
- date: task.date
- MailSent.create newSentMail, (err) ->
+ User.findOne("_id":task.user).select("jobProfile.name").lean().exec (err, user) ->
if err? then return cb err
- sendwithus.api.send context, (err, result) ->
- log.error "Error sending #{mailTaskName} to #{contact.email}: #{err} with result #{result}" if err
- cb null
+ context =
+ email_id: "tem_aryDjyw6JmEmbKtCMTSwAM"
+ recipient:
+ address: contact.email
+ email_data:
+ task_text: task.action
+ candidate_name: user.jobProfile?.name ? "(Name not listed in job profile)"
+ candidate_link: "http://codecombat.com/account/profile/#{task.user}"
+ due_date: task.date
+ log.info "Sending recruitment task reminder to #{contact.email}"
+ newSentMail =
+ mailTask: mailTaskName
+ user: task.contact
+ "metadata":
+ remarkID: task.remarkID
+ taskAction: task.action
+ date: task.date
+ MailSent.create newSentMail, (err) ->
+ if err? then return cb err
+ sendwithus.api.send context, (err, result) ->
+ log.error "Error sending #{mailTaskName} to #{contact.email}: #{err} with result #{result}" if err
+ cb null
### New Recruit Leaderboard Email ###
###
diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee
index dfc1de92f..de3484641 100644
--- a/server/users/user_handler.coffee
+++ b/server/users/user_handler.coffee
@@ -30,7 +30,7 @@ UserHandler = class UserHandler extends Handler
'name', 'photoURL', 'password', 'anonymous', 'wizardColor1', 'volume',
'firstName', 'lastName', 'gender', 'facebookID', 'gplusID', 'emails',
'testGroupNumber', 'music', 'hourOfCode', 'hourOfCodeComplete', 'preferredLanguage',
- 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel', 'jobProfile'
+ 'wizard', 'aceConfig', 'autocastDelay', 'lastLevel', 'jobProfile', 'savedEmployerFilterAlerts'
]
getEditableProperties: (req, document) ->
@@ -241,33 +241,42 @@ UserHandler = class UserHandler extends Handler
documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents)
@sendSuccess(res, documents)
- getLevelSessions: (req, res, userID) ->
- query = creator: userID
- isAuthorized = req.user._id+'' is userID or req.user.isAdmin()
- projection = {}
- if req.query.project
- projection[field] = 1 for field in req.query.project.split(',') when isAuthorized or not (field in LevelSessionHandler.privateProperties)
- else unless isAuthorized
- projection[field] = 0 for field in LevelSessionHandler.privateProperties
- sort = {}
- sort.changed = req.query.order if req.query.order
+ IDify: (idOrSlug, done) ->
+ return done null, idOrSlug if Handler.isID idOrSlug
+ User.getBySlug idOrSlug, (err, user) -> done err, user?.get '_id'
- LevelSession.find(query).select(projection).sort(sort).exec (err, documents) =>
- return @sendDatabaseError(res, err) if err
- documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents)
- @sendSuccess(res, documents)
+ getLevelSessions: (req, res, userIDOrSlug) ->
+ @IDify userIDOrSlug, (err, userID) =>
+ return @sendDatabaseError res, err if err
+ return @sendNotFoundError res unless userID?
+ query = creator: userID + ''
+ isAuthorized = req.user._id+'' is userID or req.user.isAdmin()
+ projection = {}
+ if req.query.project
+ projection[field] = 1 for field in req.query.project.split(',') when isAuthorized or not (field in LevelSessionHandler.privateProperties)
+ else unless isAuthorized
+ projection[field] = 0 for field in LevelSessionHandler.privateProperties
+ sort = {}
+ sort.changed = req.query.order if req.query.order
- getEarnedAchievements: (req, res, userID) ->
- queryObject = {$query: {user: userID}, $orderby: {changed: -1}}
- queryObject.$query.notified = false if req.query.notified is 'false'
- query = EarnedAchievement.find(queryObject)
- query.exec (err, documents) =>
- return @sendDatabaseError(res, err) if err?
- cleandocs = (@formatEntity(req, doc) for doc in documents)
- for doc in documents # Maybe move this logic elsewhere
- doc.set('notified', true)
- doc.save()
- @sendSuccess(res, cleandocs)
+ LevelSession.find(query).select(projection).sort(sort).exec (err, documents) =>
+ return @sendDatabaseError(res, err) if err
+ documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents)
+ @sendSuccess(res, documents)
+
+ getEarnedAchievements: (req, res, userIDOrSlug) ->
+ @IDify userIDOrSlug, (err, userID) =>
+ return @sendDatabaseError res, err if err
+ return @sendNotFoundError res unless userID?
+ query = user: userID + ''
+ query.notified = false if req.query.notified is 'false'
+ EarnedAchievement.find(query).sort(changed: -1).exec (err, documents) =>
+ return @sendDatabaseError(res, err) if err?
+ cleandocs = (@formatEntity(req, doc) for doc in documents)
+ for doc in documents # TODO Ruben Maybe move this logic elsewhere
+ doc.set('notified', true)
+ doc.save()
+ @sendSuccess(res, cleandocs)
getRecentlyPlayed: (req, res, userID) ->
twoWeeksAgo = moment().subtract('days', 14).toDate()
diff --git a/test/app/require.spec.coffee b/test/app/require.spec.coffee
new file mode 100644
index 000000000..33ebcf846
--- /dev/null
+++ b/test/app/require.spec.coffee
@@ -0,0 +1,9 @@
+describe 'require', ->
+ it 'has no modules that error when you import them', ->
+ modules = window.require.list()
+ for module in modules
+ try
+ require(module)
+ catch
+ console.error 'Could not load', module
+ expect(false).toBe(true)
\ No newline at end of file
diff --git a/test/app/views/editor/level/EditorLevelView.spec.coffee b/test/app/views/editor/level/EditorLevelView.spec.coffee
index 47b32700f..7a9064993 100644
--- a/test/app/views/editor/level/EditorLevelView.spec.coffee
+++ b/test/app/views/editor/level/EditorLevelView.spec.coffee
@@ -1,11 +1,11 @@
-EditorLevelView = require 'views/editor/level/edit'
+LevelEditView = require 'views/editor/level/LevelEditView'
emptyLevel = {'_id': '53a0a1e2d9048dbc3a793c81', 'name': 'Emptiness', 'description': 'Tis nothing..', 'documentation': {'generalArticles': [], 'specificArticles': []}, 'scripts': [], 'thangs': [], 'systems': [], 'victory': {}, 'version': {'minor': 0, 'major': 0, 'isLatestMajor': true, 'isLatestMinor': true}, 'index': '5388f9ac9a904d0000d94f87', 'slug': 'emptiness', 'creator': '5388f9ac9a904d0000d94f87', 'original': '53a0a1e2d9048dbc3a793c81', 'watchers': ['5388f9ac9a904d0000d94f87'], '__v': 0, 'created': '2014-06-17T20:15:30.207Z', 'permissions': [{'access': 'owner', 'target': '5388f9ac9a904d0000d94f87'}]}
-describe 'EditorLevelView', ->
+describe 'LevelEditView', ->
describe 'revert button', ->
it 'opens just one modal when you click it', ->
- view = new EditorLevelView({}, 'something')
+ view = new LevelEditView({}, 'something')
request = jasmine.Ajax.requests.first()
request.response {status: 200, responseText: JSON.stringify(emptyLevel)}
view.render()
diff --git a/test/app/views/home_view.spec.coffee b/test/app/views/home_view.spec.coffee
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/app/views/modal/AuthModalView.spec.coffee b/test/app/views/modal/AuthModal.spec.coffee
similarity index 53%
rename from test/app/views/modal/AuthModalView.spec.coffee
rename to test/app/views/modal/AuthModal.spec.coffee
index 01bd1b98e..199b265f4 100644
--- a/test/app/views/modal/AuthModalView.spec.coffee
+++ b/test/app/views/modal/AuthModal.spec.coffee
@@ -1,12 +1,12 @@
-AuthModalView = require 'views/modal/auth_modal'
-RecoverModalView = require 'views/modal/recover_modal'
+AuthModal = require 'views/modal/AuthModal'
+RecoverModal = require 'views/modal/RecoverModal'
-describe 'AuthModalView', ->
+describe 'AuthModal', ->
it 'opens the recover modal when you click the recover link', ->
- m = new AuthModalView()
+ m = new AuthModal()
m.render()
spyOn(m, 'openModalView')
m.$el.find('#link-to-recover').click()
expect(m.openModalView.calls.count()).toEqual(1)
args = m.openModalView.calls.argsFor(0)
- expect(args[0] instanceof RecoverModalView).toBeTruthy()
+ expect(args[0] instanceof RecoverModal).toBeTruthy()
diff --git a/test/app/views/play/ladder/ladder_tab.spec.coffee b/test/app/views/play/ladder/LadderTabView.coffee
similarity index 91%
rename from test/app/views/play/ladder/ladder_tab.spec.coffee
rename to test/app/views/play/ladder/LadderTabView.coffee
index 0f74b341b..e23fc26be 100644
--- a/test/app/views/play/ladder/ladder_tab.spec.coffee
+++ b/test/app/views/play/ladder/LadderTabView.coffee
@@ -1,4 +1,4 @@
-LadderTabView = require 'views/play/ladder/ladder_tab'
+LadderTabView = require 'views/play/ladder/LadderTabView'
Level = require 'models/Level'
fixtures = require 'test/app/fixtures/levels'
diff --git a/test/demo/views/user/JobProfileView.demo.coffee b/test/demo/views/user/JobProfileView.demo.coffee
index 17ac8767b..5ab643f87 100644
--- a/test/demo/views/user/JobProfileView.demo.coffee
+++ b/test/demo/views/user/JobProfileView.demo.coffee
@@ -1,4 +1,4 @@
-ProfileView = require 'views/account/profile_view'
+JobProfileView = require 'views/account/JobProfileView'
responses =
'/db/user/joe/nameToID':'512ef4805a67a8c507000001'
@@ -564,7 +564,7 @@ responses =
module.exports = ->
me.isAdmin = -> false
me.set('permissions', ['employer'])
- v = new ProfileView({}, 'joe')
+ v = new JobProfileView({}, 'joe')
for url, responseBody of responses
requests = jasmine.Ajax.requests.filter(url)
if not requests.length
diff --git a/test/server/functional/level_session.spec.coffee b/test/server/functional/level_session.spec.coffee
index ba0265cf0..eddb3407c 100644
--- a/test/server/functional/level_session.spec.coffee
+++ b/test/server/functional/level_session.spec.coffee
@@ -1,12 +1,64 @@
require '../common'
-describe 'LevelFeedback', ->
+describe '/db/level.session', ->
- url = getURL('/db/level.session')
+ url = getURL('/db/level.session/')
+ session =
+ permissions: simplePermissions
it 'get schema', (done) ->
- request.get {uri: url+'/schema'}, (err, res, body) ->
+ request.get {uri: url+'schema'}, (err, res, body) ->
expect(res.statusCode).toBe(200)
body = JSON.parse(body)
expect(body.type).toBeDefined()
done()
+
+ it 'clears things first', (done) ->
+ clearModels [LevelSession], (err) ->
+ expect(err).toBeNull()
+ done()
+
+ # TODO Tried to mimic what happens on the site. Why is this even so hard to do.
+ # Right now it's even possible to create ownerless sessions through POST
+ xit 'allows users to create level sessions through PATCH', (done) ->
+ loginJoe (joe) ->
+ console.log url + mongoose.Types.ObjectId()
+ request {method: 'patch', uri: url + mongoose.Types.ObjectId(), json: session}, (err, res, body) ->
+ expect(err).toBeNull()
+ expect(res.statusCode).toBe 200
+ console.log body
+ expect(body.creator).toEqual joe.get('_id').toHexString()
+ done()
+
+ # Should remove this as soon as the PATCH test case above works
+ it 'create a level session', (done) ->
+ unittest.getNormalJoe (joe) ->
+ session.creator = joe.get('_id').toHexString()
+ session = new LevelSession session
+ session.save (err) ->
+ expect(err).toBeNull()
+ done()
+
+ it 'GET /db/user//level.sessions gets a user\'s level sessions', (done) ->
+ unittest.getNormalJoe (joe) ->
+ request.get {uri: getURL "/db/user/#{joe.get '_id'}/level.sessions"}, (err, res, body) ->
+ expect(err).toBeNull()
+ expect(res.statusCode).toBe 200
+ sessions = JSON.parse body
+ expect(sessions.length).toBe 1
+ done()
+
+ it 'GET /db/user//level.sessions gets a user\'s level sessions', (done) ->
+ unittest.getNormalJoe (joe) ->
+ request.get {uri: getURL "/db/user/#{joe.get 'slug'}/level.sessions"}, (err, res, body) ->
+ expect(err).toBeNull()
+ expect(res.statusCode).toBe 200
+ sessions = JSON.parse body
+ expect(sessions.length).toBe 1
+ done()
+
+ it 'GET /db/user//level.sessions returns 404 if user not found', (done) ->
+ request.get {uri: getURL "/db/user/misterschtroumpf/level.sessions"}, (err, res) ->
+ expect(err).toBeNull()
+ expect(res.statusCode).toBe 404
+ done()