Skip to content

enable tests depending on assert is_css_present(css_selector) #2214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zubair-arbi merged 1 commit into from
Jan 21, 2014
Merged

enable tests depending on assert is_css_present(css_selector) #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions cms/djangoapps/contentstore/features/course-team.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,19 @@ Feature: CMS.Course Team
And he cannot add users
And he cannot delete users

# Disabled 1/13/14 due to flakiness observed in master
#Scenario: Admins should be able to give course ownership to someone else
# Given I have opened a new course in Studio
# And the user "gina" exists
# And I am viewing the course team settings
# When I add "gina" to the course team
# And I make "gina" a course team admin
# And I remove admin rights from myself
# And "gina" logs in
# And she selects the new course
# And she views the course team settings
# And she deletes me from the course team
# And I am logged into studio
# Then I do not see the course on my page
Scenario: Admins should be able to give course ownership to someone else
Given I have opened a new course in Studio
And the user "gina" exists
And I am viewing the course team settings
When I add "gina" to the course team
And I make "gina" a course team admin
And I remove admin rights from myself
And "gina" logs in
And she selects the new course
And she views the course team settings
And she deletes me from the course team
And I am logged into studio
Then I do not see the course on my page

Scenario: Admins should be able to remove their own admin rights
Given I have opened a new course in Studio
Expand Down
14 changes: 7 additions & 7 deletions cms/djangoapps/contentstore/features/static-pages.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ Feature: CMS.Static Pages
Scenario: Users can add static pages
Given I have opened a new course in Studio
And I go to the static pages page
Then I should not see any static pages
When I add a new page
Then I should see a static page named "Empty"

# Disabled 1/13/14 due to flakiness observed in master
#Scenario: Users can delete static pages
# Given I have created a static page
# When I "delete" the static page
# Then I am shown a prompt
# When I confirm the prompt
# Then I should not see any static pages
Scenario: Users can delete static pages
Given I have created a static page
When I "delete" the static page
Then I am shown a prompt
When I confirm the prompt
Then I should not see any static pages

# Safari won't update the name properly
@skip_safari
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/terrain/ui_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def url_equals(url):


@world.absorb
def is_css_present(css_selector, wait_time=10):
def is_css_present(css_selector, wait_time=30):
return world.browser.is_element_present_by_css(css_selector, wait_time=wait_time)


Expand Down