From 9c24b45f4c521bdafa0ca5d6fce68b0f5e36c8fe Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 4 Jun 2014 23:47:22 -0300 Subject: [PATCH] fix in updateVersion with tests --- css/main.css | 4 ++++ index.html | 6 +++--- js/controllers/header.js | 7 +++---- test/unit/controllers/controllersSpec.js | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/css/main.css b/css/main.css index 4a8a810fc..4aa24fbfa 100644 --- a/css/main.css +++ b/css/main.css @@ -603,6 +603,10 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus { background: #16A085; } +.alert-box a { + color:white; +} + @media only screen and (max-width: 40em) { #main, .header-content { diff --git a/index.html b/index.html index 573e7cc74..78e789e05 100644 --- a/index.html +++ b/index.html @@ -75,9 +75,9 @@
-
- A newer version of Copay is now available, please update your wallet to a latest version. - Please check Copay.io. +
+ A newer version of Copay is now available ({{updateVersion.version}}), please update your wallet. + Check Copay.io for details.
diff --git a/js/controllers/header.js b/js/controllers/header.js index 152fba89f..66acd9080 100644 --- a/js/controllers/header.js +++ b/js/controllers/header.js @@ -26,11 +26,10 @@ angular.module('copayApp.controllers').controller('HeaderController', var latestVersion = data[0].name.replace('v', '').split('.').map(toInt); var currentVersion = copay.version.split('.').map(toInt); if (currentVersion[0] < latestVersion[0]){ - $scope.updateVersion = 'error'; + $scope.updateVersion = {class: 'error', version:data[0].name}; } else if (currentVersion[0] == latestVersion[0] && currentVersion[1] < latestVersion[1]) { - $scope.updateVersion = 'info'; - } else - $scope.updateVersion = 'ok'; + $scope.updateVersion = {class: 'info', version:data[0].name}; + } }); diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js index 0b8cdd20f..a2aeabac3 100644 --- a/test/unit/controllers/controllersSpec.js +++ b/test/unit/controllers/controllersSpec.js @@ -101,7 +101,8 @@ describe("Unit: Controllers", function() { $httpBackend.expectGET(GH); scope.$apply(); $httpBackend.flush(); - expect(scope.updateVersion).equal('error'); + expect(scope.updateVersion.class).equal('error'); + expect(scope.updateVersion.version).equal('v100.1.6'); }); it('should check blockChainStatus', function() {