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
f3a46bfb
Commit
f3a46bfb
authored
Jul 20, 2016
by
Diana Huang
Committed by
GitHub
Jul 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13045 from edx/diana/flaky-course-page-test
Fix flaky asset page test
parents
733cf06c
b51c4456
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
cms/templates/asset_index.html
+1
-1
common/test/acceptance/pages/studio/asset_index.py
+1
-2
common/test/acceptance/tests/studio/test_studio_general.py
+1
-1
No files found.
cms/templates/asset_index.html
View file @
f3a46bfb
...
...
@@ -13,7 +13,7 @@
<
%
namespace
name=
'static'
file=
'static_content.html'
/>
<
%
block
name=
"header_extras"
>
% for template_name in ["asset
-library", "asset
"]:
% for template_name in ["asset"]:
<script
type=
"text/template"
id=
"${template_name}-tpl"
>
<%
static
:
include
path
=
"js/${template_name}.underscore"
/>
</script>
...
...
common/test/acceptance/pages/studio/asset_index.py
View file @
f3a46bfb
...
...
@@ -7,10 +7,9 @@ import os
from
opaque_keys.edx.locator
import
CourseLocator
from
common.test.acceptance.pages.studio
import
BASE_URL
from
common.test.acceptance.pages.studio.course_page
import
CoursePage
from
bok_choy.javascript
import
wait_for_js
,
requirejs
from
bok_choy.javascript
import
wait_for_js
@requirejs
(
'js/views/assets'
)
class
AssetIndexPage
(
CoursePage
):
"""
...
...
common/test/acceptance/tests/studio/test_studio_general.py
View file @
f3a46bfb
...
...
@@ -79,7 +79,7 @@ class CoursePagesTest(StudioCourseTest):
self
.
pages
=
[
clz
(
self
.
browser
,
self
.
course_info
[
'org'
],
self
.
course_info
[
'number'
],
self
.
course_info
[
'run'
])
for
clz
in
[
# AssetIndexPage, # TODO: Skip testing this page due to FEDX-88
AssetIndexPage
,
CourseUpdatesPage
,
PagesPage
,
ExportCoursePage
,
ImportCoursePage
,
CourseTeamPage
,
CourseOutlinePage
,
SettingsPage
,
AdvancedSettingsPage
,
GradingPage
,
TextbookUploadPage
...
...
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