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
5a579921
Commit
5a579921
authored
Aug 07, 2013
by
JonahStanley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed stylistic things and no longer skipped tests in firefox
parent
514af944
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
19 deletions
+8
-19
cms/djangoapps/contentstore/features/checklists.py
+0
-10
cms/djangoapps/contentstore/features/common.py
+1
-1
cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+2
-2
cms/djangoapps/contentstore/features/problem-editor.py
+1
-3
cms/djangoapps/contentstore/features/video.feature
+1
-1
cms/djangoapps/contentstore/features/video.py
+1
-0
lms/djangoapps/courseware/features/login.feature
+1
-1
lms/djangoapps/courseware/features/signup.feature
+1
-1
No files found.
cms/djangoapps/contentstore/features/checklists.py
View file @
5a579921
...
...
@@ -61,16 +61,12 @@ def i_select_a_link_to_the_course_outline(step):
@step
(
'I am brought to the course outline page$'
)
def
i_am_brought_to_course_outline
(
step
):
if
world
.
is_firefox
():
return
assert_in
(
'Course Outline'
,
world
.
css_text
(
'.outline .page-header'
))
assert_equal
(
1
,
len
(
world
.
browser
.
windows
))
@step
(
'I am brought back to the course outline in the correct state$'
)
def
i_am_brought_back_to_course_outline
(
step
):
if
world
.
is_firefox
():
return
step
.
given
(
'I see the four default edX checklists'
)
# In a previous step, we selected (1, 0) in order to click the 'Edit Course Outline' link.
# Make sure the task is still showing as selected (there was a caching bug with the collection).
...
...
@@ -79,15 +75,11 @@ def i_am_brought_back_to_course_outline(step):
@step
(
'I select a link to help page$'
)
def
i_select_a_link_to_the_help_page
(
step
):
if
world
.
is_firefox
():
return
clickActionLink
(
2
,
0
,
'Visit Studio Help'
)
@step
(
'I am brought to the help page in a new window$'
)
def
i_am_brought_to_help_page_in_new_window
(
step
):
if
world
.
is_firefox
():
return
step
.
given
(
'I see the four default edX checklists'
)
windows
=
world
.
browser
.
windows
assert_equal
(
2
,
len
(
windows
))
...
...
@@ -117,8 +109,6 @@ def toggleTask(checklist, task):
# TODO: figure out a way to do this in phantom and firefox
# For now we will mark the scenerios that use this method as skipped
def
clickActionLink
(
checklist
,
task
,
actionText
):
if
world
.
is_firefox
():
return
# toggle checklist item to make sure that the link button is showing
toggleTask
(
checklist
,
task
)
action_link
=
world
.
css_find
(
'#course-checklist'
+
str
(
checklist
)
+
' a'
)[
task
]
...
...
cms/djangoapps/contentstore/features/common.py
View file @
5a579921
...
...
@@ -71,7 +71,7 @@ def press_the_notification_button(_step, name):
error_showing
=
world
.
is_css_present
(
'.is-shown.wrapper-notification-error'
)
return
confirmation_dismissed
or
error_showing
if
world
.
is_firefox
():
#This is done to explicitly make the changes save on firefox. It will remove focus from the previously focused element
#
This is done to explicitly make the changes save on firefox. It will remove focus from the previously focused element
world
.
trigger_event
(
css
,
event
=
'focus'
)
world
.
browser
.
execute_script
(
"$('{}').click()"
.
format
(
css
))
else
:
...
...
cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
View file @
5a579921
...
...
@@ -116,7 +116,7 @@ def revert_setting_entry(label):
def
get_setting_entry
(
label
):
settings
=
world
.
browser
.
find_by_css
(
'.wrapper-comp-setting'
)
for
setting
in
settings
:
if
setting
.
find_by_css
(
'.setting-label'
)[
0
]
.
value
==
label
:
if
world
.
css_value
(
'.wrapper-comp-setting .setting-label'
)
==
label
:
return
setting
return
None
...
...
@@ -124,6 +124,6 @@ def get_setting_entry(label):
def
get_setting_entry_index
(
label
):
settings
=
world
.
browser
.
find_by_css
(
'.wrapper-comp-setting'
)
for
index
,
setting
in
enumerate
(
settings
):
if
setting
.
find_by_css
(
'.setting-label'
)[
0
]
.
value
==
label
:
if
world
.
css_value
(
'.wrapper-comp-setting .setting-label'
)
==
label
:
return
index
return
None
cms/djangoapps/contentstore/features/problem-editor.py
View file @
5a579921
...
...
@@ -47,7 +47,7 @@ def i_can_modify_the_display_name(step):
# (to confirm that we don't throw an error because it is of the wrong type).
index
=
world
.
get_setting_entry_index
(
DISPLAY_NAME
)
world
.
css_fill
(
'.wrapper-comp-setting .setting-input'
,
'3.4'
,
index
=
index
)
if
world
.
browser
.
driver_name
==
'Firefox'
:
if
world
.
is_firefox
()
:
world
.
trigger_event
(
'.wrapper-comp-setting .setting-input'
,
index
=
index
)
verify_modified_display_name
()
...
...
@@ -140,8 +140,6 @@ def set_the_weight_to_abc(step, bad_weight):
@step
(
'if I set the max attempts to "(.*)", it displays initially as "(.*)", and is persisted as "(.*)"'
)
def
set_the_max_attempts
(
step
,
max_attempts_set
,
max_attempts_displayed
,
max_attempts_persisted
):
#on firefox with selenium, the behaviour is different. eg 2.34 displays as 2.34 and is persisted as 2
if
world
.
is_firefox
():
return
index
=
world
.
get_setting_entry_index
(
MAXIMUM_ATTEMPTS
)
world
.
css_fill
(
'.wrapper-comp-setting .setting-input'
,
max_attempts_set
,
index
=
index
)
world
.
verify_setting_entry
(
world
.
get_setting_entry
(
MAXIMUM_ATTEMPTS
),
MAXIMUM_ATTEMPTS
,
max_attempts_displayed
,
True
)
...
...
cms/djangoapps/contentstore/features/video.feature
View file @
5a579921
...
...
@@ -23,7 +23,7 @@ Feature: Video Component
And
I have toggled captions
Then
when I view the video it does show the captions
#Video Alpha Features will work in Firefox only when Firefox is the active window
#
Video Alpha Features will work in Firefox only when Firefox is the active window
Scenario
:
Autoplay is disabled in Studio for Video Alpha
Given
I have created a Video Alpha component
Then
when I view the videoalpha it does not have autoplay enabled
...
...
cms/djangoapps/contentstore/features/video.py
View file @
5a579921
...
...
@@ -33,6 +33,7 @@ def hide_or_show_captions(step, shown):
# click the button rather than the tooltip, so move the mouse
# away to make it disappear.
button
=
world
.
css_find
(
button_css
)
# mouse_out is not implemented on firefox with selenium
if
not
world
.
is_firefox
:
button
.
mouse_out
()
world
.
css_click
(
button_css
)
...
...
lms/djangoapps/courseware/features/login.feature
View file @
5a579921
...
...
@@ -11,7 +11,7 @@ Feature: Login in as a registered user
And
I submit my credentials on the login form
Then
I should see the login error message
"This account has not been activated"
#CHROME ONLY, firefox will not redirect properly
#
CHROME ONLY, firefox will not redirect properly
Scenario
:
Login to an activated account
Given
I am an edX user
And
I am an activated user
...
...
lms/djangoapps/courseware/features/signup.feature
View file @
5a579921
...
...
@@ -3,7 +3,7 @@ Feature: Sign in
As a new user
I want to signup for a student account
#CHROME ONLY, firefox will not redirect properly
#
CHROME ONLY, firefox will not redirect properly
Scenario
:
Sign up from the homepage
Given
I visit the homepage
When
I click the link with the text
"Register Now"
...
...
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