From 6ece30fa2c2f12c3835f4a98b0db34867c1470fc Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 17 Feb 2016 11:47:27 +0100 Subject: [PATCH 1/2] Ignore CDB_ sql files downloaded for tests --- test/support/sql/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/support/sql/.gitignore diff --git a/test/support/sql/.gitignore b/test/support/sql/.gitignore new file mode 100644 index 00000000..68d2db39 --- /dev/null +++ b/test/support/sql/.gitignore @@ -0,0 +1 @@ +CDB_*.sql From 3d0c0f34adc2a730dd00c1ae339e5c39f011efd7 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 17 Feb 2016 12:15:20 +0100 Subject: [PATCH 2/2] Use a set to compare surrogate keys, avoiding key order errors --- test/support/test_helper.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/support/test_helper.js b/test/support/test_helper.js index e44916fd..de0f7822 100644 --- a/test/support/test_helper.js +++ b/test/support/test_helper.js @@ -63,7 +63,15 @@ function checkCache(res) { function checkSurrogateKey(res, expectedKey) { assert.ok(res.headers.hasOwnProperty('surrogate-key')); - assert.equal(res.headers['surrogate-key'], expectedKey); + + function createSet(keys, key) { + keys[key] = true; + return keys; + } + var keys = res.headers['surrogate-key'].split(' ').reduce(createSet, {}); + var expectedKeys = expectedKey.split(' ').reduce(createSet, {}); + + assert.deepEqual(keys, expectedKeys); } //global afterEach to capture test suites that leave keys in redis