Merge lp:~stephen-stewart/snapweb/json-responses into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

Fix up js for now more correct content type from server.

see ~chipaca/webdm/json-responses

[John Lenton (chipaca)]

review: Approve

=== modified file 'www/src/js/views/snap-layout.js'
--- www/src/js/views/snap-layout.js	2015-05-05 15:06:52 +0000
+++ www/src/js/views/snap-layout.js	2015-05-06 09:50:00 +0000
@@ -134,15 +134,11 @@
       this.model.set({
         status: CONF.INSTALL_STATE.UNINSTALLING
       });
-      this.model.destroy({
-        dataType : 'html'
-      });
+      this.model.destroy();
     } else if (status === CONF.INSTALL_STATE.UNINSTALLED) {
       // install
       this.model.save({
         status: CONF.INSTALL_STATE.INSTALLING
-      }, {
-        dataType : 'html'
       });
     } else {
       e.preventDefault();

=== modified file 'www/tests/modelSpec.js'
--- www/tests/modelSpec.js	2015-04-30 14:12:30 +0000
+++ www/tests/modelSpec.js	2015-05-06 09:50:00 +0000
@@ -94,15 +94,14 @@
       });
       model.save({
         status: 'installing'
-      }, {
-        dataType: 'html'
       });
       expect(model.save).toHaveBeenCalled();
       expect(model.fetch).not.toHaveBeenCalled();
 
       jasmine.Ajax.requests.mostRecent().respondWith({
         'status': 202,
-        'contentType': 'plain/text'
+        'contentType': 'application/json',
+        'responseText': '{}'
       });
     });
 
@@ -116,15 +115,14 @@
       });
       model.save({
         status: 'installing'
-      }, {
-        dataType: 'html'
       });
       expect(model.save).toHaveBeenCalled();
       expect(model.fetch).not.toHaveBeenCalled();
 
       jasmine.Ajax.requests.mostRecent().respondWith({
         'status': 200,
-        'contentType': 'plain/text'
+        'contentType': 'application/json',
+        'responseText': '{}'
       });
     });
   });