Ste #46 - Show success image on load if it exists

build-canaries · Jan 21, 2015 · f5d6f26 · f5d6f26
1 parent a410514
commit f5d6f26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/js/config/adminView.js b/src/js/config/adminView.js
@@ -66,17 +66,15 @@ module.exports = function (controller) {
     return view
 }
 
-
 function load(postLoadCallback) {
     var settings = config.load()
     $('#cctray-url').val(settings.cctray)
     $('#success-text').val(settings.successText)
-    $('#success-image-url').val(settings.successImageUrl)
+    loadSuccessImage(settings);
     if (config.hasCctray()) {
         postLoadCallback()
     }
 }
-
 function saveCctray(postLoadCallback) {
     config.save({cctray: $('#cctray-url').val().trim()})
     postLoadCallback()
@@ -103,6 +101,14 @@ function showSuccessImage(imageUrl) {
     successImage.removeClass('hidden')
 }
 
+function loadSuccessImage(settings) {
+    var imageUrl = settings.successImageUrl
+    if (imageUrl) {
+        $('#success-image-url').val(imageUrl)
+        showSuccessImage(imageUrl)
+    }
+}
+
 function monitorPage(controller) {
     saveSuccessText(controller)
 }

diff --git a/test/js/config/adminViewTest.js b/test/js/config/adminViewTest.js
@@ -129,27 +129,19 @@ describe('view logic', function () {
                    '<img id="success-image" src="" class="hidden"/>')
             })
 
-            it('saves', function () {
-                spyOn(window.location, 'replace')
-                view.init()
-                $('#success-image-url').val('expected-image-url')
-                spyOn(adminController, 'saveSuccessImageUrl')
-
-                $('#save-success-image').click()
-
-                expect(adminController.saveSuccessImageUrl).toHaveBeenCalledWith('expected-image-url')
-            })
-
             it('loads', function () {
                 localStorage.setItem('successImageUrl', 'any old value')
                 var successImageUrl = $('#success-image-url')
 
                 view.init()
 
+                var imageSrc = $('#success-image').attr('src');
                 expect(successImageUrl.val()).toBe('any old value')
+                expect(imageSrc).toBe('any old value')
+                expect($('#success-image')).not.toHaveClass('hidden')
             })
 
-            it('shows image on the page', function () {
+            it('saves and shows image on the page', function () {
                 spyOn(window.location, 'replace')
                 view.init()
                 $('#success-image-url').val('expected-image-url')
@@ -160,6 +152,7 @@ describe('view logic', function () {
                 var imageSrc = $('#success-image').attr('src');
                 expect(imageSrc).toBe('expected-image-url')
                 expect($('#success-image')).not.toHaveClass('hidden')
+                expect(adminController.saveSuccessImageUrl).toHaveBeenCalledWith('expected-image-url')
             })
         })
     })