Merge remote-tracking branch 'origin/master' into background-adjacent-tabs

2 files changed, 221 insertions, 0 deletions

diff --git a/test/shared/settings/validator.test.js b/test/shared/settings/validator.test.js
new file mode 100644
index 0000000..61d976a
--- /dev/null
+++ b/test/shared/settings/validator.test.js
@@ -0,0 +1,82 @@
+import { expect } from "chai";
+import { validate } from 'shared/settings/validator';
+
+describe("setting validator", () => {
+  describe("unknown top keys", () => {
+    it('throws an error for unknown settings', () => {
+      let settings = { keymaps: {}, poison: 123 };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'poison');
+    })
+  });
+
+  describe("keymaps settings", () => {
+    it('throws an error for unknown operation', () => {
+      let settings = {
+        keymaps: {
+          a: { 'type': 'scroll.home' },
+          b: { 'type': 'poison.dressing' },
+        }
+      };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'poison.dressing');
+    });
+  });
+
+  describe("search settings", () => {
+    it('throws an error for invalid search engine name', () => {
+      let settings = {
+        search: {
+          default: 'google',
+          engines: {
+            'google': 'https://google.com/search?q={}',
+            'cherry pie': 'https://cherypie.com/search?q={}',
+          }
+        }
+      };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'cherry pie');
+    });
+
+    it('throws an error for no {}-placeholder', () => {
+      let settings = {
+        search: {
+          default: 'google',
+          engines: {
+            'google': 'https://google.com/search?q={}',
+            'yahoo': 'https://search.yahoo.com/search',
+          }
+        }
+      };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'yahoo');
+    });
+
+    it('throws an error for no default engines', () => {
+      let settings = {
+        search: {
+          engines: {
+            'google': 'https://google.com/search?q={}',
+            'yahoo': 'https://search.yahoo.com/search?q={}',
+          }
+        }
+      };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'Default engine');
+    });
+
+    it('throws an error for invalid default engine', () => {
+      let settings = {
+        search: {
+          default: 'twitter',
+          engines: {
+            'google': 'https://google.com/search?q={}',
+            'yahoo': 'https://search.yahoo.com/search?q={}',
+          }
+        }
+      };
+      let fn = validate.bind(undefined, settings)
+      expect(fn).to.throw(Error, 'twitter');
+    });
+  });
+});
diff --git a/test/shared/settings/values.test.js b/test/shared/settings/values.test.js
new file mode 100644
index 0000000..62cfb5f
--- /dev/null
+++ b/test/shared/settings/values.test.js
@@ -0,0 +1,139 @@
+import { expect } from 'chai';
+import * as values from 'shared/settings/values';
+
+describe("settings values", () => {
+  describe('valueFromJson', () => {
+    it('return object from json string', () => {
+      let json = `{
+        "keymaps": { "0": {"type": "scroll.home"}},
+        "search": { "default": "google", "engines": { "google": "https://google.com/search?q={}" }},
+        "blacklist": [ "*.slack.com"],
+        "properties": {
+          "mystr": "value",
+          "mynum": 123,
+          "mybool": true
+        }
+      }`;
+      let value = values.valueFromJson(json);
+
+      expect(value.keymaps).to.deep.equal({ 0: {type: "scroll.home"}});
+      expect(value.search).to.deep.equal({ default: "google", engines: { google: "https://google.com/search?q={}"} });
+      expect(value.blacklist).to.deep.equal(["*.slack.com"]);
+      expect(value.properties).to.have.property('mystr', 'value');
+      expect(value.properties).to.have.property('mynum', 123);
+      expect(value.properties).to.have.property('mybool', true);
+    });
+  });
+
+  describe('valueFromForm', () => {
+    it('returns value from form', () => {
+      let form = {
+        keymaps: {
+          'scroll.vertically?{"count":1}': 'j',
+          'scroll.home': '0',
+        },
+        search: {
+          default: 'google',
+          engines: [['google', 'https://google.com/search?q={}']],
+        },
+        blacklist: ['*.slack.com'],
+        "properties": {
+          "mystr": "value",
+          "mynum": 123,
+          "mybool": true,
+        }
+      };
+      let value = values.valueFromForm(form);
+
+      expect(value.keymaps).to.have.deep.property('j', { type: "scroll.vertically", count: 1 });
+      expect(value.keymaps).to.have.deep.property('0', { type: "scroll.home" });
+      expect(JSON.stringify(value.search)).to.deep.equal(JSON.stringify({ default: "google", engines: { google: "https://google.com/search?q={}"} }));
+      expect(value.search).to.deep.equal({ default: "google", engines: { google: "https://google.com/search?q={}"} });
+      expect(value.blacklist).to.deep.equal(["*.slack.com"]);
+      expect(value.properties).to.have.property('mystr', 'value');
+      expect(value.properties).to.have.property('mynum', 123);
+      expect(value.properties).to.have.property('mybool', true);
+    });
+
+    it('convert from empty form', () => {
+      let form = {};
+      let value = values.valueFromForm(form);
+      expect(value).to.not.have.key('keymaps');
+      expect(value).to.not.have.key('search');
+      expect(value).to.not.have.key('blacklist');
+      expect(value).to.not.have.key('properties');
+    });
+
+    it('override keymaps', () => {
+      let form = {
+        keymaps: {
+          'scroll.vertically?{"count":1}': 'j',
+          'scroll.vertically?{"count":-1}': 'j',
+        }
+      };
+      let value = values.valueFromForm(form);
+
+      expect(value.keymaps).to.have.key('j');
+    });
+
+    it('override search engine', () => {
+      let form = {
+        search: {
+          default: 'google',
+          engines: [
+            ['google', 'https://google.com/search?q={}'],
+            ['google', 'https://google.co.jp/search?q={}'],
+          ]
+        }
+      };
+      let value = values.valueFromForm(form);
+
+      expect(value.search.engines).to.have.property('google', 'https://google.co.jp/search?q={}');
+    });
+  });
+
+  describe('jsonFromValue', () => {
+  });
+
+  describe('formFromValue', () => {
+    it('convert empty value to form', () => {
+      let value = {};
+      let form = values.formFromValue(value);
+
+      expect(value).to.not.have.key('keymaps');
+      expect(value).to.not.have.key('search');
+      expect(value).to.not.have.key('blacklist');
+    });
+
+    it('convert value to form', () => {
+      let value = {
+        keymaps: {
+          j: { type: 'scroll.vertically', count: 1 },
+          JJ: { type: 'scroll.vertically', count: 100 },
+          0: { type: 'scroll.home' },
+        },
+        search: { default: 'google', engines: { google: 'https://google.com/search?q={}' }},
+        blacklist: [ '*.slack.com'],
+        properties: {
+          "mystr": "value",
+          "mynum": 123,
+          "mybool": true,
+        }
+      };
+      let allowed = ['scroll.vertically?{"count":1}', 'scroll.home' ];
+      let form = values.formFromValue(value, allowed);
+
+      expect(form.keymaps).to.have.property('scroll.vertically?{"count":1}', 'j');
+      expect(form.keymaps).to.not.have.property('scroll.vertically?{"count":100}');
+      expect(form.keymaps).to.have.property('scroll.home', '0');
+      expect(Object.keys(form.keymaps)).to.have.lengthOf(2);
+      expect(form.search).to.have.property('default', 'google');
+      expect(form.search).to.have.deep.property('engines', [['google', 'https://google.com/search?q={}']]);
+      expect(form.blacklist).to.have.lengthOf(1);
+      expect(form.blacklist).to.include('*.slack.com');
+      expect(form.properties).to.have.property('mystr', 'value');
+      expect(form.properties).to.have.property('mynum', 123);
+      expect(form.properties).to.have.property('mybool', true);
+    });
+  });
+});