Make expand entries in compact view after jumping to next/previous feed optional with a setting

2 files changed, 19 insertions, 5 deletions

diff --git a/js/tests/unit/controller/ContentControllerSpec.js b/js/tests/unit/controller/ContentControllerSpec.js
index d6bedb8a1..25314e561 100644
--- a/js/tests/unit/controller/ContentControllerSpec.js
+++ b/js/tests/unit/controller/ContentControllerSpec.js
@@ -213,6 +213,19 @@ describe('ContentController', function () {
     }));
 
 
+    it('should publish compact expand setting', inject(function ($controller,
+    SettingsResource) {
+
+        SettingsResource.set('compactExpand', true);
+
+        var ctrl = $controller('ContentController', {
+            SettingsResource: SettingsResource,
+            data: {},
+        });
+
+        expect(ctrl.isCompactExpand()).toBe(true);
+    }));
+
     it('should publish markread', inject(function ($controller,
     SettingsResource) {
 
diff --git a/js/tests/unit/service/SettingsResourceSpec.js b/js/tests/unit/service/SettingsResourceSpec.js
index c6009a3f4..56179b571 100644
--- a/js/tests/unit/service/SettingsResourceSpec.js
+++ b/js/tests/unit/service/SettingsResourceSpec.js
@@ -38,11 +38,12 @@ describe('SettingsResource', function () {
 
     it('should set values', inject(function (SettingsResource) {
         http.expectPUT('base/settings',  {
-            'language':'en',
-            'showAll':true,
-            'compact':false,
-            'oldestFirst':null,
-            'preventReadOnScroll':false
+            'language': 'en',
+            'showAll': true,
+            'compact': false,
+            'oldestFirst': null,
+            'compactExpand': false,
+            'preventReadOnScroll': false
         }).respond(200, {});
 
         SettingsResource.set('showAll', true);