Merge pull request #342 from smalruby/fix-escape-keycode

Fix escape keycode

Author: takaokouji

package-lock.json

@@ -331,7 +331,8 @@ RubyGenerator.scrubNakedValue = function (line) {
 };
 
 RubyGenerator.escapeChars_ = {
-    '"': '\\"'
+    '"': '\\"',
+    '\\': '\\\\'
 };
 
 RubyGenerator.quote_ = function (string) {

src/lib/ruby-generator/index.js

@@ -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;
 
@@ -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`);
+    });
 });

test/integration/ruby-tab/operators.test.js

@@ -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);
         });
     });