diff --git a/app/assets/images/pages/base/logo.png b/app/assets/images/pages/base/logo.png index 0640f4147..a33d4f6ea 100644 Binary files a/app/assets/images/pages/base/logo.png and b/app/assets/images/pages/base/logo.png differ diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index bf7f04a9b..d8cc7c7ed 100644 --- a/app/models/ThangType.coffee +++ b/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')] diff --git a/app/templates/base-flat.jade b/app/templates/base-flat.jade index c93b52906..737c5b376 100644 --- a/app/templates/base-flat.jade +++ b/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 diff --git a/test/app/views/teachers/InviteToClassroomModal.spec.coffee b/test/app/views/teachers/InviteToClassroomModal.spec.coffee new file mode 100644 index 000000000..29a59093f --- /dev/null +++ b/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