From fc0cc2d83cabc593784ba43ae0961db20beadff7 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:05:22 +0100 Subject: [PATCH 1/8] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7caf3cd..5858cc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: node_js node_js: - "node" - - "iojs" before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start From d3010b052344c0e4cd61a13f5a73a6feb063e3dc Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:06:02 +0100 Subject: [PATCH 2/8] Update karma.conf.js --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index b80efa5..f6460c6 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -2,7 +2,7 @@ // Generated on Wed Jun 18 2014 09:33:44 GMT+0100 (BST) module.exports = function(config) { - var browsers = ['PhantomJS', 'Firefox']; + var browsers = ['Firefox']; if (!process.TRAVIS) { browsers.push('Chrome'); From e8f3a5bfc2d8aa7d70b9a0e36cf30e0eb2756320 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:07:32 +0100 Subject: [PATCH 3/8] Update clone-object.js --- test/clone-object.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/clone-object.js b/test/clone-object.js index 86ec647..313c1fe 100644 --- a/test/clone-object.js +++ b/test/clone-object.js @@ -2,6 +2,8 @@ describe('clone object', function () { it('should clone an 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); From 4b76c703cec9db5c086a76d4c1719eea92bc7e45 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:07:49 +0100 Subject: [PATCH 4/8] Update clone-object.js --- test/clone-object.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/clone-object.js b/test/clone-object.js index 313c1fe..566de2f 100644 --- a/test/clone-object.js +++ b/test/clone-object.js @@ -3,7 +3,7 @@ describe('clone object', function () { var expected = {name: 'Ahmed', age: 27, skills: ['cycling', 'walking', 'eating']}, obj = {}; - obj = JSON.parse{JSON.stringify(expected)} + obj = JSON.parse(JSON.stringify(expected)) expect(obj).toEqual(expected); expect(obj).not.toBe(expected); From 0562ca1d2ec40f083e32904283e1bff79c927849 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:09:38 +0100 Subject: [PATCH 5/8] Update flatten-array.js --- test/flatten-array.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/flatten-array.js b/test/flatten-array.js index c7f0632..c288612 100644 --- a/test/flatten-array.js +++ b/test/flatten-array.js @@ -2,7 +2,9 @@ describe('flatten array', function () { it('should flatten an 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]; + + arr = arr.toString().split(',').sort() expect(arr).toEqual(expected); }); -}); \ No newline at end of file +}); From c1b88b1caee8ba1a0c428ec498ff979589719335 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:10:23 +0100 Subject: [PATCH 6/8] Update scoping.js --- test/scoping.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8273914896e4c47dd9d95ed159ecacda8d95c363 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:12:11 +0100 Subject: [PATCH 7/8] Update package.json --- package.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7d46b91..9108c23 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,14 @@ }, "homepage": "https://github.com/ahmednuaman/javascript-tests", "dependencies": { - "karma": "^0.12.32", - "karma-jasmine": "^0.3.5", - "karma-phantomjs-launcher": "^0.1.4" + "karma": "0.12.32", + "karma-cli": "^2.0.0", + "karma-jasmine": "0.3.5", + "karma-phantomjs-launcher": "0.1.4" }, "devDependencies": { - "karma-chrome-launcher": "^0.1.12", - "karma-firefox-launcher": "^0.1.6" + "jasmine-core": "^3.3.0", + "karma-chrome-launcher": "0.1.12", + "karma-firefox-launcher": "0.1.6" } } From 11069fbde2e13f214945896c66ec1b148ae33ad7 Mon Sep 17 00:00:00 2001 From: racheljinks <53005222+racheljinks@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:12:28 +0100 Subject: [PATCH 8/8] Update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 9108c23..5eefe8b 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,7 @@ "dependencies": { "karma": "0.12.32", "karma-cli": "^2.0.0", - "karma-jasmine": "0.3.5", - "karma-phantomjs-launcher": "0.1.4" + "karma-jasmine": "0.3.5" }, "devDependencies": { "jasmine-core": "^3.3.0",