Noissue - Merge next into master

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@ Hi,
 
 You tried to submit a pull request for adblockpluscore.
 
-While we love GitHub, the project is hosted on GitLab, therefor we do
+While we love GitHub, the project is hosted on GitLab, therefore we do
 not monitor pull request submitted on GitHub.
 
 Please visit: https://gitlab.com/eyeo/adblockplus/adblockpluscore

.gitlab-ci.yml

@@ -33,10 +33,7 @@ before_script:
     if [[ "$CI_RUNNER_DESCRIPTION" == *gitlab.com ]]; then
       apt-get update;
       apt-get install -y apt-transport-https python-pip libgtk-3-0 libxt6 \
-        xvfb libnss3 libxss1 libgconf-2-4 libasound2;
-      curl -sL https://deb.nodesource.com/setup_8.x | bash -;
-      apt-get update -y;
-      apt-get install -y nodejs;
+        xvfb libnss3 libxss1 libgconf-2-4 libasound2 nodejs npm;
     fi
   - mkdir -p .git/info
   - ./ensure_dependencies.py

README.md

@@ -22,7 +22,8 @@ dependencies.
 
 ### Running specific tests
 
-You can specify specific test files or directories on the command line, e.g.:
+You can specify specific test files or directories on the
+command line, e.g.:
 `npm test test/synchronizer.js test/browser/elemHideEmulation.js`.
 
 ### Running the browser tests in a real browser
@@ -41,6 +42,10 @@ BROWSER_TEST_RUNNERS environment, the default is
 
 You can not set a specific version of the browser at runtime.
 
+Browser tests run headless by default (except on Windows). If you want
+to disable headless mode on the WebDriver controlled tests, set the
+BROWSER_TEST_HEADLESS environment to 0.
+
 ### Browser caching
 
 By default, the browsers used for testing are cached for later use in