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
0e7e9468
Commit
0e7e9468
authored
Feb 08, 2017
by
Ben Patterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solve open sans quotation issue with tests.
parent
452a1f1f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
cms/djangoapps/contentstore/features/html-editor.feature
+1
-1
cms/djangoapps/contentstore/features/html-editor.py
+8
-4
No files found.
cms/djangoapps/contentstore/features/html-editor.feature
View file @
0e7e9468
...
...
@@ -110,7 +110,7 @@ Feature: CMS.HTML Editor
When
I edit the page
And
I click font selection dropdown
Then
I should see a list of available fonts
And
"Default"
option
sets
"'Open
Sans',
Verdana,
Arial,
Helvetica,
sans-serif"
font
family
And
"Default"
option
sets
the
expected
font
family
And
all standard tinyMCE fonts should be available
# Skipping in master due to brittleness JZ 05/22/2014
...
...
cms/djangoapps/contentstore/features/html-editor.py
View file @
0e7e9468
...
...
@@ -12,6 +12,7 @@ CODEMIRROR_SELECTOR_PREFIX = "$('iframe').contents().find"
@step
(
'I have created a Blank HTML Page$'
)
def
i_created_blank_html_page
(
step
):
# from nose.tools import set_trace; set_trace()
step
.
given
(
'I am in Studio editing a new unit'
)
world
.
create_component_instance
(
step
=
step
,
...
...
@@ -229,10 +230,13 @@ def font_selector_dropdown_is_shown(step):
assert_equal
(
actual_fonts
,
expected_fonts
)
@step
(
'"Default" option sets
"(.*)"
font family'
)
def
default_options_sets_expected_font_family
(
step
,
expected_font_family
):
@step
(
'"Default" option sets
the expected
font family'
)
def
default_options_sets_expected_font_family
(
step
):
fonts
=
get_available_fonts
(
get_fonts_list_panel
(
world
))
assert_equal
(
fonts
.
get
(
"Default"
,
None
),
expected_font_family
)
fonts_found
=
fonts
.
get
(
"Default"
,
None
)
expected_font_family
=
CUSTOM_FONTS
.
get
(
'Default'
)
for
expected_font
in
expected_font_family
:
assert_in
(
expected_font
,
fonts_found
)
@step
(
'all standard tinyMCE fonts should be available'
)
...
...
@@ -263,7 +267,7 @@ TINYMCE_FONTS = OrderedDict([
])
CUSTOM_FONTS
=
OrderedDict
([
(
'Default'
,
"'Open Sans', Verdana, Arial, Helvetica, sans-serif"
),
(
'Default'
,
[
'Open Sans'
,
'Verdana'
,
'Arial'
,
'Helvetica'
,
'sans-serif'
]
),
])
...
...
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