improve xpath highlighting

Author: corevo

packages/selenium-ide/src/neo/IO/SideeX/record.js

@@ -62,8 +62,15 @@ export default function record(command, targets, value, insertBeforeLastCommand)
       // double click removed the 2 clicks from before
       index -= 2;
     }
-    const newCommand = recordCommand(command, targets[0][0], value, index);
-    newCommand.setTargets(targets);
+    const trgs = targets.map(([locator, strategy]) => {
+      // no more implicit things, make users specify exactly which selector to use
+      if (strategy.startsWith("xpath") && locator.startsWith("//")) {
+        return ["xpath=" + locator, strategy];
+      }
+      return [locator, strategy];
+    });
+    const newCommand = recordCommand(command, trgs[0][0], value, index);
+    newCommand.setTargets(trgs);
   }
 }
 

packages/selenium-ide/src/neo/components/TargetInput/index.jsx

@@ -19,15 +19,15 @@ import React from "react";
 import PropTypes from "prop-types";
 import { PropTypes as MobxPropTypes } from "mobx-react";
 import SyntaxHighlighter, { registerLanguage } from "react-syntax-highlighter/light";
-import livecodeserver from "react-syntax-highlighter/languages/hljs/livecodeserver";
+import fortran from "react-syntax-highlighter/languages/hljs/fortran";
 import stylus from "react-syntax-highlighter/languages/hljs/stylus";
 import ini from "react-syntax-highlighter/languages/hljs/ini";
 import { xcode } from "react-syntax-highlighter/styles/hljs";
 import AutoComplete from "../AutoComplete";
 import Input from "../FormInput";
 import "./style.css";
 
-registerLanguage("livecodeserver", livecodeserver);
+registerLanguage("fortran", fortran);
 registerLanguage("stylus", stylus);
 registerLanguage("ini", ini);
 
@@ -77,7 +77,7 @@ class TargetSuggestion extends React.Component {
     if (this.props.strategy === "css") {
       language = "stylus";
     } else if (this.props.strategy.startsWith("xpath")) {
-      language = "livecodeserver";
+      language = "fortran";
     }
     return (
       <span style={{

packages/selenium-ide/src/neo/stores/seed.js

@@ -110,6 +110,7 @@ export default function seed(store, numberOfSuites = 5) {
     ["id=something", "id"],
     ["name=something-else", "name"],
     ["linkText=number density", "linkText"],
+    ["xpath=//a[contains(text(),'number density')]", "xpath:link"],
     ["css=main .class > p a.link", "css"],
     ["xpath=(//a[contains(text(),'number line')])[2]", "xpath:link"],
     ["(//a[contains(text(),'number line')])[2]", "xpath:link"],
@@ -200,9 +201,9 @@ export default function seed(store, numberOfSuites = 5) {
   smokeSuite.addTestCase(submitTest);
 
   UiState.changeView("Test suites");
-  let suiteState = UiState.getSuiteState(suiteControlFlow);
+  let suiteState = UiState.getSuiteState(suiteAll);
   suiteState.setOpen(true);
-  UiState.selectTest(controlFlowIfTest, suiteControlFlow);
+  UiState.selectTest(checkTest, suiteAll);
 
   store.changeName("seed project");