fixed circular dependency

Author: corevo

packages/selianize/__tests__/utils.spec.js

@@ -0,0 +1,63 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import { convertToSnake } from "../src/utils";
+
+describe("convert test names to snake_case", () => {
+  it("should convert spaces to _", () => {
+    expect(convertToSnake(" ")).toBe("_");
+  });
+  it("should convert arithmetic signs to _", () => {
+    expect(convertToSnake("+")).toBe("_");
+    expect(convertToSnake("-")).toBe("_");
+    expect(convertToSnake("/")).toBe("_");
+    expect(convertToSnake("*")).toBe("_");
+    expect(convertToSnake("%")).toBe("_");
+  });
+  it("should convert boolean signs to _", () => {
+    expect(convertToSnake("!")).toBe("_");
+    expect(convertToSnake("=")).toBe("_");
+    expect(convertToSnake("&")).toBe("_");
+    expect(convertToSnake("|")).toBe("_");
+    expect(convertToSnake(">")).toBe("_");
+    expect(convertToSnake("<")).toBe("_");
+    expect(convertToSnake("?")).toBe("_");
+  });
+  it("should convert other illegal entities to _", () => {
+    expect(convertToSnake("\\")).toBe("_");
+    expect(convertToSnake("@")).toBe("_");
+    expect(convertToSnake("#")).toBe("_");
+    expect(convertToSnake("^")).toBe("_");
+    expect(convertToSnake(";")).toBe("_");
+    expect(convertToSnake(":")).toBe("_");
+    expect(convertToSnake(".")).toBe("_");
+    expect(convertToSnake(",")).toBe("_");
+  });
+  it("should convert all braces signs to _", () => {
+    expect(convertToSnake("(")).toBe("_");
+    expect(convertToSnake(")")).toBe("_");
+    expect(convertToSnake("[")).toBe("_");
+    expect(convertToSnake("]")).toBe("_");
+    expect(convertToSnake("{")).toBe("_");
+    expect(convertToSnake("}")).toBe("_");
+  });
+  it("should convert all string literals", () => {
+    expect(convertToSnake("'")).toBe("_");
+    expect(convertToSnake("\"")).toBe("_");
+    expect(convertToSnake("`")).toBe("_");
+  });
+});

packages/selianize/src/command.js

@@ -17,7 +17,7 @@
 
 import LocationEmitter from "./location";
 import SelectionEmitter from "./selection";
-import { convertToSnake } from "./testcase";
+import { convertToSnake } from "./utils";
 
 const emitters = {
   open: emitOpen,

packages/selianize/src/testcase.js

@@ -17,21 +17,23 @@
 
 import CommandEmitter from "./command";
 import config from "./config";
+import { convertToSnake } from "./utils";
 
 const hooks = [];
 
 export function emit(test, options = config) {
   return new Promise(async (res, rej) => { // eslint-disable-line no-unused-vars
     const hookResults = await Promise.all(hooks.map((hook) => hook(test)));
+    const testName = convertToSnake(test.name);
 
     let emittedTest = `it("${test.name}", async () => {`;
     emittedTest += hookResults.map((hook) => hook.setup || "").join("");
-    emittedTest += `await tests.${convertToSnake(test.name)}(driver, vars);`;
+    emittedTest += `await tests.${testName}(driver, vars);`;
     emittedTest += "await driver.getTitle().then(title => {expect(title).toBeDefined();});";
     emittedTest += hookResults.map((hook) => hook.teardown || "").join("");
     emittedTest += "});";
 
-    let func = `tests.${convertToSnake(test.name)} = async function ${convertToSnake(test.name)}(driver, vars) {`;
+    let func = `tests.${testName} = async function ${testName}(driver, vars) {`;
     let errors = [];
     func += (await Promise.all(test.commands.map((command, index) => (CommandEmitter.emit(command).catch(e => {
       if (options.silenceErrors) {
@@ -51,10 +53,6 @@ export function emit(test, options = config) {
   });
 }
 
-export function convertToSnake(string) {
-  return string.replace(/(\s|-)/g, "_");
-}
-
 function registerHook(hook) {
   hooks.push(hook);
 }

packages/selianize/src/utils.js

@@ -0,0 +1,20 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+export function convertToSnake(string) {
+  return string.replace(/(\s|\+|-|\*|\/|\\|%|!|\||&|=|\?|>|<|\(|\)|\[|\]|{|}|@|#|\^|:|;|'|"|`|\.|,)/g, "_");
+}