aol · vzhukovsky · Sep 6, 2017 · May 9, 2017 · May 10, 2017 · May 15, 2017
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,43 @@
+module.exports = {
+  "env": {
+    "browser": true,
+    "commonjs": true
+  },
+  "extends": "standard",
+  "globals": {
+    "$$PREBID_GLOBAL$$": false
+  },
+  "parserOptions": {
+    "sourceType": "module"
+  },
+  "rules": {
+    "comma-dangle": "off",
+    "semi": "off",
+    "space-before-function-paren": "off",
+
+    // Exceptions below this line are temporary, so that eslint can be added into the CI process.
+    // Violations of these styles should be fixed, and the exceptions removed over time.
+    //
+    // See Issue #1111.
+    "brace-style": "off",
+    "camelcase": "off",
+    "eqeqeq": "off",
+    "import/first": "off",
+    "new-cap": "off",
+    "no-control-regex": "off",
+    "no-mixed-operators": "off",
+    "no-multiple-empty-lines": "off",
+    "no-redeclare": "off",
+    "no-return-assign": "off",
+    "no-throw-literal": "off",
+    "no-undef": "off",
+    "no-unused-vars": "off",
+    "no-use-before-define": "off",
+    "no-useless-call": "off",
+    "no-useless-escape": "off",
+    "one-var": "off",
+    "standard/no-callback-literal": "off",
+    "standard/object-curly-even-spacing": "off",
+    "valid-typeof": "off"
+  }
+};
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,6 +26,9 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
   }
 }
 ```
+
+Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page.
+
 - contact email of the adapter’s maintainer
 - [ ] official adapter submission
 

diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ build/coverage/
 
 ## Directory-based project format:
 .idea/
+.vscode/
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:

diff --git a/.jscsrc b/.jscsrc
diff --git a/.jshintrc b/.jshintrc
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-5.1
+7.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,17 @@
-sudo: required
 dist: trusty
 
 language: node_js
 
 node_js:
-  - "5.1"
+  - "7.0"
 
+# See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-the-Chrome-addon-in-the-headless-mode
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  chrome: stable
 
 before_install:
   - npm install -g gulp
-  - export CHROME_BIN=google-chrome
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 script:
   - gulp run-tests
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,24 @@
+AOL Prebid 1.25.0
+----------------
+Updated to Prebid 0.26.1
+
+
+AOL Prebid 1.24.0
+----------------
+Updated to Prebid 0.25.0
+
+
+AOL Prebid 1.23.0
+----------------
+Added passing key values feature.
+Updated to Prebid 0.24.1
+
+
+AOL Prebid 1.22.0
+----------------
+Added aliases for AOL adapter.
+
+
 AOL Prebid 1.21.0
 ----------------
 Updated to Prebid 0.23.1

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,24 +1,42 @@
 # Contributing to Prebid.js
-Contributions are always welcome. To contribute, [fork](https://help.github.com/articles/fork-a-repo/) Prebid.js, commit your changes, and [open a pull request](https://help.github.com/articles/using-pull-requests/).
+Contributions are always welcome. To contribute, [fork](https://help.github.com/articles/fork-a-repo/) Prebid.js,
+commit your changes, and [open a pull request](https://help.github.com/articles/using-pull-requests/) against the
+master branch.
 
-## Pull Requests
-Please make sure that pull requests are scoped to one change, and that any added or changed code includes tests with greater than 80% code coverage. See [Testing Prebid.js](#testing-prebidjs) for help on writing tests.
+Pull requests must have 80% code coverage before beign considered for merge.
+Additional details about the process can be found [here](./pr_review.md).
 
 ## Issues
-[prebid.org](http://prebid.org/) contains documentation that may help answer questions you have about using Prebid.js. If you can't find the answer there, try searching for a similar issue on the [issues page](https://github.com/prebid/Prebid.js/issues). If you don't find an answer there, [open a new issue](https://github.com/prebid/Prebid.js/issues/new).
+[prebid.org](http://prebid.org/) contains documentation that may help answer questions you have about using Prebid.js.
+If you can't find the answer there, try searching for a similar issue on the [issues page](https://github.com/prebid/Prebid.js/issues).
+If you don't find an answer there, [open a new issue](https://github.com/prebid/Prebid.js/issues/new).
 
 ## Documentation
 If you have a documentation issue or pull request, please open a ticket or PR in the [documentation repository](https://github.com/prebid/prebid.github.io).
 
-## Testing Prebid.js
-Pull requests to the Prebid.js library will need to include tests with greater than 80% code coverage for any changed/added code before they can be merged into master.
+## Writing Tests
 
-This section describes how to test code in the Prebid.js repository to help prepare your pull request.
+Prebid uses [Mocha](http://mochajs.org/) and [Chai](http://chaijs.com/) for unit tests. [Sinon](http://sinonjs.org/)
+provides mocks, stubs, and spies. [Karma](https://karma-runner.github.io/1.0/index.html) runs the tests and generates
+code coverage reports at `build/coverage/lcov/lcov-report/index.html`.
 
-### Writing tests
+Tests are stored in the [test/spec](test/spec) directory. Tests for Adapters are located in [test/spec/adapters](test/spec/adapters).
+They can be run with the following commands:
+
+- `gulp test` - run the test suite once (`npm test` is aliased to call `gulp test`)
+- `gulp serve` - run the test suite once, but re-run it whenever a file in the `src` or `test` directory is modified
+
+Before a Pull Request will be considered for merge:
+
+- All new and existing tests must pass
+- Added or modified code must have greater than 80% coverage
+
+If you are submitting an adapter, you can also use the [Hello World](integrationExamples/gpt/hello_world.html) example page to test integration with your server.
+
+### Test Guidelines
 When you are adding code to Prebid.js, or modifying code that isn't covered by an existing test, test the code according to these guidelines:
 
-- If the module you are working on is already partially tested by a file within the `test` directory, add tests to that file
+- If the module you are working on is already partially tested by a file within the `test/spec` directory, add tests to that file
 - If the module does not have any tests, create a new test file
 - Group tests in a `describe` block
 - Test individual units of code within an `it` block
@@ -36,31 +54,8 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
 - If you need to check `adloader.loadScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadScript` call without affecting external resources
 - When writing tests you may use ES2015 syntax if desired
 
-### Running tests
-After checking out the Prebid.js repository and installing dev dependencies with `npm install`, use the following commands to run tests as you are working on code:
-
-- `gulp test` will run the test suite once (`npm test` is aliased to call `gulp test`)
-- `gulp serve` will run tests once and stay open, re-running tests whenever a file in the `src` or `test` directory is modified
-
-### Checking results and code coverage
-Check the test results using these guidelines:
-
-- Look at the total number of tests run, passed, and failed in the shell window.
-- If all tests are passing, great.
-- Otherwise look for errors printed in the console for a description of the failing test.
-- You may need to iterate on your code or tests until all tests are passing.
-- Make sure existing tests still pass.
-- There is a table below the testing report that shows code coverage percentage, for each file under the `src` directory.
-- Each time you run tests, a code coverage report is generated in `build/coverage/lcov/lcov-report/index.html`.
-- This is a static HTML page that you can load in your browser.
-- On that page, navigate to the file you are testing to see which lines are being tested.
-- Red indicates that a line isn't covered by a test.
-- Gray indicates a line that doesn't need coverage, such as a comment or blank line.
-- Green indicates a line that is covered by tests.
-- The code you have added or modified must have greater than 80% coverage to be accepted.
-
-### Examples
-Prebid.js already has lots of tests. Read them to see how Prebid.js is tested, and for inspiration:
+### Test Examples
+Prebid.js already has many tests. Read them to see how Prebid.js is tested, and for inspiration:
 
 - Look in `test/spec` and its subdirectories
 - Tests for bidder adaptors are located in `test/spec/adapters`
@@ -82,10 +77,3 @@ describe('<Adapter>', () => {
   // Add other `describe` or `it` blocks as necessary
 });
 ```
-
-### Resources
-The Prebid.js testing stack contains some of the following tools. It may be helpful to consult their documentation during the testing process.
-
-- [Mocha - test framework](http://mochajs.org/)
-- [Chai - BDD/TDD assertion library](http://chaijs.com/)
-- [Sinon - spy, stub, and mock library](http://sinonjs.org/)