From 3fb6a79b197d08b127511e69f062206a9309db89 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 15:33:09 +0100 Subject: [PATCH 1/6] Fixed the test scripts --- test/clone-object.js | 2 ++ test/flatten-array.js | 7 ++++++- test/scoping.js | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/test/clone-object.js b/test/clone-object.js index 86ec647..5afc49b 100644 --- a/test/clone-object.js +++ b/test/clone-object.js @@ -3,6 +3,8 @@ describe('clone object', function () { var expected = {name: 'Ahmed', age: 27, skills: ['cycling', 'walking', 'eating']}, obj = {}; + obj = JSON.parse(JSON.stringify(expected)); + expect(obj).toEqual(expected); expect(obj).not.toBe(expected); }); diff --git a/test/flatten-array.js b/test/flatten-array.js index c7f0632..04f15e6 100644 --- a/test/flatten-array.js +++ b/test/flatten-array.js @@ -3,6 +3,11 @@ describe('flatten array', function () { var arr = [1, 2, [1, 2, [3, 4, 5, [1]]], 2, [2]], expected = [1, 1, 1, 2, 2, 2, 2, 3, 4, 5]; + const arrAsString = arr.toString(); + const flatArr = arrAsString.split(',').map(Number); + + arr = flatArr.sort(); + expect(arr).toEqual(expected); }); -}); \ No newline at end of file +}); diff --git a/test/scoping.js b/test/scoping.js index 557c54a..76b0c90 100644 --- a/test/scoping.js +++ b/test/scoping.js @@ -16,9 +16,9 @@ describe('scoping', function () { }; Module.prototype.req = function() { - return request(this.method); + return request(this.method.bind(this)); }; expect(mod.req()).toBe('bar'); }); -}); \ No newline at end of file +}); From 8402251cc75f49e6b37cbaf076838d96020930e7 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 15:47:07 +0100 Subject: [PATCH 2/6] Fixed travis xvfb error --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7caf3cd..266449a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - "node" - "iojs" +services: + - xvfb before_script: - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start From 6195b6df39ecb9aac3712cc999dfc579e46a81a2 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 16:20:32 +0100 Subject: [PATCH 3/6] Added missing jasmine-core dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 7d46b91..25ebf88 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ }, "homepage": "https://github.com/ahmednuaman/javascript-tests", "dependencies": { + "jasmine-core": "^3.4.0", "karma": "^0.12.32", "karma-jasmine": "^0.3.5", "karma-phantomjs-launcher": "^0.1.4" From 31087e5a1b113fd745bd734f765eeac0029ca3a7 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 16:45:52 +0100 Subject: [PATCH 4/6] Attempt to fix dependency version conflicts --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 25ebf88..2ceb49a 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,9 @@ "homepage": "https://github.com/ahmednuaman/javascript-tests", "dependencies": { "jasmine-core": "^3.4.0", - "karma": "^0.12.32", - "karma-jasmine": "^0.3.5", - "karma-phantomjs-launcher": "^0.1.4" + "karma": "^4.1.0", + "karma-jasmine": "^2.0.1", + "karma-phantomjs-launcher": "^1.0.4" }, "devDependencies": { "karma-chrome-launcher": "^0.1.12", From 22c2e853edba6218db4103cdbb64c004a3210c88 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 16:58:22 +0100 Subject: [PATCH 5/6] Downgrade to jasmine-core v2 --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2ceb49a..5f1a4da 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ }, "homepage": "https://github.com/ahmednuaman/javascript-tests", "dependencies": { - "jasmine-core": "^3.4.0", - "karma": "^4.1.0", - "karma-jasmine": "^2.0.1", - "karma-phantomjs-launcher": "^1.0.4" - }, + "jasmine-core": "^2.0", + "karma": "^0.12.32", + "karma-jasmine": "^0.3.5", + "karma-phantomjs-launcher": "^0.1.4" +}, "devDependencies": { "karma-chrome-launcher": "^0.1.12", "karma-firefox-launcher": "^0.1.6" From a9e34499565d305d913a54913de9dd312c548228 Mon Sep 17 00:00:00 2001 From: OllieMartin Date: Fri, 21 Jun 2019 17:12:01 +0100 Subject: [PATCH 6/6] Fixed version dependencies --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5f1a4da..323dc54 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ }, "homepage": "https://github.com/ahmednuaman/javascript-tests", "dependencies": { - "jasmine-core": "^2.0", - "karma": "^0.12.32", - "karma-jasmine": "^0.3.5", - "karma-phantomjs-launcher": "^0.1.4" + "jasmine-core": "2.99.0", + "karma": "0.13.22", + "karma-jasmine": "0.3.8", + "karma-phantomjs-launcher": "1.0.4" }, "devDependencies": { "karma-chrome-launcher": "^0.1.12",