From e440580c7967e73fd3e08db515115bbbe46fa37d Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Mon, 13 May 2013 10:45:55 -0400 Subject: [PATCH] Started writing Backbone tests Hacking the Python, because our JS dependency management is borked. --- cms/envs/common.py | 3 ++- cms/static/coffee/spec/models/feedback_spec.coffee | 5 +++++ cms/static/js/models/feedback.js | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 cms/static/coffee/spec/models/feedback_spec.coffee diff --git a/cms/envs/common.py b/cms/envs/common.py index 038c00ddbb..8a5643bce6 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -221,7 +221,8 @@ PIPELINE_JS = { 'source_filenames': sorted( rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') + rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js') - ) + ['js/hesitate.js', 'js/base.js'], + ) + ['js/hesitate.js', 'js/base.js', + 'js/models/feedback.js', 'js/views/feedback.js'], 'output_filename': 'js/cms-application.js', 'test_order': 0 }, diff --git a/cms/static/coffee/spec/models/feedback_spec.coffee b/cms/static/coffee/spec/models/feedback_spec.coffee new file mode 100644 index 0000000000..c18fff8739 --- /dev/null +++ b/cms/static/coffee/spec/models/feedback_spec.coffee @@ -0,0 +1,5 @@ +describe "CMS.Models.SystemFeedback", -> + m = new CMS.Models.SystemFeedback() + + it "should have an empty message by default", -> + expect(m.get("message")).toEqual("") diff --git a/cms/static/js/models/feedback.js b/cms/static/js/models/feedback.js index 1bd8f0b066..65de44115d 100644 --- a/cms/static/js/models/feedback.js +++ b/cms/static/js/models/feedback.js @@ -1,8 +1,8 @@ CMS.Models.SystemFeedback = Backbone.Model.extend({ defaults: { "type": null, // "warning", "confirmation", "error", "announcement", "step-required", etc - "title": null, - "message": null, + "title": "", + "message": "", "shown": true, "close": false, // show a close button? "icon": true, // show an icon?