added persistSession to suite

Author: corevo

packages/selenium-ide/src/neo/__test__/models/Suite.spec.js

@@ -57,12 +57,32 @@ describe("Suite model", () => {
   it("should initiate as a sequential suite", () => {
     const suite = new Suite();
     expect(suite.isParallel).toBeFalsy();
+    expect(suite.persistSession).toBeFalsy();
   });
   it("should set the suite to parallel", () => {
     const suite = new Suite();
     suite.setParallel(true);
     expect(suite.isParallel).toBeTruthy();
   });
+  it("should set the suite to unsafe", () => {
+    const suite = new Suite();
+    suite.setPersistSession(true);
+    expect(suite.persistSession).toBeTruthy();
+  });
+  it("should not be able to set a parallel suite unsafe", () => {
+    const suite = new Suite();
+    suite.setParallel(true);
+    suite.setPersistSession(true);
+    expect(suite.persistSession).toBeFalsy();
+  });
+  it("should make a suite safe if it was made parallel", () => {
+    const suite = new Suite();
+    suite.setPersistSession(true);
+    expect(suite.persistSession).toBeTruthy();
+    suite.setParallel(true);
+    expect(suite.isParallel).toBeTruthy();
+    expect(suite.persistSession).toBeFalsy();
+  });
   it("should add a new Test Case", () => {
     const store = new ProjectStore();
     const suite = new Suite();

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

@@ -23,27 +23,31 @@ import ModalHeader from "../ModalHeader";
 import Input from "../FormInput";
 import FlatButton from "../FlatButton";
 import Checkbox from "../Checkbox";
+import Markdown from "../Markdown";
 
 export default class SuiteSettings extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       timeout: props.timeout ? props.timeout : "",
-      isParallel: !!props.isParallel
+      isParallel: !!props.isParallel,
+      persistSession: !!props.persistSession
     };
   }
   static propTypes = {
     isEditing: PropTypes.bool,
     timeout: PropTypes.number,
     isParallel: PropTypes.bool,
+    persistSession: PropTypes.bool,
     submit: PropTypes.func,
     cancel: PropTypes.func
   };
   componentWillReceiveProps(nextProps) {
     if (!this.props.isEditing && nextProps.isEditing) {
       this.setState({
         timeout: nextProps.timeout,
-        isParallel: nextProps.isParallel
+        isParallel: nextProps.isParallel,
+        persistSession: nextProps.persistSession
       });
     }
   }
@@ -57,7 +61,13 @@ export default class SuiteSettings extends React.Component {
       isParallel: e.target.checked
     });
   }
+  onPersistSessionChange(e) {
+    this.setState({
+      persistSession: e.target.checked
+    });
+  }
   render() {
+    const persistSession = !this.state.isParallel && this.state.persistSession;
     return (
       <Modal className="suite-settings-dialog" isOpen={this.props.isEditing} onRequestClose={this.props.cancel}>
         <form onSubmit={(e) => { e.preventDefault(); }} style={{
@@ -67,10 +77,20 @@ export default class SuiteSettings extends React.Component {
           <div className="form-contents">
             <Input name="suite-timeout" type="number" label="Timeout (seconds)" placeholder={DEFAULT_TIMEOUT} value={this.state.timeout} width={130} onChange={this.onTimeoutChange.bind(this)} />
             <Checkbox label="Run in parallel" checked={this.state.isParallel} width={130} onChange={this.onIsParallelChange.bind(this)} />
+            <Checkbox label="Persist session" checked={persistSession} disabled={this.state.isParallel} width={130} onChange={this.onPersistSessionChange.bind(this)} />
+            <div>(not recommended)</div>
+            {persistSession && <Markdown className="markdown">
+              {"Persisting session will not reset the WebDriver session and variables between test run, which will result in [\"non-idempotent non-isolated\"](http://jasonpolites.github.io/tao-of-testing/ch4-1.1.html#rule-10-ensure-tests-are-isolated-and-idempotent) tests that are difficult to debug."}
+            </Markdown>}
           </div>
           <span className="right">
             <FlatButton onClick={this.props.cancel}>Cancel</FlatButton>
-            <FlatButton type="submit" onClick={() => {this.props.submit({ timeout: parseInt(this.state.timeout) || DEFAULT_TIMEOUT, isParallel: this.state.isParallel });}} style={{
+            <FlatButton type="submit" onClick={() => {this.props.submit({
+              timeout: parseInt(this.state.timeout) || DEFAULT_TIMEOUT,
+              isParallel: this.state.isParallel,
+              persistSession: this.state.persistSession
+            });
+            }} style={{
               marginRight: "0"
             }}>Submit</FlatButton>
           </span>

packages/selenium-ide/src/neo/containers/Modal/index.jsx

@@ -63,6 +63,7 @@ export default class Modal extends Component {
           isEditing={ModalState.suiteSettingsState.editing}
           timeout={ModalState.suiteSettingsState.timeout}
           isParallel={ModalState.suiteSettingsState.isParallel}
+          persistSession={ModalState.suiteSettingsState.persistSession}
           submit={ModalState.suiteSettingsState ? ModalState.suiteSettingsState.done : null}
           cancel={ModalState.cancelSuiteSettings}
         />

packages/selenium-ide/src/neo/models/Suite.js

@@ -26,6 +26,7 @@ export default class Suite {
   @observable name = null;
   @observable timeout = DEFAULT_TIMEOUT;
   @observable isParallel = false;
+  @observable persistSession = false;
   @observable _tests = [];
 
   constructor(id = uuidv4(), name = "Untitled Suite") {
@@ -58,6 +59,16 @@ export default class Suite {
 
   @action.bound setParallel(parallel) {
     this.isParallel = !!parallel;
+    if (this.isParallel) {
+      // setting directly because setPersistSession is locked
+      this.persistSession = false;
+    }
+  }
+
+  @action.bound setPersistSession(persistSession) {
+    if (!this.isParallel) {
+      this.persistSession = persistSession;
+    }
   }
 
   @action.bound addTestCase(test) {
@@ -88,6 +99,7 @@ export default class Suite {
     return {
       id: this.id,
       name: this.name,
+      persistSession: this.persistSession,
       parallel: this.isParallel,
       timeout: this.timeout,
       tests: this._tests.map(t => t.id)

packages/selenium-ide/src/neo/stores/view/ModalState.js

@@ -124,10 +124,12 @@ class ModalState {
     this.suiteSettingsState = {
       editing: true,
       isParallel: suite.isParallel,
+      persistSession: suite.persistSession,
       timeout: suite.timeout,
-      done: ({ isParallel, timeout }) => {
+      done: ({ isParallel, persistSession, timeout }) => {
         suite.setTimeout(timeout);
         suite.setParallel(isParallel);
+        suite.setPersistSession(persistSession);
         this.cancelSuiteSettings();
       }
     };

packages/selenium-side-runner/package.json

@@ -30,7 +30,7 @@
     "commander": "^2.12.2",
     "global-npm": "^0.3.0",
     "jest": "^23.1.0",
-    "jest-environment-selenium": "^1.0.0",
+    "jest-environment-selenium": "^1.1.0",
     "js-beautify": "^1.7.5",
     "js-yaml": "^3.10.0",
     "rimraf": "^2.6.2",

packages/selenium-side-runner/src/index.js

@@ -115,7 +115,8 @@ function runProject(project) {
   project.code.suites.forEach(suite => {
     if (!suite.tests) {
       // not parallel
-      writeJSFile(path.join(projectPath, suite.name), `// This file was generated using Selenium IDE\nconst tests = require("./commons.js");${suite.code}`);
+      const cleanup = suite.persistSession ? "" : "beforeEach(() => {vars = {};});afterEach(async () => (cleanup()));";
+      writeJSFile(path.join(projectPath, suite.name), `// This file was generated using Selenium IDE\nconst tests = require("./commons.js");${suite.code}${cleanup}`);
     } else if (suite.tests.length) {
       fs.mkdirSync(path.join(projectPath, suite.name));
       // parallel suite

packages/selenium-side-runner/yarn.lock

@@ -2479,9 +2479,9 @@ jest-environment-node@^23.1.0:
     jest-mock "^23.1.0"
     jest-util "^23.1.0"
 
-jest-environment-selenium@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-selenium/-/jest-environment-selenium-1.0.0.tgz#e5361f2078ffdbfa2b07dde41bbc3f73b3c9b861"
+jest-environment-selenium@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-selenium/-/jest-environment-selenium-1.1.0.tgz#f1b6ee16f5f21e61c4918c5f81d80b9c039339ab"
   dependencies:
     jest-environment-node "^23.1.0"
     selenium-webdriver "^3.6.0"

packages/selianize/__tests__/configuration.spec.js

@@ -22,6 +22,6 @@ describe("configuration code emitter", () => {
     const project = {
       url: "http://www.seleniumhq.org"
     };
-    return expect(ConfigurationEmitter.emit(project)).resolves.toBe(`global.BASE_URL = configuration.baseUrl || '${project.url}';const vars = {};`);
+    return expect(ConfigurationEmitter.emit(project)).resolves.toBe(`global.BASE_URL = configuration.baseUrl || '${project.url}';let vars = {};`);
   });
 });