Merge branch 'ph/fixTreeListShowingIncorrectly' into 'master'

Fixes diffs tree list showing incorrectly

See merge request gitlab-org/gitlab!48775

app/assets/javascripts/diffs/components/app.vue

@@ -429,7 +429,7 @@ export default {
       let showTreeList = true;
 
       if (storedTreeShow !== null) {
-        showTreeList = Boolean(storedTreeShow);
+        showTreeList = parseBoolean(storedTreeShow);
       } else if (!bp.isDesktop() || (!this.isBatchLoading && this.diffFiles.length <= 1)) {
         showTreeList = false;
       }

spec/frontend/diffs/components/app_spec.js

@@ -678,8 +678,12 @@ describe('diffs/components/app', () => {
       expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList: true, saving: false });
     });
 
-    it('calls setShowTreeList with localstorage value', () => {
-      localStorage.setItem('mr_tree_show', 'true');
+    it.each`
+      showTreeList
+      ${true}
+      ${false}
+    `('calls setShowTreeList with localstorage $showTreeList', ({ showTreeList }) => {
+      localStorage.setItem('mr_tree_show', showTreeList);
 
       createComponent({}, ({ state }) => {
         state.diffs.diffFiles.push({ sha: '123' });
@@ -691,7 +695,7 @@ describe('diffs/components/app', () => {
 
       wrapper.vm.setTreeDisplay();
 
-      expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList: true, saving: false });
+      expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList, saving: false });
     });
   });