File tree Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Original file line number Diff line number Diff line change 100
100
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.2
101
101
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.3
102
102
103
+ # Browsers:
104
+ - COMPOSE_APP=chrome PYTHON_VERSION=3.5
105
+
103
106
before_install :
104
107
- echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee -a /etc/default/docker
105
108
- sudo service docker restart
@@ -108,7 +111,7 @@ install:
108
111
- pip install docker-compose --upgrade
109
112
110
113
script :
111
- - git clone https://github.com/django /django.git --depth=1 /tmp/django
114
+ - git clone https://github.com/orf /django.git -b add-selenium-hub --depth=1 /tmp/django
112
115
- export DJANGO_PATH=/tmp/django
113
116
- docker-compose pull --include-deps $COMPOSE_APP || true
114
117
- docker-compose build --pull $COMPOSE_APP
@@ -120,7 +123,7 @@ script:
120
123
fi
121
124
122
125
after_failure :
123
- - docker-compose logs $COMPOSE_APP-db || true
126
+ - docker-compose logs
124
127
125
128
deploy :
126
129
provider : script
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ RUN pip install --upgrade pip
30
30
31
31
COPY --chown=test:test tests/requirements/ /requirements/
32
32
RUN for f in /requirements/*.txt; do pip install -r $f; done && \
33
- pip install flake8 flake8-isort sphinx pyenchant sphinxcontrib-spelling
33
+ pip install flake8 flake8-isort sphinx pyenchant sphinxcontrib-spelling selenium
34
34
35
35
RUN mkdir /tests && chown -R test:test /tests
36
36
USER test:test
Original file line number Diff line number Diff line change @@ -158,5 +158,20 @@ services:
158
158
<< : *base
159
159
entrypoint : flake8
160
160
161
+ # Browser tests
162
+ chrome :
163
+ << : *base
164
+ command : --selenium=chrome --selenium-hub=http://chrome-browser:4444/wd/hub
165
+ environment :
166
+ - WAIT_FOR=chrome-browser:4444
167
+ depends_on :
168
+ - chrome-browser
169
+ chrome-browser :
170
+ image : selenium/standalone-chrome
171
+ volumes :
172
+ - /dev/shm:/dev/shm
173
+
174
+
161
175
volumes :
162
176
oracle :
177
+
You can’t perform that action at this time.
0 commit comments