Skip to content

Fix escape keycode #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Fix escape keycode #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfa559f
chore: bump up version
takaokouji Oct 18, 2023
50d35e8
fix: escape backslash
takaokouji Oct 19, 2023
ad2c735
test: fix quote_
takaokouji Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/lib/ruby-generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ RubyGenerator.scrubNakedValue = function (line) {
};

RubyGenerator.escapeChars_ = {
'"': '\\"'
'"': '\\"',
'\\': '\\\\'
};

RubyGenerator.quote_ = function (string) {
Expand Down
29 changes: 29 additions & 0 deletions test/integration/ruby-tab/operators.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import dedent from 'dedent';
import SeleniumHelper from '../../helpers/selenium-helper';
import RubyHelper from '../../helpers/ruby-helper';
import {EDIT_MENU_XPATH} from '../../helpers/menu-xpaths';

const seleniumHelper = new SeleniumHelper();
const {
clickText,
clickXpath,
getDriver,
loadUri,
urlFor
} = seleniumHelper;

const rubyHelper = new RubyHelper(seleniumHelper);
const {
fillInRubyProgram,
currentRubyProgram,
expectInterconvertBetweenCodeAndRuby
} = rubyHelper;

Expand Down Expand Up @@ -93,4 +98,28 @@ describe('Ruby Tab: Operators category blocks', () => {
`;
await expectInterconvertBetweenCodeAndRuby(code);
});

test('Ruby -> Code -> Ruby (escape characters) ', async () => {
await loadUri(urlFor('/'));

const beforeRuby = dedent`
"\\\\" + "\\\\"

"\\n" + "\\n"
`;

const afterRuby = dedent`
"\\" + "\\"

"\n" + "\n"
`;

await clickText('Ruby', '*[@role="tab"]');
await fillInRubyProgram(beforeRuby);
await clickText('Code', '*[@role="tab"]');
await clickXpath(EDIT_MENU_XPATH);
await clickText('Generate Ruby from Code');
await clickText('Ruby', '*[@role="tab"]');
expect(await currentRubyProgram()).toEqual(`${afterRuby}\n`);
});
});
2 changes: 1 addition & 1 deletion test/unit/lib/ruby-generator.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('RubyGenerator', () => {
describe('quote_', () => {
test('escape only " to \\"', () => {
const arg = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'; // eslint-disable-line
const expected = '"!\\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"'; // eslint-disable-line
const expected = '"!\\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"'; // eslint-disable-line
expect(RubyGenerator.quote_(arg)).toEqual(expected);
});
});
Expand Down