Ste #46 - loads the saved image url into the input text box on load

build-canaries · Jan 20, 2015 · d92f348 · d92f348
1 parent 702e1e9
commit d92f348
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/js/config/adminView.js b/src/js/config/adminView.js
@@ -71,6 +71,7 @@ function load(postLoadCallback) {
     var settings = config.load()
     $('#cctray-url').val(settings.cctray)
     $('#success-text').val(settings.successText)
+    $('#success-image').val(settings.successImageUrl)
     if (config.hasCctray()) {
         postLoadCallback()
     }

diff --git a/src/js/config/config.js b/src/js/config/config.js
@@ -10,7 +10,7 @@ module.exports = {
         return {
             cctray: localStorage.hasOwnProperty('cctray') ? localStorage.getItem('cctray') : 'https://builds.apache.org/cc.xml',
             successText: localStorage.hasOwnProperty('successText') ? localStorage.getItem('successText') : '=(^.^)=',
-            successImageUrl: localStorage.hasOwnProperty('successImageUrl') ? localStorage.getItem('successText') : null,
+            successImageUrl: localStorage.hasOwnProperty('successImageUrl') ? localStorage.successImageUrl : null,
             includedProjects: projects === null ? null : projects.split(','),
             serverType: localStorage.hasOwnProperty('serverType') ? localStorage.serverType : "",
             projectsOnLastFetch: seenProjects === null ? null : seenProjects.split(',')

diff --git a/test/js/config/adminViewTest.js b/test/js/config/adminViewTest.js
@@ -138,6 +138,15 @@ describe('view logic', function () {
 
                 expect(adminController.saveSuccessImageUrl).toHaveBeenCalledWith('expected-image-url')
             })
+
+            it('loads', function () {
+                localStorage.setItem('successImageUrl', 'any old value')
+                var successImageUrl = $('#success-image')
+
+                view.init()
+
+                expect(successImageUrl.val()).toBe('any old value')
+            })
         })
     })
 

diff --git a/test/js/config/configTest.js b/test/js/config/configTest.js
@@ -19,7 +19,7 @@ describe('Configurable build monitor', function () {
             localStorage.setItem('cctray', 'some-url')
             localStorage.setItem('includedProjects', ['proj'])
             localStorage.setItem('successText', 'hello world')
-            localStorage.setItem('successImageUrl', 'hello world ')
+            localStorage.setItem('successImageUrl', 'hello world')
             localStorage.setItem('seenProjects', ['proj'])
 
             var settings = config.load()