From aeb1f7cdc64ecd4ad90dd5a125968607d0666b56 Mon Sep 17 00:00:00 2001 From: FrenchBen Date: Mon, 10 Aug 2015 14:58:02 -0400 Subject: [PATCH 1/3] Update VB test version Signed-off-by: FrenchBen --- __tests__/VirtualBoxUtil-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/__tests__/VirtualBoxUtil-test.js b/__tests__/VirtualBoxUtil-test.js index 575d97e0db..12976e016e 100644 --- a/__tests__/VirtualBoxUtil-test.js +++ b/__tests__/VirtualBoxUtil-test.js @@ -3,13 +3,13 @@ var virtualBox = require('../src/utils/VirtualBoxUtil'); var util = require('../src/utils/Util'); describe('VirtualBox', function () { - describe('version 4.3.20r96996', function () { + describe('version 5.0.0r101573', function () { pit('correctly parses virtualbox version', function () { util.exec.mockImplementation(function () { - return Promise.resolve('4.3.20r96996'); + return Promise.resolve('5.0.0r101573'); }); return virtualBox.version().then(function (version) { - expect(version).toBe('4.3.20'); + expect(version).toBe('5.0.0'); }); }); }); From 1725f92c4e1ec81ade1051e6011da920429bdba4 Mon Sep 17 00:00:00 2001 From: FrenchBen Date: Tue, 11 Aug 2015 19:23:34 -0400 Subject: [PATCH 2/3] Updated store to match VB version --- __tests__/SetupStore-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/SetupStore-test.js b/__tests__/SetupStore-test.js index 5c693c7331..7436f140a8 100644 --- a/__tests__/SetupStore-test.js +++ b/__tests__/SetupStore-test.js @@ -20,7 +20,7 @@ describe('SetupStore', function () { pit('downloads virtualbox if it is installed but has an outdated version', function () { virtualBox.installed.mockReturnValue(true); - virtualBox.version.mockReturnValue(Promise.resolve('4.3.16')); + virtualBox.version.mockReturnValue(Promise.resolve('5.0.0')); util.compareVersions.mockReturnValue(-1); setupUtil.download.mockReturnValue(Promise.resolve()); virtualBox.filename.mockReturnValue(''); From 36373d091db26866267c144942e4614ede03a174 Mon Sep 17 00:00:00 2001 From: FrenchBen Date: Tue, 11 Aug 2015 20:06:32 -0400 Subject: [PATCH 3/3] mock package version for test to pass --- __tests__/SetupStore-test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/__tests__/SetupStore-test.js b/__tests__/SetupStore-test.js index 7436f140a8..184a2f3185 100644 --- a/__tests__/SetupStore-test.js +++ b/__tests__/SetupStore-test.js @@ -55,6 +55,7 @@ describe('SetupStore', function () { machine.stop.mockReturnValue(Promise.resolve()); machine.start.mockReturnValue(Promise.resolve()); machine.upgrade.mockReturnValue(Promise.resolve()); + util.packagejson.mockReturnValue({'docker-version':'1.8.0'}); util.compareVersions.mockReturnValue(-1); machine.create.mockClear(); machine.upgrade.mockClear();