Merge branch 'master' into production

app/models/ThangType.coffee

@@ -256,7 +256,7 @@ module.exports = class ThangType extends CocoModel
       "Sorcerer": "Pender"
       "Trapper": "Senick"
       "Champion": "Ida"
-      "Duelist": "Nando"
+      "Duelist": "Alejandro"
     }
     map[@get('name')]
 

app/templates/base-flat.jade

@@ -81,8 +81,6 @@ mixin accountLinks
         p If this is showing, you dun goofed
 
   block footer
-    #character-lineup.text-center.m-t-3
-      img(src="/images/pages/home/character_lineup.png")
     .container-fluid
       #footer.small
         .container

test/app/views/teachers/InviteToClassroomModal.spec.coffee

@@ -0,0 +1,29 @@
+InviteToClassroomModal = require 'views/courses/InviteToClassroomModal'
+User = require 'models/User'
+factories = require 'test/app/factories'
+
+describe 'InviteToClassroomModal', ->
+
+  modal = null
+
+  beforeEach (done) ->
+    window.me = @teacher = factories.makeUser()
+    @classroom = factories.makeClassroom({ code: "wordsouphere", codeCamel: "WordSoupHere", ownerID: @teacher.id })
+    modal = new InviteToClassroomModal({ @classroom })
+    jasmine.demoModal(modal)
+    modal.render()
+    _.defer done
+
+  describe 'Invite by email', ->
+    beforeEach (done) ->
+      @emails = ['test@example.com', 'test2@example.com']
+      modal.$('#invite-emails-textarea').val(@emails.join('\n'))
+      modal.$('#send-invites-btn').click()
+      _.defer done
+
+    it 'sends the request', (done) ->
+      request = jasmine.Ajax.requests.mostRecent()
+      expect(request.url).toBe("/db/classroom/#{@classroom.id}/invite-members")
+      expect(request.method).toBe("POST")
+      expect(request.data()['emails[]']).toEqual(@emails)
+      _.defer done