Skip to content
Permalink
Browse files

Noissue - Merge next into master

  • Loading branch information...
mjethani committed Aug 30, 2019
2 parents 33bdc49 + f9bc351 commit d3f6b1b7e3880eab6356b132493a4a947c87d33f
Showing with 8,218 additions and 8,003 deletions.
  1. +1 −1 .github/PULL_REQUEST_TEMPLATE.md
  2. +1 −4 .gitlab-ci.yml
  3. +6 −1 README.md
  4. +108 −6 data/publicSuffixList.json
  5. +0 −3 lib/.eslintrc.json
  6. +20 −4 lib/content/elemHideEmulation.js
  7. +172 −73 lib/content/snippets.js
  8. +0 −21 lib/coreUtils.js
  9. +23 −12 lib/downloader.js
  10. +337 −296 lib/elemHide.js
  11. +42 −21 lib/elemHideEmulation.js
  12. +61 −43 lib/elemHideExceptions.js
  13. +205 −189 lib/filterListener.js
  14. +5 −4 lib/filterStorage.js
  15. +11 −0 lib/filtersByDomain.js
  16. +1 −2 lib/iniParser.js
  17. +152 −46 lib/matcher.js
  18. +8 −4 lib/notification.js
  19. +1 −1 lib/snippets.js
  20. +30 −28 lib/subscriptionClasses.js
  21. +4 −3 package.json
  22. +3 −1 test/.eslintrc.json
  23. +8 −45 test/_common.js
  24. +32 −64 test/browser/_bootstrap.js
  25. +864 −921 test/browser/elemHideEmulation.js
  26. +362 −367 test/browser/snippets.js
  27. +91 −92 test/caching.js
  28. +360 −361 test/common.js
  29. +184 −190 test/domainRestrictions.js
  30. +298 −298 test/elemHide.js
  31. +114 −117 test/elemHideEmulation.js
  32. +493 −520 test/filterClasses.js
  33. +344 −290 test/filterListener.js
  34. +76 −79 test/filterNotifier.js
  35. +455 −466 test/filterStorage.js
  36. +211 −213 test/filterStorage_readwrite.js
  37. +146 −147 test/filtersByDomain.js
  38. +345 −402 test/matcher.js
  39. +568 −573 test/notification.js
  40. +79 −80 test/recommendations.js
  41. +305 −322 test/regexpFilters_matching.js
  42. +7 −5 test/runners/chromium_process.js
  43. +13 −15 test/runners/chromium_remote_process.js
  44. +6 −4 test/runners/firefox_process.js
  45. +5 −12 test/runners/webdriver.js
  46. +117 −124 test/signatures.js
  47. +237 −244 test/snippets.js
  48. +8 −0 test/stub-modules/prefs.js
  49. +1 −1 test/stub-modules/utils.js
  50. +194 −201 test/subscriptionClasses.js
  51. +535 −524 test/synchronizer.js
  52. +430 −439 test/url.js
  53. +110 −111 test/versions.js
  54. +29 −13 test_runner.js
@@ -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
@@ -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
@@ -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

0 comments on commit d3f6b1b

Please sign in to comment.
You can’t perform that action at this time.