From e7dc80e8156f4de8c1e5de8d0bedaa290e045fe7 Mon Sep 17 00:00:00 2001 From: Bjorn Stromberg Date: Thu, 24 May 2018 11:13:54 +0900 Subject: [PATCH] v3.5.1 - 2018-05-24 --- CHANGELOG.md | 5 +++++ README.md | 1 + package.json | 3 ++- test/index.js | 10 +++++++--- webextension/manifest.json | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c337977..6cae941 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Intercept Redirect +## v3.5.1 - 2018-05-24 +- [CircleCI] Restore badge to README, it appears to be passing now, but no communication was received from CircleCI indicating it was fixed +- [Testing] Improve CHANGELOG version detection: The first version detected should match the package version +- [Packaging] Add `browser extension` to keywords + ## v3.5.0 - 2018-05-24 - Add `*.digidip.net` (Fixes #2) - Add support for wildcard subdomains diff --git a/README.md b/README.md index 32fa6bf..cab3b00 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,6 @@ [![Travis CI](https://travis-ci.org/bjornstar/intercept-redirect.svg?branch=master)](https://travis-ci.org/bjornstar/intercept-redirect) [![Appveyor](https://ci.appveyor.com/api/projects/status/9qrj76bt914531gg/branch/master?svg=true)](https://ci.appveyor.com/project/bjornstar/intercept-redirect/branch/master) +[![CircleCI](https://circleci.com/gh/bjornstar/intercept-redirect/tree/master.svg?style=svg)](https://circleci.com/gh/bjornstar/intercept-redirect/tree/master) Skip tracking redirects that serve no purpose other than to waste your precious time. diff --git a/package.json b/package.json index c8762ee..5fd8193 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bjornstar/intercept-redirect", - "version": "3.5.0", + "version": "3.5.1", "description": "Skip tracking redirects that serve no purpose other than to waste your precious time.", "main": "webextension/index.js", "dependencies": {}, @@ -16,6 +16,7 @@ }, "keywords": [ "webextension", + "browser extension", "redirect" ], "author": "Bjorn Stromberg ", diff --git a/test/index.js b/test/index.js index d0cc6f8..95b2aaf 100644 --- a/test/index.js +++ b/test/index.js @@ -112,15 +112,19 @@ describe('Packaging', function () { } const lines = changelog.split('\n'); + const versionRe = /^## v\d+\.\d+\.\d+/; const versionLine = `## v${pkg.version}`; for (var i = 0; i < lines.length; i += 1) { - if (lines[i].indexOf(versionLine) === 0) { - return done(); + const line = lines[i]; + + if (versionRe.test(line)) { + assert.equal(line.indexOf(versionLine), 0, `Package: ${versionLine}, Latest CHANGELOG: ${line}`) + return done() } } - done('Current version not found in CHANGELOG'); + done(new Error('No version found in CHANGELOG')); }); }); }); diff --git a/webextension/manifest.json b/webextension/manifest.json index 1cbd2c1..3a0c7d8 100644 --- a/webextension/manifest.json +++ b/webextension/manifest.json @@ -24,5 +24,5 @@ "*://vk.com/", "*://www.youtube.com/" ], - "version": "3.5.0" + "version": "3.5.1" }