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
adecfaec
Commit
adecfaec
authored
Apr 20, 2017
by
Jeremy Bowman
Committed by
GitHub
Apr 20, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14930 from edx/jmbowman/PLAT-1200
PLAT-1200 Upgrade to bok-choy 0.7.0 take 2
parents
64372dd5
f2f9874f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
common/test/acceptance/tests/helpers.py
+3
-0
requirements/edx/base.txt
+3
-2
No files found.
common/test/acceptance/tests/helpers.py
View file @
adecfaec
...
...
@@ -25,6 +25,7 @@ from pymongo import MongoClient, ASCENDING
from
openedx.core.lib.tests.assertions.events
import
assert_event_matches
,
is_matching_event
,
EventMatchTolerates
from
xmodule.partitions.partitions
import
UserPartition
from
selenium.common.exceptions
import
StaleElementReferenceException
from
selenium.webdriver.common.desired_capabilities
import
DesiredCapabilities
from
selenium.webdriver.common.keys
import
Keys
from
selenium.webdriver.support.select
import
Select
from
selenium.webdriver.support.ui
import
WebDriverWait
...
...
@@ -709,6 +710,8 @@ class AcceptanceTest(WebAppTest):
"""
def
__init__
(
self
,
*
args
,
**
kwargs
):
# Hack until we upgrade Firefox and install geckodriver in devstack and Jenkins
DesiredCapabilities
.
FIREFOX
[
'marionette'
]
=
False
super
(
AcceptanceTest
,
self
)
.
__init__
(
*
args
,
**
kwargs
)
# Use long messages so that failures show actual and expected values
...
...
requirements/edx/base.txt
View file @
adecfaec
...
...
@@ -153,7 +153,7 @@ sqlparse>=0.2.0,<0.3.0
# Used for testing
before_after==0.1.3
bok-choy==0.
6.2
bok-choy==0.
7.0
chrono==1.0.2
ddt==0.8.0
django-crum==0.5
...
...
@@ -164,6 +164,7 @@ freezegun==0.1.11
mock-django==0.6.9
mock==1.0.1
moto==0.3.1
needle==0.5.0
nose==1.3.7
nose-exclude
nose-ignore-docstring
...
...
@@ -175,7 +176,7 @@ PyContracts==1.7.1
python-subunit==0.0.16
pyquery==1.2.9
radon==1.3.2
selenium==
2.5
3.1
selenium==
3.
3.1
splinter==0.5.4
testtools==0.9.34
testfixtures==4.5.0
...
...
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