Merge branch master into callstack

corevo · corevo · commit 31e8df7028dc · 2018-07-10T16:40:43.000+03:00
diff --git a/packages/selenium-ide/src/neo/IO/legacy/migrate.js b/packages/selenium-ide/src/neo/IO/legacy/migrate.js
@@ -118,9 +118,11 @@ export function migrateTestCase(data) {
   const sanitized = sanitizeXml(data);
   const result = JSON.parse(convert.xml2json(sanitized, { compact: true }));
   const baseUrl = result.html.head.link._attributes.href;
+  let tr = result.html.body.table.tbody.tr;
+  tr = Array.isArray(tr) ? tr : [tr];
   const test = {
     name: result.html.body.table.thead.tr.td._text,
-    commands: result.html.body.table.tbody.tr.filter(row => (row.td[0]._text && !/^wait/.test(row.td[0]._text))).map(row => (
+    commands: tr.filter(row => (row.td[0]._text && !/^wait/.test(row.td[0]._text))).map(row => (
       {
         command: row.td[0]._text && row.td[0]._text.replace("AndWait", ""),
         target: xmlunescape(parseTarget(row.td[1])),
diff --git a/packages/selenium-ide/src/neo/__test__/IO/legacy/IDE_test_10.html b/packages/selenium-ide/src/neo/__test__/IO/legacy/IDE_test_10.html
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="https://stage.local.com/" />
+<title>Log in as test user</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">A command</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/</td>
+	<td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/packages/selenium-ide/src/neo/__test__/IO/legacy/migrate.spec.js b/packages/selenium-ide/src/neo/__test__/IO/legacy/migrate.spec.js
@@ -74,6 +74,11 @@ describe("selenium test case migration", () => {
     const { test } = migrateTestCase(file);
     expect(test.commands.length).toBe(2);
   });
+  it("should import a test case with a command in it", () => {
+    const file = fs.readFileSync(path.join(__dirname, "IDE_test_10.html")).toString();
+    const { test } = migrateTestCase(file);
+    expect(test.commands.length).toBe(1);
+  });
 });
 
 describe("selenium suite migration", () => {
