From 5e9cec83848fe92d89dd9b4e60bd57c11f11e81c Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Fri, 3 Jun 2016 14:47:47 +0100 Subject: [PATCH] Minor version header fixes refs #38 - use same version regex as `safeVersion` does on the server - remove errant `console.log` from store service test --- ghost/admin/config/environment.js | 2 +- ghost/admin/tests/integration/services/store-test.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ghost/admin/config/environment.js b/ghost/admin/config/environment.js index 091cca129f..454b7a0ce5 100644 --- a/ghost/admin/config/environment.js +++ b/ghost/admin/config/environment.js @@ -21,7 +21,7 @@ module.exports = function (environment) { // override the default version string which contains git info from // https://github.com/cibernox/git-repo-version. Only include the // `major.minor` version numbers - version: require('../package.json').version.replace(/\.\d+$/, '') + version: require('../package.json').version.match(/^(\d+\.)?(\d+)/)[0] }, 'ember-simple-auth': { diff --git a/ghost/admin/tests/integration/services/store-test.js b/ghost/admin/tests/integration/services/store-test.js index f4dcdc2b4b..2fea6a5412 100644 --- a/ghost/admin/tests/integration/services/store-test.js +++ b/ghost/admin/tests/integration/services/store-test.js @@ -37,7 +37,6 @@ describeModule( store.find('post', 1).catch(() => { let [request] = server.handledRequests; - console.log(request); expect(request.requestHeaders['X-Ghost-Version']).to.equal(version); done(); });