Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Jasmine tests related to invalid messages for section model

Browse Source
This commit is contained in:
David Baumgold
2013-05-16 09:29:58 -04:00
parent 2b01273f7f
commit 9cbfee9894
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cms/static/coffee/spec/views/section_spec.coffee
View File

@@ -31,7 +31,7 @@ describe "CMS.Views.SectionEdit", ->
setFixtures($("<script>", {id: "section-name-edit-tpl", type: "text/template"}).text(tpl))
spyOn(CMS.Views.SectionEdit.prototype, "switchToShowView")
.andCallThrough()
spyOn(CMS.Views.SectionEdit.prototype, "showErrorMessage")
spyOn(CMS.Views.SectionEdit.prototype, "showInvalidMessage")
.andCallThrough()
window.analytics = jasmine.createSpyObj('analytics', ['track'])
window.course_location_analytics = jasmine.createSpy()
@@ -68,12 +68,9 @@ describe "CMS.Views.SectionEdit", ->
@requests[0].respond(200)
expect(@view.switchToShowView).toHaveBeenCalled()
it "should call showErrorMessage when save() is unsuccessful", ->
it "should call showInvalidMessage when validation is unsuccessful", ->
spyOn(@model, 'validate').andReturn("BLARRGH")
@view.$("input[type=submit]").click()
@requests[0].respond(500)
expect(@view.showErrorMessage).toHaveBeenCalled()
expect(@view.showInvalidMessage).toHaveBeenCalledWith(
jasmine.any(Object), "BLARRGH", jasmine.any(Object))
expect(@view.switchToShowView).not.toHaveBeenCalled()

4
cms/static/js/views/section.js
View File

@@ -26,7 +26,7 @@ CMS.Views.SectionEdit = Backbone.View.extend({
},
initialize: function() {
this.template = _.template($("#section-name-edit-tpl").text());
this.listenTo(this.model, "invalid", this.showErrorMessage);
this.listenTo(this.model, "invalid", this.showInvalidMessage);
this.render();
},
events: {
@@ -58,7 +58,7 @@ CMS.Views.SectionEdit = Backbone.View.extend({
this.stopListening();
this.showView.render();
},
showErrorMessage: function(model, error, options) {
showInvalidMessage: function(model, error, options) {
var that = this;
var msg = new CMS.Models.ErrorMessage({
title: "Validation Error",