Fix color scheme when legacy 'system' option is stored

Author: msmolens

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [1.4.1] - 2022-06-20
+### Fixed
+- Fix color scheme when legacy 'system' option is stored.
+
 ## [1.4.0] - 2022-06-19
 ### Changed
 - Update Svelte Material UI to 6.0.0-beta.16.
@@ -58,7 +62,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Initial release.
 
-[Unreleased]: https://github.com/msmolens/treetop/compare/v1.4.0...HEAD
+[Unreleased]: https://github.com/msmolens/treetop/compare/v1.4.1...HEAD
+[1.4.1]: https://github.com/msmolens/treetop/compare/v1.4.1...HEAD
 [1.4.0]: https://github.com/msmolens/treetop/releases/tag/v1.4.0
 [1.3.0]: https://github.com/msmolens/treetop/releases/tag/v1.3.0
 [1.2.0]: https://github.com/msmolens/treetop/releases/tag/v1.2.0

src/background_script/options.ts

@@ -1,3 +1,4 @@
+import get from 'lodash-es/get';
 import browser from 'webextension-polyfill';
 
 import type * as Treetop from '@Treetop/treetop/types';
@@ -12,6 +13,11 @@ export const setDefaultOptions = async (
     // Get stored options
     const storedOptions = await browser.storage.local.get();
 
+    // Remove values that are no longer supported from stored options
+    if (get(storedOptions, 'colorScheme') === 'system') {
+      delete storedOptions.colorScheme;
+    }
+
     // Merge stored options into default options
     const updatedOptions = {
       ...defaultOptions,

src/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Treetop",
   "description": "__MSG_extensionDescription__",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "author": "Max Smolens",
   "homepage_url": "https://github.com/msmolens/treetop",
   "default_locale": "en",

test/background_script/options.test.ts

@@ -77,3 +77,41 @@ it('sets default options and leaves existing options unchanged', async () => {
 
   await setDefaultOptions(defaultOptions);
 });
+
+describe('colorScheme option', () => {
+  beforeEach(() => {
+    defaultOptions = {
+      colorScheme: 'light',
+    };
+  });
+
+  it("overwrites legacy 'system' colorScheme option", async () => {
+    const storedOptions = {
+      colorScheme: 'system',
+    };
+
+    const updatedOptions = {
+      ...defaultOptions,
+    };
+
+    mockBrowser.storage.local.get.expect.andResolve(storedOptions);
+    mockBrowser.storage.local.set.expect(updatedOptions);
+
+    await setDefaultOptions(defaultOptions);
+  });
+
+  it("doesn't overwrite non-legacy colorScheme option", async () => {
+    const storedOptions = {
+      colorScheme: 'dark',
+    };
+
+    const updatedOptions = {
+      ...storedOptions,
+    };
+
+    mockBrowser.storage.local.get.expect.andResolve(storedOptions);
+    mockBrowser.storage.local.set.expect(updatedOptions);
+
+    await setDefaultOptions(defaultOptions);
+  });
+});