Move Key to settings

4 files changed, 54 insertions, 54 deletions

diff --git a/test/content/InputDriver.test.ts b/test/content/InputDriver.test.ts
index b39312c..441d107 100644
--- a/test/content/InputDriver.test.ts
+++ b/test/content/InputDriver.test.ts
@@ -1,6 +1,6 @@
-import InputDriver from '../../src/content/InputDriver';
+import InputDriver, {keyFromKeyboardEvent} from '../../src/content/InputDriver';
 import { expect } from 'chai';
-import Key from '../../src/content/domains/Key';
+import Key from '../../src/shared/settings/Key';
 
 describe('InputDriver', () => {
   let target: HTMLElement;
@@ -127,3 +127,50 @@ describe('InputDriver', () => {
     div.dispatchEvent(new KeyboardEvent('keydown', { key: 'x' }));
   });
 });
+
+describe("#keyFromKeyboardEvent", () => {
+  it('returns from keyboard input Ctrl+X', () => {
+    let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+      key: 'x', shiftKey: false, ctrlKey: true, altKey: false, metaKey: true,
+    }));
+    expect(k.key).to.equal('x');
+    expect(k.shift).to.be.false;
+    expect(k.ctrl).to.be.true;
+    expect(k.alt).to.be.false;
+    expect(k.meta).to.be.true;
+  });
+
+  it('returns from keyboard input Shift+Esc', () => {
+    let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+      key: 'Escape', shiftKey: true, ctrlKey: false, altKey: false, metaKey: true
+    }));
+    expect(k.key).to.equal('Esc');
+    expect(k.shift).to.be.true;
+    expect(k.ctrl).to.be.false;
+    expect(k.alt).to.be.false;
+    expect(k.meta).to.be.true;
+  });
+
+  it('returns from keyboard input Ctrl+$', () => {
+    // $ required shift pressing on most keyboards
+    let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+      key: '$', shiftKey: true, ctrlKey: true, altKey: false, metaKey: false
+    }));
+    expect(k.key).to.equal('$');
+    expect(k.shift).to.be.false;
+    expect(k.ctrl).to.be.true;
+    expect(k.alt).to.be.false;
+    expect(k.meta).to.be.false;
+  });
+
+  it('returns from keyboard input Crtl+Space', () => {
+    let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+      key: ' ', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false
+    }));
+    expect(k.key).to.equal('Space');
+    expect(k.shift).to.be.false;
+    expect(k.ctrl).to.be.true;
+    expect(k.alt).to.be.false;
+    expect(k.meta).to.be.false;
+  });
+});
diff --git a/test/content/repositories/KeymapRepository.test.ts b/test/content/repositories/KeymapRepository.test.ts
index da5624e..df013df 100644
--- a/test/content/repositories/KeymapRepository.test.ts
+++ b/test/content/repositories/KeymapRepository.test.ts
@@ -1,7 +1,7 @@
 import KeymapRepository, { KeymapRepositoryImpl }
   from '../../../src/content/repositories/KeymapRepository';
-import Key from '../../../src/content/domains/Key'
 import { expect } from 'chai';
+import Key from "../../../src/shared/settings/Key";
 
 describe('KeymapRepositoryImpl', () => {
   let sut: KeymapRepository;
diff --git a/test/content/domains/Key.test.ts b/test/shared/settings/Key.test.ts
index 8e62f80..8222d5a 100644
--- a/test/content/domains/Key.test.ts
+++ b/test/shared/settings/Key.test.ts
@@ -1,54 +1,7 @@
-import Key from '../../../src/content/domains/Key';
 import { expect } from 'chai'
+import Key from '../../../src/shared/settings/Key';
 
 describe("Key", () => {
-  describe('fromKeyboardEvent', () => {
-    it('returns from keyboard input Ctrl+X', () => {
-      let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
-        key: 'x', shiftKey: false, ctrlKey: true, altKey: false, metaKey: true,
-      }));
-      expect(k.key).to.equal('x');
-      expect(k.shift).to.be.false;
-      expect(k.ctrl).to.be.true;
-      expect(k.alt).to.be.false;
-      expect(k.meta).to.be.true;
-    });
-
-    it('returns from keyboard input Shift+Esc', () => {
-      let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
-        key: 'Escape', shiftKey: true, ctrlKey: false, altKey: false, metaKey: true
-      }));
-      expect(k.key).to.equal('Esc');
-      expect(k.shift).to.be.true;
-      expect(k.ctrl).to.be.false;
-      expect(k.alt).to.be.false;
-      expect(k.meta).to.be.true;
-    });
-
-    it('returns from keyboard input Ctrl+$', () => {
-      // $ required shift pressing on most keyboards
-      let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
-        key: '$', shiftKey: true, ctrlKey: true, altKey: false, metaKey: false
-      }));
-      expect(k.key).to.equal('$');
-      expect(k.shift).to.be.false;
-      expect(k.ctrl).to.be.true;
-      expect(k.alt).to.be.false;
-      expect(k.meta).to.be.false;
-    });
-
-    it('returns from keyboard input Crtl+Space', () => {
-      let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
-        key: ' ', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false
-      }));
-      expect(k.key).to.equal('Space');
-      expect(k.shift).to.be.false;
-      expect(k.ctrl).to.be.true;
-      expect(k.alt).to.be.false;
-      expect(k.meta).to.be.false;
-    });
-  });
-
   describe('fromMapKey', () => {
     it('return for X', () => {
       let key = Key.fromMapKey('x');
@@ -125,7 +78,7 @@ describe("Key", () => {
 
   describe('equals', () => {
     expect(new Key({
-        key: 'x', shift: false, ctrl: true, alt: false, meta: false,
+      key: 'x', shift: false, ctrl: true, alt: false, meta: false,
     }).equals(new Key({
       key: 'x', shift: false, ctrl: true, alt: false, meta: false,
     }))).to.be.true;
diff --git a/test/content/domains/KeySequence.test.ts b/test/shared/settings/KeySequence.test.ts
index 62af165..361cbd1 100644
--- a/test/content/domains/KeySequence.test.ts
+++ b/test/shared/settings/KeySequence.test.ts
@@ -1,6 +1,6 @@
-import KeySequence from '../../../src/content/domains/KeySequence';
-import Key from '../../../src/content/domains/Key';
+import KeySequence from '../../../src/shared/settings/KeySequence';
 import { expect } from 'chai'
+import Key from "../../../src/shared/settings/Key";
 
 describe("KeySequence", () => {
   describe('#push', () => {