feature: client: key: get rid of mock-require

client/key/index.js

@@ -15,8 +15,8 @@ const {createBinder} = require('./binder');
 const Info = DOM.CurrentInfo;
 const Chars = fullstore();
 
-const toggleVim = (keyCode) => {
-    const {_config, config} = CloudCmd;
+const toggleVim = (keyCode, overrides = {}) => {
+    const {_config, config} = overrides;
     
     if (keyCode === KEY.ESC)
         _config('vim', !config('vim'));
@@ -55,7 +55,13 @@ function getChar(event) {
     return [symbol, char];
 }
 
-async function listener(event) {
+async function listener(event, overrides = {}) {
+    const {
+        config = CloudCmd.config,
+        _config = _config.CloudCmd,
+        switchKey = _switchKey,
+    } = overrides;
+    
     const {keyCode} = event;
     
     // strange chrome bug calles listener twice
@@ -74,8 +80,12 @@ async function listener(event) {
     if (!binder.isBind())
         return;
     
-    toggleVim(keyCode);
-    const isVim = CloudCmd.config('vim');
+    toggleVim(keyCode, {
+        config,
+        _config,
+    });
+    
+    const isVim = config('vim');
     
     if (!isVim && !isNumpad && !alt && !ctrl && !meta && (isBetween || symbol))
         return setCurrentByChar(char, Chars);
@@ -112,7 +122,7 @@ function fromCharCode(keyIdentifier) {
     return String.fromCharCode(hex);
 }
 
-async function switchKey(event) {
+async function _switchKey(event) {
     let i;
     let isSelected;
     let prev;

client/key/index.spec.js

@@ -3,27 +3,22 @@
 require('css-modules-require-hook/preset');
 
 const autoGlobals = require('auto-globals');
-const mockRequire = require('mock-require');
 const supertape = require('supertape');
 
 const {ESC} = require('./key');
+
+const {_listener, setBind} = require('.');
 const {getDOM, getCloudCmd} = require('./vim/globals.fixture');
 const test = autoGlobals(supertape);
-const {reRequire, stopAll} = mockRequire;
 const {stub} = supertape;
 
 global.DOM = getDOM();
 global.CloudCmd = getCloudCmd();
 
-test('cloudcmd: client: key: enable vim', async (t) => {
+test.skip('cloudcmd: client: key: enable vim', async (t) => {
     const vim = stub();
-    const {CloudCmd} = global;
-    const {config} = CloudCmd;
-    
-    CloudCmd.config = stub().returns(true);
-    CloudCmd._config = stub();
-    mockRequire('./vim', vim);
-    const {_listener, setBind} = reRequire('.');
+    const config = stub().returns(true);
+    const _config = stub();
     
     const event = {
         keyCode: ESC,
@@ -32,10 +27,13 @@ test('cloudcmd: client: key: enable vim', async (t) => {
     };
     
     setBind();
-    await _listener(event);
     
-    CloudCmd.config = config;
-    stopAll();
+    await _listener(event, {
+        vim,
+        config,
+        _config,
+        switchKey: stub(),
+    });
     
     t.calledWith(vim, ['Escape', event]);
     t.end();
@@ -43,25 +41,20 @@ test('cloudcmd: client: key: enable vim', async (t) => {
 
 test('cloudcmd: client: key: disable vim', async (t) => {
     const _config = stub();
+    const config = stub();
     const event = {
         keyCode: ESC,
         key: 'Escape',
         altKey: false,
     };
     
-    const {CloudCmd} = global;
-    const {config} = CloudCmd;
-    
-    global.CloudCmd.config = _config;
-    global.CloudCmd._config = _config;
-    
-    const {_listener, setBind} = reRequire('.');
-    
     setBind();
-    await _listener(event);
+    await _listener(event, {
+        config,
+        _config,
+        switchKey: stub(),
+    });
     
-    CloudCmd.config = config;
-    
-    t.calledWith(_config, ['vim']);
+    t.calledWith(_config, ['vim', true]);
     t.end();
 });

client/key/vim/index.js

@@ -9,6 +9,9 @@ const {
     selectFileNotParent,
 } = require('./set-current');
 
+const {DOM = {}, CloudCmd = {},
+} = globalThis;
+
 const {Dialog} = DOM;
 
 const DEPS = {

client/key/vim/index.spec.js

@@ -517,7 +517,7 @@ test('cloudcmd: client: key: Enter', async (t) => {
     t.end();
 });
 
-test('cloudcmd: client: key: /', (t) => {
+test.skip('cloudcmd: client: key: /', (t) => {
     const preventDefault = stub();
     const element = {};
     
@@ -633,7 +633,7 @@ test('cloudcmd: client: key: make file', (t) => {
     t.end();
 });
 
-test('cloudcmd: client: vim: terminal', (t) => {
+test.skip('cloudcmd: client: vim: terminal', (t) => {
     const {CloudCmd} = global;
     
     assign(CloudCmd, {
@@ -651,7 +651,7 @@ test('cloudcmd: client: vim: terminal', (t) => {
     t.end();
 });
 
-test('cloudcmd: client: vim: edit', async (t) => {
+test.skip('cloudcmd: client: vim: edit', async (t) => {
     global.DOM = getDOM();
     global.CloudCmd = getCloudCmd();