Merge branch 'master' of github.com:kitematic/kitematic

__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('');
@@ -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();

__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');
       });
     });
   });