From d0cb7ceebca459e0b9ddf4b72e133b21067dfd76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kornel=20Lesin=CC=81ski?= <kornel@geekhood.net> Date: Tue, 21 Mar 2017 19:43:59 +0000 Subject: [PATCH] Formatting --- index.js | 2 +- test/revalidatetest.js | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 608d6d0..99d116c 100644 --- a/index.js +++ b/index.js @@ -350,7 +350,7 @@ module.exports = class CachePolicy { validationRequest(incoming_req) { this._assertRequestHasHeaders(incoming_req); - if (!this._resHeaders.etag && !this._resHeaders["last-modified"]) { + if (!this._resHeaders.etag && !this._resHeaders['last-modified']) { return incoming_req; // no validators available } // revalidation allowed via HEAD diff --git a/test/revalidatetest.js b/test/revalidatetest.js index 32dfe4a..d8db89b 100644 --- a/test/revalidatetest.js +++ b/test/revalidatetest.js @@ -3,8 +3,14 @@ const assert = require('assert'); const CachePolicy = require('..'); -const simpleRequest = {method:'GET',headers:{host:'www.w3c.org'},url:'/Protocols/rfc2616/rfc2616-sec14.html'}; -const simpleRequestBut = overrides=>Object.assign({},simpleRequest,overrides); +const simpleRequest = { + method:'GET', + headers:{host:'www.w3c.org'}, + url:'/Protocols/rfc2616/rfc2616-sec14.html', +}; +function simpleRequestBut(overrides) { + return Object.assign({}, simpleRequest, overrides); +} const cacheableResponse = {headers:{'cache-control':'max-age=111'}}; const etaggedResponse = {headers:Object.assign({'etag':'"123456789"'},cacheableResponse.headers)}; @@ -13,7 +19,7 @@ const multiValidatorResponse = {headers:Object.assign({},etaggedResponse.headers const alwaysVariableResponse = {headers:Object.assign({'vary':'*'},cacheableResponse.headers)}; describe('Can be revalidated?', function() { - it('ok if method changes to HEAD',function(){ + it('ok if method changes to HEAD', function(){ const cache = new CachePolicy(simpleRequest,etaggedResponse); assert(cache.validationRequest(simpleRequestBut({method:'HEAD'}))); }); @@ -49,7 +55,7 @@ describe('Can be revalidated?', function() { }); describe('Validation request', function(){ - it('must contain any etag',function(){ + it('must contain any etag', function(){ const cache = new CachePolicy(simpleRequest,multiValidatorResponse); const expected = multiValidatorResponse.headers.etag; const actual = cache.validationRequest(simpleRequest).headers['if-none-match']; @@ -61,5 +67,5 @@ describe('Validation request', function(){ const actual = cache.validationRequest(simpleRequest).headers['if-modified-since']; assert.equal(actual,expected); }); - -}); \ No newline at end of file + +});