Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
68c6a7c7
Commit
68c6a7c7
authored
Nov 12, 2013
by
Valera Rozuvan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1623 from edx/valera/fix_js_error_transcripts_editor_spec
Fix JavaScript typo in transcripts editor spec.
parents
2261d4c4
bf9e525e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
159 additions
and
112 deletions
+159
-112
cms/static/js/views/transcripts/message_manager.js
+1
-1
cms/static/js/views/transcripts/metadata_videolist.js
+3
-1
cms/static/js_spec/transcripts/editor_spec.js
+12
-13
cms/static/js_spec/transcripts/videolist_spec.js
+143
-97
No files found.
cms/static/js/views/transcripts/message_manager.js
View file @
68c6a7c7
...
@@ -68,7 +68,7 @@ function($, Backbone, _, Utils, FileUploader, gettext) {
...
@@ -68,7 +68,7 @@ function($, Backbone, _, Utils, FileUploader, gettext) {
if
(
!
tplHtml
)
{
if
(
!
tplHtml
)
{
console
.
error
(
'Couldn
\'
t load Transcripts status template'
);
console
.
error
(
'Couldn
\'
t load Transcripts status template'
);
return
;
return
this
;
}
}
template
=
_
.
template
(
tplHtml
);
template
=
_
.
template
(
tplHtml
);
...
...
cms/static/js/views/transcripts/metadata_videolist.js
View file @
68c6a7c7
...
@@ -28,7 +28,9 @@ function($, Backbone, _, AbstractEditor, Utils, MessageManager, MetadataView) {
...
@@ -28,7 +28,9 @@ function($, Backbone, _, AbstractEditor, Utils, MessageManager, MetadataView) {
// Initialize MessageManager that is responsible for
// Initialize MessageManager that is responsible for
// status messages and errors.
// status messages and errors.
this
.
messenger
=
new
MessageManager
({
var
messenger
=
this
.
options
.
MessageManager
||
MessageManager
;
this
.
messenger
=
new
messenger
({
el
:
this
.
$el
,
el
:
this
.
$el
,
parent
:
this
parent
:
this
});
});
...
...
cms/static/js_spec/transcripts/editor_spec.js
View file @
68c6a7c7
...
@@ -169,11 +169,10 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -169,11 +169,10 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
},
"Defaults never loaded"
,
1000
);
},
"Defaults never loaded"
,
1000
);
runs
(
function
()
{
runs
(
function
()
{
var
displayNameValue
=
collection
[
0
].
getValue
(),
videoUrlValue
=
collection
[
1
].
getValue
();
var
displayNameValue
=
collection
[
0
].
getValue
();
expect
(
displayNameValue
).
toEqual
(
'default'
);
var
videoUrlValue
=
collection
[
1
].
getValue
();
expect
(
displayNameValue
).
toBe
(
'default'
);
expect
(
videoUrlValue
).
toEqual
([
expect
(
videoUrlValue
).
toEqual
([
'http://youtu.be/OEoXaMPEzfM'
,
'http://youtu.be/OEoXaMPEzfM'
,
'default.mp4'
,
'default.mp4'
,
...
@@ -237,13 +236,13 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -237,13 +236,13 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
var
html5SourcesValue
=
collection
[
2
].
getValue
();
var
html5SourcesValue
=
collection
[
2
].
getValue
();
var
youtubeValue
=
collection
[
3
].
getValue
();
var
youtubeValue
=
collection
[
3
].
getValue
();
expect
(
displayNameValue
).
to
Be
(
'display value'
);
expect
(
displayNameValue
).
to
Equal
(
'display value'
);
expect
(
subValue
).
to
Be
(
'default'
);
expect
(
subValue
).
to
Equal
(
'default'
);
expect
(
html5SourcesValue
).
toEqual
([
expect
(
html5SourcesValue
).
toEqual
([
'video.mp4'
,
'video.mp4'
,
'video.webm'
'video.webm'
]);
]);
expect
(
youtubeValue
).
to
Be
(
'12345678901'
);
expect
(
youtubeValue
).
to
Equal
(
'12345678901'
);
});
});
});
});
...
@@ -256,13 +255,13 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -256,13 +255,13 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
html5SourcesValue
=
collection
[
2
].
getValue
(),
html5SourcesValue
=
collection
[
2
].
getValue
(),
youtubeValue
=
collection
[
3
].
getValue
();
youtubeValue
=
collection
[
3
].
getValue
();
expect
(
displayNameValue
).
to
Be
(
'default'
);
expect
(
displayNameValue
).
to
Equal
(
'default'
);
expect
(
subValue
).
to
Be
(
'default'
);
expect
(
subValue
).
to
Equal
(
'default'
);
expect
(
html5SourcesValue
).
toEqual
([
expect
(
html5SourcesValue
).
toEqual
([
'default.mp4'
,
'default.mp4'
,
'default.webm'
'default.webm'
]);
]);
expect
(
youtubeValue
).
to
Be
(
'OEoXaMPEzfM'
);
expect
(
youtubeValue
).
to
Equal
(
'OEoXaMPEzfM'
);
});
});
it
(
'Youtube Id is not adjusted'
,
function
()
{
it
(
'Youtube Id is not adjusted'
,
function
()
{
...
@@ -283,7 +282,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -283,7 +282,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
'video.mp4'
,
'video.mp4'
,
'video.webm'
'video.webm'
]);
]);
expect
(
youtubeValue
).
to
Be
(
''
);
expect
(
youtubeValue
).
to
Equal
(
''
);
});
});
it
(
'Timed Transcript field is updated'
,
function
()
{
it
(
'Timed Transcript field is updated'
,
function
()
{
...
@@ -294,7 +293,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -294,7 +293,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
var
collection
=
metadataCollection
.
models
,
var
collection
=
metadataCollection
.
models
,
subValue
=
collection
[
1
].
getValue
();
subValue
=
collection
[
1
].
getValue
();
expect
(
subValue
).
to
Be
(
'test_value'
);
expect
(
subValue
).
to
Equal
(
'test_value'
);
});
});
it
(
'Timed Transcript field is updated just once'
,
function
()
{
it
(
'Timed Transcript field is updated just once'
,
function
()
{
...
@@ -309,7 +308,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
...
@@ -309,7 +308,7 @@ function ($, Backbone, _, Utils, Editor, MetadataView, MetadataModel, MetadataCo
transcripts
.
syncAdvancedTab
(
metadataCollection
);
transcripts
.
syncAdvancedTab
(
metadataCollection
);
transcripts
.
syncAdvancedTab
(
metadataCollection
);
transcripts
.
syncAdvancedTab
(
metadataCollection
);
expect
(
subModel
.
setValue
.
calls
.
length
).
to
Be
(
1
);
expect
(
subModel
.
setValue
.
calls
.
length
).
to
Equal
(
1
);
});
});
});
});
...
...
cms/static/js_spec/transcripts/videolist_spec.js
View file @
68c6a7c7
...
@@ -2,17 +2,14 @@ define(
...
@@ -2,17 +2,14 @@ define(
[
[
"jquery"
,
"underscore"
,
"jquery"
,
"underscore"
,
"js/views/transcripts/utils"
,
"js/views/transcripts/metadata_videolist"
,
"js/views/transcripts/utils"
,
"js/views/transcripts/metadata_videolist"
,
"js/views/transcripts/message_manager"
,
"js/views/metadata"
,
"js/models/metadata"
,
"js/views/abstract_editor"
,
"js/views/metadata"
,
"js/models/metadata"
,
"js/views/abstract_editor"
,
"sinon"
,
"xmodule"
,
"jasmine-jquery"
"sinon"
,
"xmodule"
,
"jasmine-jquery"
],
],
function
(
$
,
_
,
Utils
,
VideoList
,
Me
ssageManager
,
Me
tadataView
,
MetadataModel
,
AbstractEditor
,
sinon
)
{
function
(
$
,
_
,
Utils
,
VideoList
,
MetadataView
,
MetadataModel
,
AbstractEditor
,
sinon
)
{
describe
(
'CMS.Views.Metadata.VideoList'
,
function
()
{
describe
(
'CMS.Views.Metadata.VideoList'
,
function
()
{
var
videoListEntryTemplate
=
readFixtures
(
var
videoListEntryTemplate
=
readFixtures
(
'transcripts/metadata-videolist-entry.underscore'
'transcripts/metadata-videolist-entry.underscore'
),
),
correctMessanger
=
MessageManager
,
messenger
=
correctMessanger
.
prototype
,
abstractEditor
=
AbstractEditor
.
prototype
,
abstractEditor
=
AbstractEditor
.
prototype
,
component_id
=
'component_id'
,
component_id
=
'component_id'
,
videoList
=
[
videoList
=
[
...
@@ -51,15 +48,16 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -51,15 +48,16 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
status
:
'Success'
,
status
:
'Success'
,
subs
:
'video_id'
subs
:
'video_id'
}),
}),
view
,
sinonXhr
;
view
,
sinonXhr
,
MessageManager
,
messenger
;
beforeEach
(
function
()
{
beforeEach
(
function
()
{
sinonXhr
=
sinon
.
fakeServer
.
create
();
sinonXhr
=
sinon
.
fakeServer
.
create
();
sinonXhr
.
respondWith
([
sinonXhr
.
respondWith
([
200
,
200
,
{
"Content-Type"
:
"application/json"
},
{
"Content-Type"
:
"application/json"
},
response
response
]);
]);
sinonXhr
.
autoRespond
=
true
;
sinonXhr
.
autoRespond
=
true
;
var
tpl
=
sandbox
({
var
tpl
=
sandbox
({
...
@@ -80,13 +78,18 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -80,13 +78,18 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
).
text
(
videoListEntryTemplate
)
).
text
(
videoListEntryTemplate
)
);
);
spyOn
(
messenger
,
'initialize'
);
spyOn
(
messenger
,
'render'
).
andReturn
(
messenger
);
spyOn
(
messenger
,
'showError'
);
spyOn
(
messenger
,
'hideError'
);
spyOn
(
Utils
,
'command'
).
andCallThrough
();
spyOn
(
Utils
,
'command'
).
andCallThrough
();
spyOn
(
abstractEditor
,
'initialize'
).
andCallThrough
();
spyOn
(
abstractEditor
,
'initialize'
).
andCallThrough
();
spyOn
(
abstractEditor
,
'render'
).
andCallThrough
();
spyOn
(
abstractEditor
,
'render'
).
andCallThrough
();
spyOn
(
console
,
'error'
);
messenger
=
jasmine
.
createSpyObj
(
'MessageManager'
,[
'initialize'
,
'render'
,
'showError'
,
'hideError'
]);
$
.
each
(
messenger
,
function
(
index
,
method
)
{
method
.
andReturn
(
messenger
);
});
MessageManager
=
function
()
{
MessageManager
=
function
()
{
messenger
.
initialize
();
messenger
.
initialize
();
...
@@ -96,11 +99,10 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -96,11 +99,10 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
$el
=
$
(
'.component'
);
$el
=
$
(
'.component'
);
spyOn
(
console
,
'error'
);
view
=
new
VideoList
({
view
=
new
VideoList
({
el
:
$el
,
el
:
$el
,
model
:
model
model
:
model
,
MessageManager
:
MessageManager
});
});
this
.
addMatchers
({
this
.
addMatchers
({
...
@@ -126,11 +128,9 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -126,11 +128,9 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
});
});
afterEach
(
function
()
{
afterEach
(
function
()
{
MessageManager
=
correctMessanger
;
sinonXhr
.
restore
();
sinonXhr
.
restore
();
});
});
var
waitsForResponse
=
function
(
expectFunc
,
prep
)
{
var
waitsForResponse
=
function
(
expectFunc
,
prep
)
{
var
flag
=
false
;
var
flag
=
false
;
...
@@ -145,6 +145,7 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -145,6 +145,7 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
if
(
len
&&
req
[
0
].
readyState
===
4
)
{
if
(
len
&&
req
[
0
].
readyState
===
4
)
{
flag
=
true
;
flag
=
true
;
}
}
return
flag
;
return
flag
;
},
"Ajax Timeout"
,
750
);
},
"Ajax Timeout"
,
750
);
...
@@ -153,10 +154,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -153,10 +154,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
it
(
'Initialize'
,
function
()
{
it
(
'Initialize'
,
function
()
{
expect
(
abstractEditor
.
initialize
).
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
messenger
.
initialize
).
toHaveBeenCalled
();
expect
(
abstractEditor
.
initialize
).
toHaveBeenCalled
();
expect
(
view
.
component_id
).
toBe
(
component_id
);
expect
(
messenger
.
initialize
).
toHaveBeenCalled
();
expect
(
view
.
$el
).
toHandle
(
'input'
);
expect
(
view
.
component_id
).
toBe
(
component_id
);
expect
(
view
.
$el
).
toHandle
(
'input'
);
});
});
});
describe
(
'Render'
,
function
()
{
describe
(
'Render'
,
function
()
{
...
@@ -263,10 +266,14 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -263,10 +266,14 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
describe
(
'isUniqVideoTypes'
,
function
()
{
describe
(
'isUniqVideoTypes'
,
function
()
{
it
(
'Unique data - return true'
,
function
()
{
it
(
'Unique data - return true'
,
function
()
{
var
data
=
videoList
,
var
data
=
videoList
;
result
=
view
.
isUniqVideoTypes
(
data
);
waitsForResponse
(
function
()
{
var
result
=
view
.
isUniqVideoTypes
(
data
);
expect
(
result
).
toBe
(
true
);
});
expect
(
result
).
toBe
(
true
);
});
});
it
(
'Not Unique data - return false'
,
function
()
{
it
(
'Not Unique data - return false'
,
function
()
{
...
@@ -286,10 +293,13 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -286,10 +293,13 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
type
:
"youtube"
,
type
:
"youtube"
,
video
:
"12345678901"
video
:
"12345678901"
}
}
],
];
result
=
view
.
isUniqVideoTypes
(
data
);
waitsForResponse
(
function
()
{
var
result
=
view
.
isUniqVideoTypes
(
data
);
expect
(
result
).
toBe
(
false
);
expect
(
result
).
toBe
(
false
);
});
});
});
});
});
...
@@ -312,20 +322,26 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -312,20 +322,26 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
type
:
"youtube"
,
type
:
"youtube"
,
video
:
"12345678901"
video
:
"12345678901"
}
}
],
];
result
=
view
.
checkIsUniqVideoTypes
(
data
);
expect
(
messenger
.
showError
).
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
result
).
toBe
(
false
);
var
result
=
view
.
checkIsUniqVideoTypes
(
data
);
expect
(
messenger
.
showError
).
toHaveBeenCalled
();
expect
(
result
).
toBe
(
false
);
});
});
});
it
(
'All works okay if arguments are not passed'
,
function
()
{
it
(
'All works okay if arguments are not passed'
,
function
()
{
spyOn
(
view
,
'getVideoObjectsList'
).
andReturn
(
videoList
);
spyOn
(
view
,
'getVideoObjectsList'
).
andReturn
(
videoList
);
var
result
=
view
.
checkIsUniqVideoTypes
();
expect
(
view
.
getVideoObjectsList
).
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
var
result
=
view
.
checkIsUniqVideoTypes
();
expect
(
result
).
toBe
(
true
);
expect
(
view
.
getVideoObjectsList
).
toHaveBeenCalled
();
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
expect
(
result
).
toBe
(
true
);
});
});
});
});
});
...
@@ -335,61 +351,77 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -335,61 +351,77 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
});
});
it
(
'Error message are shown'
,
function
()
{
it
(
'Error message are shown'
,
function
()
{
var
data
=
{
mode
:
'incorrect'
},
waitsForResponse
(
function
()
{
result
=
view
.
checkValidity
(
data
,
true
);
var
data
=
{
mode
:
'incorrect'
},
result
=
view
.
checkValidity
(
data
,
true
);
expect
(
messenger
.
showError
).
toHaveBeenCalled
();
expect
(
messenger
.
showError
).
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
result
).
toBe
(
false
);
expect
(
result
).
toBe
(
false
);
});
});
});
it
(
'Error message are shown when flag is not passed'
,
function
()
{
it
(
'Error message are shown when flag is not passed'
,
function
()
{
var
data
=
{
mode
:
'incorrect'
},
waitsForResponse
(
function
()
{
result
=
view
.
checkValidity
(
data
);
var
data
=
{
mode
:
'incorrect'
},
result
=
view
.
checkValidity
(
data
);
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
result
).
toBe
(
true
);
expect
(
result
).
toBe
(
true
);
});
});
});
it
(
'All works okay if correct data is passed'
,
function
()
{
it
(
'All works okay if correct data is passed'
,
function
()
{
var
data
=
videoList
,
waitsForResponse
(
function
()
{
result
=
view
.
checkValidity
(
data
);
var
data
=
videoList
,
result
=
view
.
checkValidity
(
data
);
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
expect
(
messenger
.
showError
).
not
.
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
view
.
checkIsUniqVideoTypes
).
toHaveBeenCalled
();
expect
(
result
).
toBe
(
true
);
expect
(
result
).
toBe
(
true
);
});
});
});
});
});
it
(
'openExtraVideosBar'
,
function
()
{
it
(
'openExtraVideosBar'
,
function
()
{
view
.
$extraVideosBar
.
removeClass
(
'is-visible'
);
waitsForResponse
(
function
()
{
view
.
$extraVideosBar
.
removeClass
(
'is-visible'
);
view
.
openExtraVideosBar
();
view
.
openExtraVideosBar
();
expect
(
view
.
$extraVideosBar
).
toHaveClass
(
'is-visible'
);
expect
(
view
.
$extraVideosBar
).
toHaveClass
(
'is-visible'
);
});
});
});
it
(
'closeExtraVideosBar'
,
function
()
{
it
(
'closeExtraVideosBar'
,
function
()
{
view
.
$extraVideosBar
.
addClass
(
'is-visible'
);
waitsForResponse
(
function
()
{
view
.
$extraVideosBar
.
addClass
(
'is-visible'
);
view
.
closeExtraVideosBar
();
view
.
closeExtraVideosBar
(
);
expect
(
view
.
$extraVideosBar
).
not
.
toHaveClass
(
'is-visible'
);
expect
(
view
.
$extraVideosBar
).
not
.
toHaveClass
(
'is-visible'
);
}
);
});
});
it
(
'toggleExtraVideosBar'
,
function
()
{
it
(
'toggleExtraVideosBar'
,
function
()
{
view
.
$extraVideosBar
.
addClass
(
'is-visible'
);
waitsForResponse
(
function
()
{
view
.
toggleExtraVideosBar
();
view
.
$extraVideosBar
.
addClass
(
'is-visible'
);
expect
(
view
.
$extraVideosBar
).
not
.
toHaveClass
(
'is-visible'
);
view
.
toggleExtraVideosBar
();
view
.
toggleExtraVideosBar
();
expect
(
view
.
$extraVideosBar
).
not
.
toHaveClass
(
'is-visible'
);
expect
(
view
.
$extraVideosBar
).
toHaveClass
(
'is-visible'
);
view
.
toggleExtraVideosBar
();
expect
(
view
.
$extraVideosBar
).
toHaveClass
(
'is-visible'
);
});
});
});
it
(
'getValueFromEditor'
,
function
()
{
it
(
'getValueFromEditor'
,
function
()
{
expect
(
view
).
assertValueInView
(
modelStub
.
value
);
waitsForResponse
(
function
()
{
expect
(
view
).
assertValueInView
(
modelStub
.
value
);
});
});
});
it
(
'setValueInEditor'
,
function
()
{
it
(
'setValueInEditor'
,
function
()
{
expect
(
view
).
assertCanUpdateView
([
'abc.mp4'
]);
waitsForResponse
(
function
()
{
expect
(
view
).
assertCanUpdateView
([
'abc.mp4'
]);
});
});
});
it
(
'getVideoObjectsList'
,
function
()
{
it
(
'getVideoObjectsList'
,
function
()
{
...
@@ -406,12 +438,14 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -406,12 +438,14 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
}
}
];
];
view
.
setValueInEditor
([
waitsForResponse
(
function
()
{
'http://youtu.be/12345678901'
,
view
.
setValueInEditor
([
'video.mp4'
,
'http://youtu.be/12345678901'
,
'video'
'video.mp4'
,
]);
'video'
expect
(
view
).
assertIsCorrectVideoList
(
value
);
]);
expect
(
view
).
assertIsCorrectVideoList
(
value
);
});
});
});
describe
(
'getPlaceholders'
,
function
()
{
describe
(
'getPlaceholders'
,
function
()
{
...
@@ -422,10 +456,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -422,10 +456,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
});
});
it
(
'All works okay if empty values are passed'
,
function
()
{
it
(
'All works okay if empty values are passed'
,
function
()
{
var
result
=
view
.
getPlaceholders
([]),
waitsForResponse
(
function
()
{
expectedResult
=
_
.
values
(
defaultPlaceholders
).
reverse
();
var
result
=
view
.
getPlaceholders
([]),
expectedResult
=
_
.
values
(
defaultPlaceholders
).
reverse
();
expect
(
result
).
toEqual
(
expectedResult
);
expect
(
result
).
toEqual
(
expectedResult
);
});
});
});
...
@@ -459,10 +495,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -459,10 +495,12 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
}
}
};
};
$
.
each
(
dataDict
,
function
(
index
,
val
)
{
waitsForResponse
(
function
()
{
var
result
=
view
.
getPlaceholders
(
val
.
value
);
$
.
each
(
dataDict
,
function
(
index
,
val
)
{
var
result
=
view
.
getPlaceholders
(
val
.
value
);
expect
(
result
).
toEqual
(
val
.
expectedResult
);
expect
(
result
).
toEqual
(
val
.
expectedResult
);
});
});
});
}
}
);
);
...
@@ -496,13 +534,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -496,13 +534,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
function
()
{
function
()
{
$
.
fn
.
hasClass
.
andReturn
(
false
);
$
.
fn
.
hasClass
.
andReturn
(
false
);
view
.
checkValidity
.
andReturn
(
false
);
view
.
checkValidity
.
andReturn
(
false
);
view
.
inputHandler
(
eventObject
);
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
view
.
inputHandler
(
eventObject
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
true
);
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
addClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
true
);
expect
(
$
.
fn
.
addClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
});
}
}
);
);
...
@@ -510,13 +550,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -510,13 +550,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
function
()
{
function
()
{
$
.
fn
.
hasClass
.
andReturn
(
true
);
$
.
fn
.
hasClass
.
andReturn
(
true
);
view
.
checkValidity
.
andReturn
(
false
);
view
.
checkValidity
.
andReturn
(
false
);
view
.
inputHandler
(
eventObject
);
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
view
.
inputHandler
(
eventObject
);
expect
(
view
.
closeExtraVideosBar
).
toHaveBeenCalled
();
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
true
);
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
addClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
expect
(
view
.
closeExtraVideosBar
).
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
true
);
expect
(
$
.
fn
.
addClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
});
}
}
);
);
...
@@ -524,13 +566,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -524,13 +566,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
function
()
{
function
()
{
view
.
checkValidity
.
andReturn
(
true
);
view
.
checkValidity
.
andReturn
(
true
);
_
.
isEqual
.
andReturn
(
false
);
_
.
isEqual
.
andReturn
(
false
);
view
.
inputHandler
(
eventObject
);
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
view
.
updateModel
).
toHaveBeenCalled
();
view
.
inputHandler
(
eventObject
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
messenger
.
hideError
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
false
);
expect
(
view
.
updateModel
).
toHaveBeenCalled
();
expect
(
$
.
fn
.
removeClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
false
);
expect
(
$
.
fn
.
removeClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
});
}
}
);
);
...
@@ -538,13 +582,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
...
@@ -538,13 +582,15 @@ function ($, _, Utils, VideoList, MessageManager, MetadataView, MetadataModel, A
function
()
{
function
()
{
view
.
checkValidity
.
andReturn
(
true
);
view
.
checkValidity
.
andReturn
(
true
);
_
.
isEqual
.
andReturn
(
true
);
_
.
isEqual
.
andReturn
(
true
);
view
.
inputHandler
(
eventObject
);
expect
(
messenger
.
hideError
).
toHaveBeenCalled
();
waitsForResponse
(
function
()
{
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
view
.
inputHandler
(
eventObject
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
messenger
.
hideError
).
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
false
);
expect
(
view
.
updateModel
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
removeClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
expect
(
view
.
closeExtraVideosBar
).
not
.
toHaveBeenCalled
();
expect
(
$
.
fn
.
prop
).
toHaveBeenCalledWith
(
'disabled'
,
false
);
expect
(
$
.
fn
.
removeClass
).
toHaveBeenCalledWith
(
'is-disabled'
);
});
}
}
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment