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

BLD-506: Update behavior of start/end time fields.

Browse Source
This commit is contained in:
polesye
2013-12-05 18:28:25 +02:00
parent bc625ab571
commit 70518a4659
9 changed files with 155 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/static/coffee/spec/main.coffee
View File

@@ -18,7 +18,6 @@ requirejs.config({
"jquery.iframe-transport": "xmodule_js/common_static/js/vendor/jQuery-File-Upload/js/jquery.iframe-transport",
"jquery.inputnumber": "xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill",
"jquery.immediateDescendents": "xmodule_js/common_static/coffee/src/jquery.immediateDescendents",
"jquery.maskedinput": "xmodule_js/common_static/js/vendor/jquery.maskedinput.min",
"datepair": "xmodule_js/common_static/js/vendor/timepicker/datepair",
"date": "xmodule_js/common_static/js/vendor/date",
"underscore": "xmodule_js/common_static/js/vendor/underscore-min",
@@ -98,10 +97,6 @@ requirejs.config({
deps: ["jquery"],
exports: "jQuery.fn.inputNumber"
},
"jquery.maskedinput": {
deps: ["jquery"],
exports: "jQuery.fn.mask"
},
"jquery.tinymce": {
deps: ["jquery", "tinymce"],
exports: "jQuery.fn.tinymce"

87
cms/static/coffee/spec/views/metadata_edit_spec.coffee
View File

@@ -391,8 +391,95 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
it "returns the intial value upon initialization", ->
assertValueInView(@view, '12:12:12')
it "value is converted correctly", ->
view = @view
cases = [
{
input: '23:100:0'
output: '23:59:59'
},
{
input: '100000000000000000'
output: '23:59:59'
},
{
input: '80000'
output: '22:13:20'
},
{
input: '-100'
output: '00:00:00'
},
{
input: '-100:-10'
output: '00:00:00'
},
{
input: '99:99'
output: '01:40:39'
},
{
input: '2'
output: '00:00:02'
},
{
input: '1:2'
output: '00:01:02'
},
{
input: '1:25'
output: '00:01:25'
},
{
input: '3:1:25'
output: '03:01:25'
},
{
input: ' 2 3 : 5 9 : 5 9 '
output: '23:59:59'
},
{
input: '9:1:25'
output: '09:01:25'
},
{
input: '77:72:77'
output: '23:59:59'
},
{
input: '22:100:100'
output: '23:41:40'
},
# negative value
{
input: '-22:22:22'
output: '00:22:22'
},
# simple string
{
input: 'simple text'
output: '00:00:00'
},
{
input: 'a10a:a10a:a10a'
output: '00:00:00'
},
# empty string
{
input: ''
output: '00:00:00'
}
]
$.each cases, (index, data) ->
expect(view.parseRelativeTime(data.input)).toBe(data.output)
it "can update its value in the view", ->
assertCanUpdateView(@view, "23:59:59")
@view.setValueInEditor("33:59:59")
@view.updateModel()
assertValueInView(@view, "23:59:59")
it "has a clear method to revert to the model default", ->
assertClear(@view, '00:00:00')