Commit c0c5e920 by cahrens

Go back to setFixtures.

parent 2f504ec4
...@@ -27,7 +27,7 @@ describe "AJAX Errors", -> ...@@ -27,7 +27,7 @@ describe "AJAX Errors", ->
tpl = readFixtures('system-feedback.underscore') tpl = readFixtures('system-feedback.underscore')
beforeEach -> beforeEach ->
appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(tpl)) setFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(tpl))
appendSetFixtures(sandbox({id: "page-notification"})) appendSetFixtures(sandbox({id: "page-notification"}))
@requests = requests = [] @requests = requests = []
@xhr = sinon.useFakeXMLHttpRequest() @xhr = sinon.useFakeXMLHttpRequest()
......
tpl = readFixtures('system-feedback.underscore') tpl = readFixtures('system-feedback.underscore')
beforeEach -> beforeEach ->
appendSetFixtures(sandbox({id: "page-alert"})) setFixtures(sandbox({id: "page-alert"}))
appendSetFixtures(sandbox({id: "page-notification"})) appendSetFixtures(sandbox({id: "page-notification"}))
appendSetFixtures(sandbox({id: "page-prompt"})) appendSetFixtures(sandbox({id: "page-prompt"}))
appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(tpl)) appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(tpl))
......
editorTemplate = readFixtures('metadata-editor.underscore') describe "Test Metadata Editor", ->
numberEntryTemplate = readFixtures('metadata-number-entry.underscore') editorTemplate = readFixtures('metadata-editor.underscore')
stringEntryTemplate = readFixtures('metadata-string-entry.underscore') numberEntryTemplate = readFixtures('metadata-number-entry.underscore')
optionEntryTemplate = readFixtures('metadata-option-entry.underscore') stringEntryTemplate = readFixtures('metadata-string-entry.underscore')
optionEntryTemplate = readFixtures('metadata-option-entry.underscore')
beforeEach -> beforeEach ->
appendSetFixtures($("<script>", {id: "metadata-editor-tpl", type: "text/template"}).text(editorTemplate)) setFixtures($("<script>", {id: "metadata-editor-tpl", type: "text/template"}).text(editorTemplate))
appendSetFixtures($("<script>", {id: "metadata-number-entry", type: "text/template"}).text(numberEntryTemplate)) appendSetFixtures($("<script>", {id: "metadata-number-entry", type: "text/template"}).text(numberEntryTemplate))
appendSetFixtures($("<script>", {id: "metadata-string-entry", type: "text/template"}).text(stringEntryTemplate)) appendSetFixtures($("<script>", {id: "metadata-string-entry", type: "text/template"}).text(stringEntryTemplate))
appendSetFixtures($("<script>", {id: "metadata-option-entry", type: "text/template"}).text(optionEntryTemplate)) appendSetFixtures($("<script>", {id: "metadata-option-entry", type: "text/template"}).text(optionEntryTemplate))
genericEntry = { genericEntry = {
default_value: 'default value', default_value: 'default value',
display_name: "Display Name", display_name: "Display Name",
explicitly_set: true, explicitly_set: true,
...@@ -19,9 +20,9 @@ genericEntry = { ...@@ -19,9 +20,9 @@ genericEntry = {
options: [], options: [],
type: CMS.Models.Metadata.GENERIC_TYPE, type: CMS.Models.Metadata.GENERIC_TYPE,
value: "Word cloud" value: "Word cloud"
} }
selectEntry = { selectEntry = {
default_value: "answered", default_value: "answered",
display_name: "Show Answer", display_name: "Show Answer",
explicitly_set: false, explicitly_set: false,
...@@ -35,9 +36,9 @@ selectEntry = { ...@@ -35,9 +36,9 @@ selectEntry = {
], ],
type: CMS.Models.Metadata.SELECT_TYPE, type: CMS.Models.Metadata.SELECT_TYPE,
value: "always" value: "always"
} }
integerEntry = { integerEntry = {
default_value: 5, default_value: 5,
display_name: "Inputs", display_name: "Inputs",
explicitly_set: false, explicitly_set: false,
...@@ -47,9 +48,9 @@ integerEntry = { ...@@ -47,9 +48,9 @@ integerEntry = {
options: {min: 1}, options: {min: 1},
type: CMS.Models.Metadata.INTEGER_TYPE, type: CMS.Models.Metadata.INTEGER_TYPE,
value: 5 value: 5
} }
floatEntry = { floatEntry = {
default_value: 2.7, default_value: 2.7,
display_name: "Weight", display_name: "Weight",
explicitly_set: true, explicitly_set: true,
...@@ -59,10 +60,10 @@ floatEntry = { ...@@ -59,10 +60,10 @@ floatEntry = {
options: {min: 1.3, max:100.2, step:0.1}, options: {min: 1.3, max:100.2, step:0.1},
type: CMS.Models.Metadata.FLOAT_TYPE, type: CMS.Models.Metadata.FLOAT_TYPE,
value: 10.2 value: 10.2
} }
# Test for the editor that creates the individual views. # Test for the editor that creates the individual views.
describe "CMS.Views.Metadata.Editor creates editors for each field", -> describe "CMS.Views.Metadata.Editor creates editors for each field", ->
beforeEach -> beforeEach ->
@model = new Backbone.Model({ @model = new Backbone.Model({
num_inputs: integerEntry, num_inputs: integerEntry,
...@@ -141,32 +142,32 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", -> ...@@ -141,32 +142,32 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", ->
num_inputs: 20 num_inputs: 20
}) })
# Tests for individual views. # Tests for individual views.
assertInputType = (view, expectedType) -> assertInputType = (view, expectedType) ->
input = view.$el.find('.setting-input') input = view.$el.find('.setting-input')
expect(input.length).toBe(1) expect(input.length).toBe(1)
expect(input[0].type).toBe(expectedType) expect(input[0].type).toBe(expectedType)
assertValueInView = (view, expectedValue) -> assertValueInView = (view, expectedValue) ->
expect(view.getValueFromEditor()).toBe(expectedValue) expect(view.getValueFromEditor()).toBe(expectedValue)
assertCanUpdateView = (view, newValue) -> assertCanUpdateView = (view, newValue) ->
view.setValueInEditor(newValue) view.setValueInEditor(newValue)
expect(view.getValueFromEditor()).toBe(newValue) expect(view.getValueFromEditor()).toBe(newValue)
assertClear = (view, modelValue, editorValue=modelValue) -> assertClear = (view, modelValue, editorValue=modelValue) ->
view.clear() view.clear()
expect(view.model.getValue()).toBe(null) expect(view.model.getValue()).toBe(null)
expect(view.model.getDisplayValue()).toBe(modelValue) expect(view.model.getDisplayValue()).toBe(modelValue)
expect(view.getValueFromEditor()).toBe(editorValue) expect(view.getValueFromEditor()).toBe(editorValue)
assertUpdateModel = (view, originalValue, newValue) -> assertUpdateModel = (view, originalValue, newValue) ->
view.setValueInEditor(newValue) view.setValueInEditor(newValue)
expect(view.model.getValue()).toBe(originalValue) expect(view.model.getValue()).toBe(originalValue)
view.updateModel() view.updateModel()
expect(view.model.getValue()).toBe(newValue) expect(view.model.getValue()).toBe(newValue)
describe "CMS.Views.Metadata.String is a basic string input with clear functionality", -> describe "CMS.Views.Metadata.String is a basic string input with clear functionality", ->
beforeEach -> beforeEach ->
model = new CMS.Models.Metadata(genericEntry) model = new CMS.Models.Metadata(genericEntry)
@view = new CMS.Views.Metadata.String({model: model}) @view = new CMS.Views.Metadata.String({model: model})
...@@ -186,7 +187,7 @@ describe "CMS.Views.Metadata.String is a basic string input with clear functiona ...@@ -186,7 +187,7 @@ describe "CMS.Views.Metadata.String is a basic string input with clear functiona
it "has an update model method", -> it "has an update model method", ->
assertUpdateModel(@view, 'Word cloud', 'updated') assertUpdateModel(@view, 'Word cloud', 'updated')
describe "CMS.Views.Metadata.Option is an option input type with clear functionality", -> describe "CMS.Views.Metadata.Option is an option input type with clear functionality", ->
beforeEach -> beforeEach ->
model = new CMS.Models.Metadata(selectEntry) model = new CMS.Models.Metadata(selectEntry)
@view = new CMS.Views.Metadata.Option({model: model}) @view = new CMS.Views.Metadata.Option({model: model})
...@@ -210,7 +211,7 @@ describe "CMS.Views.Metadata.Option is an option input type with clear functiona ...@@ -210,7 +211,7 @@ describe "CMS.Views.Metadata.Option is an option input type with clear functiona
@view.setValueInEditor("not an option") @view.setValueInEditor("not an option")
expect(@view.getValueFromEditor()).toBe('always') expect(@view.getValueFromEditor()).toBe('always')
describe "CMS.Views.Metadata.Number supports integer or float type and has clear functionality", -> describe "CMS.Views.Metadata.Number supports integer or float type and has clear functionality", ->
beforeEach -> beforeEach ->
integerModel = new CMS.Models.Metadata(integerEntry) integerModel = new CMS.Models.Metadata(integerEntry)
@integerView = new CMS.Views.Metadata.Number({model: integerModel}) @integerView = new CMS.Views.Metadata.Number({model: integerModel})
......
...@@ -4,7 +4,7 @@ describe "CMS.Views.ModuleEdit", -> ...@@ -4,7 +4,7 @@ describe "CMS.Views.ModuleEdit", ->
@stubModule.id = 'stub-id' @stubModule.id = 'stub-id'
appendSetFixtures """ setFixtures """
<li class="component" id="stub-id"> <li class="component" id="stub-id">
<div class="component-editor"> <div class="component-editor">
<div class="module-editor"> <div class="module-editor">
......
...@@ -29,7 +29,7 @@ describe "CMS.Views.SectionEdit", -> ...@@ -29,7 +29,7 @@ describe "CMS.Views.SectionEdit", ->
feedback_tpl = readFixtures('system-feedback.underscore') feedback_tpl = readFixtures('system-feedback.underscore')
beforeEach -> beforeEach ->
appendSetFixtures($("<script>", {id: "section-name-edit-tpl", type: "text/template"}).text(tpl)) setFixtures($("<script>", {id: "section-name-edit-tpl", type: "text/template"}).text(tpl))
appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedback_tpl)) appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedback_tpl))
spyOn(CMS.Views.SectionEdit.prototype, "switchToShowView") spyOn(CMS.Views.SectionEdit.prototype, "switchToShowView")
.andCallThrough() .andCallThrough()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment