Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 01:05:15 +03:00
Code Issues Wiki Activity

Fix cli cleanup exit command after auto completing

Browse source
This commit is contained in:
Adem Gaygusuz 2018-06-02 13:14:56 +01:00
parent 2e5bdae80e
commit 6fd0153b91
2 changed files with 63 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

37
test/tabs/cli.js
View file

@ -35,14 +35,17 @@ describe('TABS.cli', () => {
});
it('ambiguous auto-complete results', () => {
TABS.cli.cliBuffer = 'se';
TABS.cli.read({
data: toArrayBuffer('\r\033[Kserialpassthrough\tservo\r\n# ser')
});
// Ambigous auto-complete from firmware is preceded with an \r carriage return
// which only renders a line break on Mac
const expectedValue = GUI.operating_system === "MacOS" ?
'<br>serialpassthrough\tservo<br>' :
'serialpassthrough\tservo<br>';
'se<br>serialpassthrough\tservo<br>' :
'seserialpassthrough\tservo<br>';
expect(cliOutput.html()).to.equal(expectedValue);
expect(cliPrompt.val()).to.equal('ser');
});
@ -91,6 +94,8 @@ describe('TABS.cli', () => {
input.trigger(event);
}
const backspaceCode = String.fromCharCode(127);
describe('input', () => {
const content = $('<div>').attr('id', 'content');
const cliTab = $('<div>').addClass('tab-cli');
@ -181,10 +186,8 @@ describe('TABS.cli', () => {
triggerTabKey(cliPrompt);
const backspace = String.fromCharCode(127);
expect(TABS.cli.send).to.have.been.calledOnce;
expect(TABS.cli.send).to.have.been.calledWith(backspace.repeat(3) + '\t');
expect(TABS.cli.send).to.have.been.calledWith(backspaceCode.repeat(3) + '\t');
done();
});
});
@ -225,15 +228,13 @@ describe('TABS.cli', () => {
triggerEnterKey(cliPrompt);
const backspace = String.fromCharCode(127);
expect(TABS.cli.send).to.have.been.calledOnce;
expect(TABS.cli.send).to.have.been.calledWith(backspace.repeat(3) + '\n');
expect(TABS.cli.send).to.have.been.calledWith(backspaceCode.repeat(3) + '\n');
done();
});
});
it('cliBufer is cleared on startup', done => {
it('cliBuffer is cleared on startup', done => {
TABS.cli.cliBuffer = '# serial';
TABS.cli.initialize(() => {
@ -241,5 +242,23 @@ describe('TABS.cli', () => {
done();
});
});
it('exit upon cleanup clears cliBuffer first', done => {
CONFIGURATOR.connectionValid = true;
TABS.cli.cliValid = true;
TABS.cli.initialize(() => {
const commandInBuffer = 'resource';
TABS.cli.cliBuffer = `# ${commandInBuffer}`;
TABS.cli.cleanup();
expect(TABS.cli.send).to.have.been.calledOnce;
expect(TABS.cli.send).to.have.been.calledWith(backspaceCode.repeat(commandInBuffer.length) + 'exit\r');
done();
});
});
});
});