Skip to content

Commit a6a104f

Browse files
vxsxvxsx
committed
remove selenium remains
1 parent 3e75da5 commit a6a104f

File tree

5 files changed

+27
-279
lines changed

5 files changed

+27
-279
lines changed

‎.travis.yml‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ env:
2929
- FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=1 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
3030
- FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=2 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
3131
- FRONTEND=1 INTEGRATION=1 INTEGRATION_TESTS_BUCKET=3 DJANGO=1.8 DATABASE_URL='sqlite://localhost/testdb.sqlite' MIGRATE_OPTION='--migrate'
32-
- DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
33-
- DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
34-
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
35-
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
36-
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='customuserapp.User'
37-
- DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
38-
- DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
39-
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
40-
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='emailuserapp.EmailUser'
41-
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
32+
- DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
33+
- DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
34+
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
35+
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
36+
- DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
37+
- DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
38+
- DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
39+
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
40+
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
41+
- DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
4242

4343
before_script:
4444
- pip freeze
@@ -47,9 +47,6 @@ before_script:
4747
- if [ "$DATABASE_URL" == "mysql://root@127.0.0.1/djangocms_test" ]; then mysql -e 'create database IF NOT EXISTS djangocms_test CHARACTER SET utf8 COLLATE utf8_general_ci;'; fi
4848

4949
before_install:
50-
- "export DISPLAY=:99.0"
51-
# xvfb is started in this way to ensure the screen size is 1280x1024x8
52-
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/cucumber_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x8"
5350
- "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
5451
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip saucelabs\]'; export USE_SAUCE_LABS=$?; true
5552

@@ -82,24 +79,24 @@ matrix:
8279
exclude:
8380

8481
- python: 3.3
85-
env: DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
82+
env: DJANGO=1.9 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
8683
- python: 3.3
87-
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
84+
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
8885
- python: 3.3
89-
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
86+
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
9087
- python: 3.3
91-
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
88+
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
9289
- python: 3.3
93-
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 AUTH_USER_MODEL='customuserapp.User'
90+
env: DJANGO=1.9 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
9491

9592
- python: 3.3
96-
env: DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0 MIGRATE_OPTION='--migrate'
93+
env: DJANGO=1.8 DATABASE_URL='sqlite://localhost/:memory:' MIGRATE_OPTION='--migrate'
9794
- python: 3.3
98-
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
95+
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
9996
- python: 3.3
100-
env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0 MIGRATE_OPTION='--migrate'
97+
env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' MIGRATE_OPTION='--migrate'
10198
- python: 3.3
102-
env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='customuserapp.User'
99+
env: DJANGO=1.8 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
103100

104101
- python: 3.3
105102
env: FRONTEND=1 UNIT=1
@@ -137,20 +134,20 @@ matrix:
137134

138135
allow_failures:
139136
- python: 2.7
140-
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
137+
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
141138
- python: 2.7
142139

143-
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
140+
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
144141

145142
- python: 3.4
146-
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
143+
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
147144
- python: 3.4
148-
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
145+
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
149146

150147
- python: 3.5
151-
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
148+
env: DJANGO=1.8 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
152149
- python: 3.5
153-
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
150+
env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test'
154151

155152
fast_finish: true
156153

‎CHANGELOG.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
respective animations.
1212
* Added unit tests for CMS JavaScript files
1313
* Added frontend integration tests (written with Casper JS)
14+
* Removed frontend integration tests (written with Selenium)
1415
* Provides the ability to declare cache expiration periods on a per-plugin basis
1516

1617
=== 3.2.3 (2016-03-09) ===

‎cms/tests/test_frontend.py‎

Lines changed: 0 additions & 233 deletions
This file was deleted.

‎docs/contributing/testing.rst‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ There's more than one way to do this, but here's one to help you get started::
5252
python manage.py test
5353

5454

55-
It can take a few minutes to run. Note that the selenium tests included in the
56-
test suite require that you have Firefox installed.
55+
It can take a few minutes to run.
5756

5857
When you run tests against your own new code, don't forget that it's useful to
5958
repeat them for different versions of Python and Django.
@@ -118,21 +117,6 @@ To use a different database, set the ``DATABASE_URL`` environment variable to a
118117
dj-database-url compatible value.
119118

120119

121-
Using X virtual framebuffer for headless frontend testing
122-
---------------------------------------------------------
123-
124-
On Linux systems with X you can use `X virtual framebuffer
125-
<http://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml>`_ to run frontend tests headless
126-
(without the browser window actually showing). To do so, it's recommended to use the ``xvfb-run``
127-
script to run tests.
128-
129-
.. important::
130-
131-
The frontend tests have a minimum screen size to run successfully. You must
132-
set the screen size of the virtual frame buffer to at least 1280x720x8.
133-
You may do so using ``xvfb-run -s"-screen 0 1280x720x8" ...``.
134-
135-
136120
**********************
137121
Running Frontend Tests
138122
**********************

‎test_requirements/requirements_base.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ html5lib>0.99999
66
django-treebeard==4.0
77
argparse
88
dj-database-url
9-
selenium
109
djangocms-admin-style>=1.0
1110
django-sekizai>=0.9
1211
django-classy-tags>=0.7.2

0 commit comments

Comments
 (0)