From 70c39b0ccf217145611b89a7462d7bea5ca03d9c Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Fri, 25 Mar 2016 12:42:06 +0100 Subject: [PATCH 1/4] Add bumped integration --- .bumpedrc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .bumpedrc diff --git a/.bumpedrc b/.bumpedrc new file mode 100644 index 0000000..f940e3f --- /dev/null +++ b/.bumpedrc @@ -0,0 +1,31 @@ +files: [ + 'package.json' +] + +plugins: + + prerelease: + + 'Linting config files': + plugin: 'bumped-finepack' + + postrelease: + + 'Generating CHANGELOG file': + plugin: 'bumped-changelog' + + 'Commiting new version': + plugin: 'bumped-terminal' + command: 'git add CHANGELOG.md package.json && git commit -m "Release $newVersion"' + + 'Detecting problem before publish': + plugin: 'bumped-terminal' + command: 'git-dirty && npm test' + + 'Publishing tag at GitHub': + plugin: 'bumped-terminal' + command: 'git tag $newVersion && git push && git push --tags' + + 'Publishing at NPM': + plugin: 'bumped-terminal' + command: 'npm publish' \ No newline at end of file From 0966ef16b550e834ad4fc9e5f88a7e1b1c267971 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Fri, 25 Mar 2016 12:44:41 +0100 Subject: [PATCH 2/4] Fix travis integration with phantom --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 465bbf2..5e7f1ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ node_js: - "0.10" - "iojs" before_install: - - npm install -g phantomjs + - npm install -g phantomjs-prebuilt env: - CXX=g++-4.8 addons: From 0cf2be3107bf360df753c2f0f9cf8efe4811a102 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Fri, 25 Mar 2016 12:53:22 +0100 Subject: [PATCH 3/4] Move xray phantom out of xray dep --- .travis.yml | 10 ---------- package.json | 1 - test/xray_driver_spec.js | 22 ---------------------- 3 files changed, 33 deletions(-) delete mode 100644 test/xray_driver_spec.js diff --git a/.travis.yml b/.travis.yml index 5e7f1ca..75ebb7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,5 @@ node_js: - "0.12" - "0.10" - "iojs" -before_install: - - npm install -g phantomjs-prebuilt -env: - - CXX=g++-4.8 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 script: npm run-script coveralls after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js" \ No newline at end of file diff --git a/package.json b/package.json index cf092eb..5621d8a 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "multiline": "~1.0.2", "rimraf": "~2.3.2", "standard": "~6.0.8", - "x-ray-phantom": "~1.0.0" }, "engines": { "node": ">= 0.10" diff --git a/test/xray_driver_spec.js b/test/xray_driver_spec.js deleted file mode 100644 index 255a079..0000000 --- a/test/xray_driver_spec.js +++ /dev/null @@ -1,22 +0,0 @@ -/* global it, describe */ - -'use strict' - -var Xray = require('..') -var phantom = require('x-ray-phantom') -var assert = require('assert') - -describe('Xray.driver(fn)', function () { - it('should support basic phantom', function (done) { - var x = Xray() - .driver(phantom({ - webSecurity: false - })) - - x('http://www.google.com/ncr', 'title')(function (err, str) { - if (err) return done(err) - assert.equal('Google', str) - done() - }) - }) -}) From a0e8be77a7110c3e31f2ae6e876f48cef339d101 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Fri, 25 Mar 2016 12:56:44 +0100 Subject: [PATCH 4/4] Fix package --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5621d8a..65ceb7f 100644 --- a/package.json +++ b/package.json @@ -43,15 +43,15 @@ "mocha-lcov-reporter": "~1.2.0", "multiline": "~1.0.2", "rimraf": "~2.3.2", - "standard": "~6.0.8", + "standard": "~6.0.8" }, "engines": { "node": ">= 0.10" }, "scripts": { + "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly", "pretest": "standard", - "test": "mocha", - "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly" + "test": "mocha" }, "license": "MIT" }