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
ace8df39
Commit
ace8df39
authored
Nov 19, 2013
by
Valera Rozuvan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turned back on several Video Jasmine tests.
BLD-463
parent
3f0f7fa3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
6 deletions
+68
-6
CHANGELOG.rst
+2
-0
common/lib/xmodule/xmodule/js/spec/video/general_spec.js
+11
-1
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
+33
-3
common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
+22
-2
No files found.
CHANGELOG.rst
View file @
ace8df39
...
@@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes,
...
@@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes,
in roughly chronological order, most recent first. Add your entries at or near
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.
the top. Include a label indicating the component affected.
Blades: Enabled several Video Jasmine tests. BLD-463.
Blades: Put 2nd "Hide output" button at top of test box & increase text size for
Blades: Put 2nd "Hide output" button at top of test box & increase text size for
code response questions. BLD-126.
code response questions. BLD-126.
...
...
common/lib/xmodule/xmodule/js/spec/video/general_spec.js
View file @
ace8df39
...
@@ -271,7 +271,17 @@
...
@@ -271,7 +271,17 @@
});
});
// Disabled 10/29/13 due to flakiness in master
// Disabled 10/29/13 due to flakiness in master
xdescribe
(
'multiple YT on page'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
describe
(
'multiple YT on page'
,
function
()
{
var
state1
,
state2
,
state3
;
var
state1
,
state2
,
state3
;
beforeEach
(
function
()
{
beforeEach
(
function
()
{
...
...
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
View file @
ace8df39
...
@@ -457,7 +457,17 @@
...
@@ -457,7 +457,17 @@
});
});
// Disabled 10/25/13 due to flakiness in master
// Disabled 10/25/13 due to flakiness in master
xit
(
'scroll caption to new position'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
it
(
'scroll caption to new position'
,
function
()
{
expect
(
$
.
fn
.
scrollTo
).
toHaveBeenCalled
();
expect
(
$
.
fn
.
scrollTo
).
toHaveBeenCalled
();
});
});
});
});
...
@@ -538,7 +548,17 @@
...
@@ -538,7 +548,17 @@
});
});
// Disabled 10/23/13 due to flakiness in master
// Disabled 10/23/13 due to flakiness in master
xdescribe
(
'scrollCaption'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
describe
(
'scrollCaption'
,
function
()
{
beforeEach
(
function
()
{
beforeEach
(
function
()
{
initialize
();
initialize
();
});
});
...
@@ -683,7 +703,17 @@
...
@@ -683,7 +703,17 @@
});
});
// Test turned off due to flakiness (30.10.2013).
// Test turned off due to flakiness (30.10.2013).
xit
(
'scroll the caption'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
it
(
'scroll the caption'
,
function
()
{
// After transcripts are shown, and the video plays for a
// After transcripts are shown, and the video plays for a
// bit.
// bit.
jasmine
.
Clock
.
tick
(
1000
);
jasmine
.
Clock
.
tick
(
1000
);
...
...
common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js
View file @
ace8df39
...
@@ -154,7 +154,17 @@
...
@@ -154,7 +154,17 @@
});
});
// Turned off test due to flakiness (30.10.2013).
// Turned off test due to flakiness (30.10.2013).
xit
(
'trigger seek event'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
it
(
'trigger seek event'
,
function
()
{
runs
(
function
()
{
runs
(
function
()
{
videoProgressSlider
.
onSlide
(
videoProgressSlider
.
onSlide
(
jQuery
.
Event
(
'slide'
),
{
value
:
20
}
jQuery
.
Event
(
'slide'
),
{
value
:
20
}
...
@@ -220,7 +230,17 @@
...
@@ -220,7 +230,17 @@
});
});
// Turned off test due to flakiness (30.10.2013).
// Turned off test due to flakiness (30.10.2013).
xit
(
'trigger seek event'
,
function
()
{
//
// Update: Turned on test back again. Passing locally and on
// Jenkins in a large number of runs.
//
// Will observe for a little while to see if any failures arise.
// Most probable cause of test passing is:
//
// https://github.com/edx/edx-platform/pull/1642
//
// : )
it
(
'trigger seek event'
,
function
()
{
runs
(
function
()
{
runs
(
function
()
{
videoProgressSlider
.
onStop
(
videoProgressSlider
.
onStop
(
jQuery
.
Event
(
'stop'
),
{
value
:
20
}
jQuery
.
Event
(
'stop'
),
{
value
:
20
}
...
...
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