Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kasra Jamshidi
erp5
Commits
bbd34edd
Commit
bbd34edd
authored
May 11, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "ERP5Type/tests: back to selenium 2.5.3"
This reverts commit
7c8082a2
.
parent
c49a7911
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+3
-2
No files found.
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
View file @
bbd34edd
...
@@ -46,6 +46,7 @@ from selenium import webdriver
...
@@ -46,6 +46,7 @@ from selenium import webdriver
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support
import
expected_conditions
as
EC
from
selenium.webdriver.support
import
expected_conditions
as
EC
from
selenium.webdriver.firefox.firefox_binary
import
FirefoxBinary
ZELENIUM_BASE_URL
=
"%s/portal_tests/%s/core/TestRunner.html?test=../test_suite_html&auto=on&resultsUrl=../postResults&__ac_name=%s&__ac_password=%s"
ZELENIUM_BASE_URL
=
"%s/portal_tests/%s/core/TestRunner.html?test=../test_suite_html&auto=on&resultsUrl=../postResults&__ac_name=%s&__ac_password=%s"
...
@@ -154,10 +155,10 @@ class FunctionalTestRunner:
...
@@ -154,10 +155,10 @@ class FunctionalTestRunner:
firefox_driver
=
firefox_bin
.
replace
(
"firefox-slapos"
,
"geckodriver"
)
firefox_driver
=
firefox_bin
.
replace
(
"firefox-slapos"
,
"geckodriver"
)
firefox_capabilities
=
webdriver
.
common
.
desired_capabilities
.
DesiredCapabilities
.
FIREFOX
firefox_capabilities
=
webdriver
.
common
.
desired_capabilities
.
DesiredCapabilities
.
FIREFOX
firefox_capabilities
[
'marionette'
]
=
True
firefox_capabilities
[
'marionette'
]
=
True
firefox_capabilities
[
'binary'
]
=
firefox_bin
browser
=
webdriver
.
Firefox
(
browser
=
webdriver
.
Firefox
(
capabilities
=
firefox_capabilities
,
capabilities
=
firefox_capabilities
,
executable_path
=
firefox_driver
)
executable_path
=
firefox_driver
,
firefox_binary
=
FirefoxBinary
(
firefox_bin
))
start_time
=
time
.
time
()
start_time
=
time
.
time
()
browser
.
get
(
self
.
_getTestURL
())
browser
.
get
(
self
.
_getTestURL
())
...
...
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