Skip to content

Commit 04abd98

Browse files
committed
Update end-user docs and .travis.dist.yml accordingly.
1 parent eba664f commit 04abd98

File tree

5 files changed

+14
-63
lines changed

5 files changed

+14
-63
lines changed

.travis.dist.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
language: php
22

3-
sudo: true
4-
53
addons:
6-
firefox: "47.0.1"
74
postgresql: "9.4"
85

96
services:
107
- mysql
118
- postgresql
9+
- docker
1210

1311
cache:
1412
directories:
@@ -34,6 +32,7 @@ before_install:
3432
- cd ../..
3533
- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
3634
- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
35+
- docker run -d -p 127.0.0.1:4444:4444 --net=host -v /dev/shm:/dev/shm selenium/standalone-firefox:3
3736

3837
install:
3938
- moodle-plugin-ci install

docs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
1717
[#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91).
1818
- Updated [.travis.dist.yml] to build Moodle 3.8: removed PHP 7.0 and added
1919
7.2 and 7.3 (per release notes).
20+
- Replaced Selenium in-built functionality with docker image for Selenium
21+
Standalone server. See [#99](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/99).
2022

2123
### Added
2224
- New help document: [CLI commands and options](CLI.md)

docs/Chrome.md

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

docs/Help.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ changed. Also a good place to look for new goodies.
1414
* [Add extra Moodle configs](AddExtraConfig.md): how to add extra configs to Moodle `config.php`.
1515
* [Add extra plugins](AddExtraPlugins.md): how to add plugin dependencies to Moodle.
1616
* [Ignoring files](IgnoringFiles.md): how to ignore files that might be causing failures.
17-
* [Using Chrome with Behat](Chrome.md): how to use Chrome instead of Firefox for Behat.
1817
* [Generating code coverage](CodeCoverage.md): how to generate code coverage of your plugin.
1918
* [CLI commands and options](CLI.md): the available `moodle-plugin-ci` commands and their options.
2019

docs/TravisFileExplained.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@ see [Travis CI's documentation](http://docs.travis-ci.com/user/getting-started/)
1111
# This is the language of our project.
1212
language: php
1313

14-
# If using Behat, then this should be true due to an issue with Travis CI.
15-
# If not using Behat, recommended to use `sudo: false` as it is faster.
16-
sudo: true
17-
18-
# Installs the required version of Firefox for Behat, an updated version
19-
# of PostgreSQL and extra APT packages.
14+
# Installs the updated version of PostgreSQL and extra APT packages.
2015
addons:
21-
firefox: "47.0.1"
2216
postgresql: "9.4"
2317

2418
# Ensure DB services are running.
@@ -72,6 +66,10 @@ before_install:
7266
- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
7367
# Update the $PATH so scripts from this project can be called easily.
7468
- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
69+
# Start Selenium Standalone server with Chrome/Firefox installed. If you
70+
# prefer to run Behat tests with Chrome profile (see Behat step details below),
71+
# use selenium/standalone-chrome:3 image instead.
72+
- docker run -d -p 127.0.0.1:4444:4444 --net=host -v /dev/shm:/dev/shm selenium/standalone-firefox:3
7573

7674
# This lists steps that are run for installation and setup.
7775
install:
@@ -123,12 +121,16 @@ script:
123121
- moodle-plugin-ci phpunit
124122
# This step runs the Behat tests of your plugin. If your plugin has
125123
# Behat tests, then it is highly recommended that you keep this step.
126-
# There are two important options that you may want to use:
124+
# There are few important options that you may want to use:
127125
# - The auto rerun option allows you to rerun failures X number of times,
128126
# default is 2, EG usage: --auto-rerun 3
129127
# - The dump option allows you to print the failure HTML to the console,
130128
# handy for debugging, EG usage: --dump
131129
# - The suite option allows you to set the theme to use for behat test. If
132130
# not specified, the default theme is used, EG usage: --suite boost
131+
# - The profile option allows you to set the browser driver to use,
132+
# default is Firefox. If you need Chrome, set '--profile chrome' and make
133+
# sure that you are using correct Selenium server docker image in
134+
# before_install section above.
133135
- moodle-plugin-ci behat
134136
```

0 commit comments

Comments
 (0)