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
849e8d6c
Commit
849e8d6c
authored
Mar 08, 2013
by
Christina Roberts
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1630 from MITx/fix/zoldak/lettuce-click
Fix lettuce tests to work with phantomJS
parents
e7bf05ea
55eefd0e
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
95 additions
and
51 deletions
+95
-51
.gitignore
+2
-2
cms/djangoapps/contentstore/features/advanced-settings.feature
+3
-0
cms/djangoapps/contentstore/features/advanced-settings.py
+42
-24
cms/djangoapps/contentstore/features/common.py
+26
-13
cms/djangoapps/contentstore/features/section.feature
+2
-2
cms/djangoapps/contentstore/features/section.py
+11
-6
cms/djangoapps/contentstore/features/signup.py
+6
-4
cms/djangoapps/contentstore/features/studio-overview-togglesection.feature
+1
-0
cms/djangoapps/contentstore/features/subsection.feature
+1
-0
common/djangoapps/terrain/browser.py
+1
-0
No files found.
.gitignore
View file @
849e8d6c
...
...
@@ -28,4 +28,5 @@ nosetests.xml
cover_html/
.idea/
.redcar/
chromedriver.log
\ No newline at end of file
chromedriver.log
ghostdriver.log
cms/djangoapps/contentstore/features/advanced-settings.feature
View file @
849e8d6c
...
...
@@ -7,6 +7,7 @@ Feature: Advanced (manual) course policy
When
I select the Advanced Settings
Then
I see only the display name
@skip-phantom
Scenario
:
Test if there are no policy settings without existing UI controls
Given
I am on the Advanced Course Settings page in Studio
When
I delete the display name
...
...
@@ -14,6 +15,7 @@ Feature: Advanced (manual) course policy
And
I reload the page
Then
there are no advanced policy settings
@skip-phantom
Scenario
:
Test cancel editing key name
Given
I am on the Advanced Course Settings page in Studio
When
I edit the name of a policy key
...
...
@@ -32,6 +34,7 @@ Feature: Advanced (manual) course policy
And
I press the
"Cancel"
notification button
Then
the policy key value is unchanged
@skip-phantom
Scenario
:
Test editing key value
Given
I am on the Advanced Course Settings page in Studio
When
I edit the value of a policy key
...
...
cms/djangoapps/contentstore/features/advanced-settings.py
View file @
849e8d6c
from
lettuce
import
world
,
step
from
common
import
*
import
time
from
selenium.common.exceptions
import
WebDriverException
from
selenium.webdriver.support
import
expected_conditions
as
EC
from
nose.tools
import
assert_equal
from
nose.tools
import
assert_true
from
nose.tools
import
assert_true
,
assert_false
,
assert_equal
"""
http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdriver.common.keys.html
...
...
@@ -19,6 +20,7 @@ def i_select_advanced_settings(step):
css_click
(
expand_icon_css
)
link_css
=
'li.nav-course-settings-advanced a'
css_click
(
link_css
)
# world.browser.click_link_by_text('Advanced Settings')
@step
(
'I am on the Advanced Course Settings page in Studio$'
)
...
...
@@ -42,8 +44,20 @@ def edit_the_name_of_a_policy_key(step):
@step
(
u'I press the "([^"]*)" notification button$'
)
def
press_the_notification_button
(
step
,
name
):
world
.
browser
.
click_link_by_text
(
name
)
def
is_visible
(
driver
):
return
EC
.
visibility_of_element_located
((
By
.
CSS_SELECTOR
,
css
,))
def
is_invisible
(
driver
):
return
EC
.
invisibility_of_element_located
((
By
.
CSS_SELECTOR
,
css
,))
css
=
'a.
%
s-button'
%
name
.
lower
()
wait_for
(
is_visible
)
try
:
css_click_at
(
css
)
wait_for
(
is_invisible
)
except
WebDriverException
,
e
:
css_click_at
(
css
)
wait_for
(
is_invisible
)
@step
(
u'I edit the value of a policy key$'
)
def
edit_the_value_of_a_policy_key
(
step
):
...
...
@@ -99,29 +113,29 @@ def it_is_formatted(step):
@step
(
u'the policy key name is unchanged$'
)
def
the_policy_key_name_is_unchanged
(
step
):
policy_key_css
=
'input.policy-key'
e
=
css_find
(
policy_key_css
)
.
first
assert_equal
(
e
.
value
,
'display_name'
)
val
=
css_find
(
policy_key_css
)
.
first
.
value
assert_equal
(
val
,
'display_name'
)
@step
(
u'the policy key name is changed$'
)
def
the_policy_key_name_is_changed
(
step
):
policy_key_css
=
'input.policy-key'
e
=
css_find
(
policy_key_css
)
.
first
assert_equal
(
e
.
value
,
'new'
)
val
=
css_find
(
policy_key_css
)
.
first
.
value
assert_equal
(
val
,
'new'
)
@step
(
u'the policy key value is unchanged$'
)
def
the_policy_key_value_is_unchanged
(
step
):
policy_value_css
=
'li.course-advanced-policy-list-item div.value textarea'
e
=
css_find
(
policy_value_css
)
.
first
assert_equal
(
e
.
value
,
'"Robot Super Course"'
)
val
=
css_find
(
policy_value_css
)
.
first
.
value
assert_equal
(
val
,
'"Robot Super Course"'
)
@step
(
u'the policy key value is changed$'
)
def
the_policy_key_value_is_unchanged
(
step
):
policy_value_css
=
'li.course-advanced-policy-list-item div.value textarea'
e
=
css_find
(
policy_value_css
)
.
first
assert_equal
(
e
.
value
,
'"Robot Super Course X"'
)
val
=
css_find
(
policy_value_css
)
.
first
.
value
assert_equal
(
val
,
'"Robot Super Course X"'
)
############# HELPERS ###############
...
...
@@ -132,19 +146,23 @@ def create_entry(key, value):
new_key_css
=
'div#__new_advanced_key__ input'
new_key_element
=
css_find
(
new_key_css
)
.
first
new_key_element
.
fill
(
key
)
# For some reason have to get the instance for each command (get error that it is no longer attached to the DOM)
# Have to do all this because Selenium has a bug that fill does not remove existing text
# For some reason have to get the instance for each command
# (get error that it is no longer attached to the DOM)
# Have to do all this because Selenium fill does not remove existing text
new_value_css
=
'div.CodeMirror textarea'
css_find
(
new_value_css
)
.
last
.
fill
(
""
)
css_find
(
new_value_css
)
.
last
.
_element
.
send_keys
(
Keys
.
DELETE
,
Keys
.
DELETE
)
css_find
(
new_value_css
)
.
last
.
fill
(
value
)
# Add in a TAB key press because intermittently on ubuntu the
# last character of "value" above was not getting typed in
css_find
(
new_value_css
)
.
last
.
_element
.
send_keys
(
Keys
.
TAB
)
def
delete_entry
(
index
):
"""
Delete the nth entry where index is 0-based
"""
css
=
'.delete-button'
css
=
'
a
.delete-button'
assert_true
(
world
.
browser
.
is_element_present_by_css
(
css
,
5
))
delete_buttons
=
css_find
(
css
)
assert_true
(
len
(
delete_buttons
)
>
index
,
"no delete button exists for entry "
+
str
(
index
))
...
...
@@ -165,16 +183,16 @@ def assert_entries(css, expected_values):
def
click_save
():
css
=
".save-button"
def
is_shown
(
driver
):
visible
=
css_find
(
css
)
.
first
.
visible
if
visible
:
# Even when waiting for visible, this fails sporadically. Adding in a small wait.
time
.
sleep
(
float
(
1
))
return
visible
wait_for
(
is_shown
)
css_click
(
css
)
css
=
"
a
.save-button"
#
def is_shown(driver):
#
visible = css_find(css).first.visible
#
if visible:
#
# Even when waiting for visible, this fails sporadically. Adding in a small wait.
#
time.sleep(float(1))
#
return visible
#
wait_for(is_shown)
css_click
_at
(
css
)
def
fill_last_field
(
value
):
...
...
cms/djangoapps/contentstore/features/common.py
View file @
849e8d6c
...
...
@@ -3,18 +3,20 @@ from lettuce.django import django_url
from
nose.tools
import
assert_true
from
nose.tools
import
assert_equal
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.common.exceptions
import
WebDriverException
,
StaleElementReferenceException
from
selenium.webdriver.support
import
expected_conditions
as
EC
from
selenium.webdriver.common.by
import
By
from
terrain.factories
import
UserFactory
,
RegistrationFactory
,
UserProfileFactory
from
terrain.factories
import
CourseFactory
,
GroupFactory
import
xmodule.modulestore.django
from
xmodule.modulestore.django
import
_MODULESTORES
,
modulestore
from
xmodule.templates
import
update_templates
from
auth.authz
import
get_user_by_email
from
logging
import
getLogger
logger
=
getLogger
(
__name__
)
########### STEP HELPERS ##############
@step
(
'I (?:visit|access|open) the Studio homepage$'
)
def
i_visit_the_studio_homepage
(
step
):
# To make this go to port 8001, put
...
...
@@ -52,9 +54,8 @@ def i_have_opened_a_new_course(step):
log_into_studio
()
create_a_course
()
####### HELPER FUNCTIONS ##############
####### HELPER FUNCTIONS ##############
def
create_studio_user
(
uname
=
'robot'
,
email
=
'robot+studio@edx.org'
,
...
...
@@ -83,9 +84,9 @@ def flush_xmodule_store():
# (though it shouldn't), do this manually
# from the bash shell to drop it:
# $ mongo test_xmodule --eval "db.dropDatabase()"
xmodule
.
modulestore
.
django
.
_MODULESTORES
=
{}
xmodule
.
modulestore
.
django
.
modulestore
()
.
collection
.
drop
()
xmodule
.
templates
.
update_templates
()
_MODULESTORES
=
{}
modulestore
()
.
collection
.
drop
()
update_templates
()
def
assert_css_with_text
(
css
,
text
):
...
...
@@ -94,8 +95,16 @@ def assert_css_with_text(css, text):
def
css_click
(
css
):
assert_true
(
world
.
browser
.
is_element_present_by_css
(
css
,
5
))
world
.
browser
.
find_by_css
(
css
)
.
first
.
click
()
'''
First try to use the regular click method,
but if clicking in the middle of an element
doesn't work it might be that it thinks some other
element is on top of it there so click in the upper left
'''
try
:
css_find
(
css
)
.
first
.
click
()
except
WebDriverException
,
e
:
css_click_at
(
css
)
def
css_click_at
(
css
,
x
=
10
,
y
=
10
):
...
...
@@ -103,8 +112,7 @@ def css_click_at(css, x=10, y=10):
A method to click at x,y coordinates of the element
rather than in the center of the element
'''
assert_true
(
world
.
browser
.
is_element_present_by_css
(
css
,
5
))
e
=
world
.
browser
.
find_by_css
(
css
)
.
first
e
=
css_find
(
css
)
.
first
e
.
action_chains
.
move_to_element_with_offset
(
e
.
_element
,
x
,
y
)
e
.
action_chains
.
click
()
e
.
action_chains
.
perform
()
...
...
@@ -115,11 +123,16 @@ def css_fill(css, value):
def
css_find
(
css
):
def
is_visible
(
driver
):
return
EC
.
visibility_of_element_located
((
By
.
CSS_SELECTOR
,
css
,))
assert_true
(
world
.
browser
.
is_element_present_by_css
(
css
,
5
))
wait_for
(
is_visible
)
return
world
.
browser
.
find_by_css
(
css
)
def
wait_for
(
func
):
WebDriverWait
(
world
.
browser
.
driver
,
10
)
.
until
(
func
)
WebDriverWait
(
world
.
browser
.
driver
,
5
)
.
until
(
func
)
def
id_find
(
id
):
...
...
cms/djangoapps/contentstore/features/section.feature
View file @
849e8d6c
...
...
@@ -26,9 +26,10 @@ Feature: Create Section
And
I save a new section release date
Then
the section release date is updated
@skip-phantom
Scenario
:
Delete section
Given
I have opened a new course in Studio
And
I have added a new section
When
I press the
"section"
delete icon
And
I confirm the alert
Then
the section does not exist
\ No newline at end of file
Then
the section does not exist
cms/djangoapps/contentstore/features/section.py
View file @
849e8d6c
from
lettuce
import
world
,
step
from
common
import
*
from
nose.tools
import
assert_equal
from
selenium.webdriver.common.keys
import
Keys
import
time
############### ACTIONS ####################
...
...
@@ -37,10 +39,14 @@ def i_save_a_new_section_release_date(step):
date_css
=
'input.start-date.date.hasDatepicker'
time_css
=
'input.start-time.time.ui-timepicker-input'
css_fill
(
date_css
,
'12/25/2013'
)
# click here to make the calendar go away
css_click
(
time_css
)
# hit TAB to get to the time field
e
=
css_find
(
date_css
)
.
first
e
.
_element
.
send_keys
(
Keys
.
TAB
)
css_fill
(
time_css
,
'12:00am'
)
css_click
(
'a.save-button'
)
e
=
css_find
(
time_css
)
.
first
e
.
_element
.
send_keys
(
Keys
.
TAB
)
time
.
sleep
(
float
(
1
))
world
.
browser
.
click_link_by_text
(
'Save'
)
############ ASSERTIONS ###################
...
...
@@ -106,7 +112,7 @@ def the_section_release_date_picker_not_visible(step):
def
the_section_release_date_is_updated
(
step
):
css
=
'span.published-status'
status_text
=
world
.
browser
.
find_by_css
(
css
)
.
text
assert
status_text
==
'Will Release: 12/25/2013 at 12:00am'
assert
_equal
(
status_text
,
'Will Release: 12/25/2013 at 12:00am'
)
############ HELPER METHODS ###################
...
...
@@ -120,4 +126,4 @@ def save_section_name(name):
def
see_my_section_on_the_courseware_page
(
name
):
section_css
=
'span.section-name-span'
assert_css_with_text
(
section_css
,
name
)
\ No newline at end of file
assert_css_with_text
(
section_css
,
name
)
cms/djangoapps/contentstore/features/signup.py
View file @
849e8d6c
from
lettuce
import
world
,
step
from
common
import
*
@step
(
'I fill in the registration form$'
)
...
...
@@ -13,10 +14,11 @@ def i_fill_in_the_registration_form(step):
@step
(
'I press the Create My Account button on the registration form$'
)
def
i_press_the_button_on_the_registration_form
(
step
):
register_form
=
world
.
browser
.
find_by_css
(
'form#register_form'
)
submit_css
=
'button#submit'
register_form
.
find_by_css
(
submit_css
)
.
click
()
submit_css
=
'form#register_form button#submit'
# Workaround for click not working on ubuntu
# for some unknown reason.
e
=
css_find
(
submit_css
)
e
.
type
(
' '
)
@step
(
'I should see be on the studio home page$'
)
def
i_should_see_be_on_the_studio_home_page
(
step
):
...
...
cms/djangoapps/contentstore/features/studio-overview-togglesection.feature
View file @
849e8d6c
...
...
@@ -21,6 +21,7 @@ Feature: Overview Toggle Section
Then
I see the
"Collapse All Sections"
link
And
all sections are expanded
@skip-phantom
Scenario
:
Collapse link is not removed after last section of a course is deleted
Given
I have a course with 1 section
And
I navigate to the course overview page
...
...
cms/djangoapps/contentstore/features/subsection.feature
View file @
849e8d6c
...
...
@@ -17,6 +17,7 @@ Feature: Create Subsection
And
I click to edit the subsection name
Then
I see the complete subsection name with a quote in the editor
@skip-phantom
Scenario
:
Delete a subsection
Given
I have opened a new course section in Studio
And
I have added a new subsection
...
...
common/djangoapps/terrain/browser.py
View file @
849e8d6c
...
...
@@ -13,6 +13,7 @@ from django.core.management import call_command
def
initial_setup
(
server
):
# Launch the browser app (choose one of these below)
world
.
browser
=
Browser
(
'chrome'
)
# world.browser = Browser('phantomjs')
# world.browser = Browser('firefox')
...
...
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