Skip to content

Commit

Permalink
Merge branch 'master' into feat/ad-pods
Browse files Browse the repository at this point in the history
  • Loading branch information
delbeke committed Mar 22, 2017
2 parents 95fa87e + 2c02b99 commit 3bcdf74
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iab-vast-loader",
"version": "0.6.1",
"version": "0.6.2",
"description": "Loads and parses IAB VAST tags, resolving wrapped tags along the way.",
"main": "index.js",
"jsnext:main": "src/index.js",
Expand Down Expand Up @@ -33,15 +33,16 @@
},
"devDependencies": {
"babel-plugin-transform-builtin-extend": "^1.1.0",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.1.8",
"babel-register": "^6.22.0",
"babel-runtime": "^6.22.0",
"babel-register": "^6.24.0",
"babel-runtime": "^6.23.0",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"core-js": "^2.4.0",
"del": "^2.2.0",
"express": "^4.14.1",
"dirty-chai": "^1.2.2",
"express": "^4.15.2",
"fs-promise": "^2.0.0",
"gulp": "^3.9.1",
"gulp-babel": "^6.1.2",
Expand All @@ -50,16 +51,16 @@
"gulp-istanbul": "^1.0.0",
"gulp-load-plugins": "^1.5.0",
"gulp-mocha": "^3.0.0",
"gulp-sourcemaps": "^2.4.0",
"gulp-standard": "^8.0.3",
"gulp-sourcemaps": "^2.4.1",
"gulp-standard": "^9.0.0",
"in-publish": "^2.0.0",
"isparta": "^4.0.0",
"mocha-junit-reporter": "^1.13.0",
"run-sequence": "^1.1.5",
"sinon": "^1.17.7",
"sinon-chai": "^2.8.0",
"standard": "^8.6.0",
"yargs": "^6.6.0"
"standard": "^9.0.1",
"yargs": "^7.0.2"
},
"standard": {
"globals": [
Expand Down
2 changes: 2 additions & 0 deletions test/lib/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import chai from 'chai'
import chaiAsPromised from 'chai-as-promised'
import sinon from 'sinon'
import sinonChai from 'sinon-chai'
import dirtyChai from 'dirty-chai'

chai.use(chaiAsPromised)
chai.use(sinonChai)
chai.use(dirtyChai)

global.expect = chai.expect
global.sinon = sinon
6 changes: 3 additions & 3 deletions test/unit/vast-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe('VASTLoader', function () {
const loader = createLoader('tremor-video/vast_inline_linear.xml')
loader.on(type, spy)
await loader.load()
expect(spy.called).to.be.true
expect(spy.called).to.be.true()
})
}

Expand All @@ -177,7 +177,7 @@ describe('VASTLoader', function () {
const loader = createLoader('tremor-video/vast_wrapper_linear_1.xml')
loader.on(type, spy)
await loader.load()
expect(spy.calledTwice).to.be.true
expect(spy.calledTwice).to.be.true()
})
}

Expand All @@ -188,7 +188,7 @@ describe('VASTLoader', function () {
try {
await loader.load()
} catch (err) {}
expect(spy.calledOnce).to.be.true
expect(spy.calledOnce).to.be.true()
})
})

Expand Down

0 comments on commit 3bcdf74

Please sign in to comment.