@seleniumhq/code-export-csharp-nunit 3.16.0 → 3.17.4

package/__test__/src/__snapshots__/command.spec.js.snap

@@ -263,7 +263,7 @@ exports[`command code emitter should emit \`open\` with absolute url 1`] = `"dri
 exports[`command code emitter should emit \`pause\` command 1`] = `
 "try {
   Thread.Sleep(300);
-} catch {
+} catch (Exception e) {
   Console.WriteLine(\\"{0} Exception caught.\\", e);
 }"
 `;
@@ -464,6 +464,13 @@ exports[`command code emitter should emit \`waitForElementVisible\` command 1`]
 }"
 `;
 
+exports[`command code emitter should emit \`waitForText\` command 1`] = `
+"{
+  WebDriverWait wait = new WebDriverWait(driver, System.TimeSpan.FromSeconds(30));
+  wait.Until(driver => driver.FindElement(By.CssSelector(\\"#blah\\")).Text == \\"text\\");
+}"
+`;
+
 exports[`command code emitter should emit \`while\` command 1`] = `
 Object {
   "body": "while ((Boolean) js.ExecuteScript(\\"return (true)\\")) {",

package/__test__/src/__snapshots__/index.spec.js.snap

@@ -160,7 +160,7 @@ using OpenQA.Selenium.Support.UI;
 using OpenQA.Selenium.Interactions;
 using NUnit.Framework;
 [TestFixture]
-public class LoginTest {
+public class ReusedmethodsTest {
   private IWebDriver driver;
   public IDictionary<string, object> vars {get; private set;}
   private IJavaScriptExecutor js;
@@ -179,7 +179,12 @@ public class LoginTest {
     driver.FindElement(By.LinkText(\\"Form Authentication\\")).Click();
     driver.FindElement(By.Id(\\"username\\")).SendKeys(vars[\\"username\\"].ToString());
     driver.FindElement(By.Id(\\"password\\")).SendKeys(vars[\\"password\\"].ToString());
-    driver.FindElement(By.CssSelector(\\".fa\\")).Click();
+    if ((Boolean) js.ExecuteScript(\\"return (true)\\")) {
+      driver.FindElement(By.CssSelector(\\".fa\\")).Click();
+    }
+  }
+  public void tinymethod() {
+    vars[\\"value\\"] = \\"field\\";
   }
   [Test]
   public void invalidcredentials() {
@@ -193,6 +198,13 @@ public class LoginTest {
     vars[\\"password\\"] = \\"SuperSecretPassword!\\";
     login();
   }
+  [Test]
+  public void twomethods() {
+    vars[\\"username\\"] = \\"blah\\";
+    vars[\\"password\\"] = \\"blah\\";
+    login();
+    tinymethod();
+  }
 }
 "
 `;
@@ -400,7 +412,9 @@ public class ValidcredentialsTest {
     driver.FindElement(By.LinkText(\\"Form Authentication\\")).Click();
     driver.FindElement(By.Id(\\"username\\")).SendKeys(vars[\\"username\\"].ToString());
     driver.FindElement(By.Id(\\"password\\")).SendKeys(vars[\\"password\\"].ToString());
-    driver.FindElement(By.CssSelector(\\".fa\\")).Click();
+    if ((Boolean) js.ExecuteScript(\\"return (true)\\")) {
+      driver.FindElement(By.CssSelector(\\".fa\\")).Click();
+    }
   }
   [Test]
   public void validcredentials() {

package/__test__/src/command.spec.js

@@ -21,7 +21,7 @@ import {
   ControlFlowCommandNames,
 } from '../../../selenium-ide/src/neo/models/Command'
 import { opts } from '../../src/index'
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const commandPrefixPadding = opts.commandPrefixPadding
 
@@ -839,6 +839,14 @@ describe('command code emitter', () => {
     }
     return expect(prettify(command)).resolves.toMatchSnapshot()
   })
+  it('should emit `waitForText` command', () => {
+    const command = {
+      command: 'waitForText',
+      target: 'css=#blah',
+      value: 'text',
+    }
+    return expect(prettify(command)).resolves.toMatchSnapshot()
+  })
   it('should emit `answer on visible prompt` command', () => {
     const command = {
       command: 'webdriverAnswerOnVisiblePrompt',

package/__test__/src/index.spec.js

@@ -17,8 +17,14 @@
 
 import fs from 'fs'
 import path from 'path'
-import { emitTest, emitSuite, _emitMethod, _findTestByName } from '../../src'
-import { project as projectProcessor } from '@seleniumhq/side-utils'
+import codeExport, {
+  emitTest,
+  emitSuite,
+  _emitMethod,
+  _findTestByName,
+} from '../../src'
+import Command from '../../src/command'
+import { project as projectProcessor } from '@seleniumhq/side-code-export'
 
 function readFile(filename) {
   return JSON.parse(
@@ -28,7 +34,7 @@ function readFile(filename) {
         '..',
         '..',
         '..',
-        'side-utils',
+        'side-code-export',
         '__test__',
         'test-files',
         filename
@@ -132,6 +138,9 @@ describe('Code Export C# NUnit', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
+  it('should export the command emitter', () => {
+    expect(Command.emit).toStrictEqual(codeExport.emit.command)
+  })
 })
 
 function normalizeProject(project) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-csharp-nunit",
-  "version": "3.16.0",
+  "version": "3.17.4",
   "description": "Export Selenium IDE project contents to C# NUnit",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
   "keywords": [
@@ -21,8 +21,8 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "@seleniumhq/code-export-csharp-commons": "^3.16.0",
-    "@seleniumhq/side-utils": "^3.16.0"
+    "@seleniumhq/code-export-csharp-commons": "^3.17.4",
+    "@seleniumhq/side-code-export": "^4.0.0-alpha.0"
   },
-  "gitHead": "70be270a6733b9cd14a9a86f11cbffaf7892c585"
+  "gitHead": "351d5762ed774d624831bf9a7a02ae4fb8e70ea9"
 }

package/src/command.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 import { Command } from '@seleniumhq/code-export-csharp-commons'
 
 exporter.register.preprocessors(Command.emitters)

package/src/hook.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const emitters = {
   afterAll,

package/src/index.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 import emitter from './command'
 import { location } from '@seleniumhq/code-export-csharp-commons'
 import { generateHooks } from './hook'
@@ -60,6 +60,7 @@ export async function emitTest({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const testDeclaration = generateTestDeclaration(test.name)
@@ -67,6 +68,7 @@ export async function emitTest({
     ...opts,
     testDeclaration,
     enableOriginTracing,
+    enableDescriptionAsComment,
     project,
   })
   const suiteName = test.name
@@ -92,10 +94,12 @@ export async function emitSuite({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const result = await exporter.emit.testsFromSuite(tests, suite, opts, {
     enableOriginTracing,
+    enableDescriptionAsComment,
     generateTestDeclaration,
     project,
   })
@@ -118,6 +122,7 @@ export default {
     test: emitTest,
     suite: emitSuite,
     locator: location.emit,
+    command: emitter.emit,
   },
   register: {
     command: emitter.register,

package/dist/command.js

@@ -1,57 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _sideUtils = require("@seleniumhq/side-utils");
-
-var _codeExportCsharpCommons = require("@seleniumhq/code-export-csharp-commons");
-
-// 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.
-_sideUtils.codeExport.register.preprocessors(_codeExportCsharpCommons.Command.emitters);
-
-function register(command, emitter) {
-  _sideUtils.codeExport.register.emitter({
-    command,
-    emitter,
-    emitters: _codeExportCsharpCommons.Command.emitters
-  });
-}
-
-function emit(command) {
-  return _sideUtils.codeExport.emit.command(command, _codeExportCsharpCommons.Command.emitters[command.command], {
-    variableLookup: _codeExportCsharpCommons.Command.variableLookup,
-    emitNewWindowHandling: _codeExportCsharpCommons.Command.extras.emitNewWindowHandling
-  });
-}
-
-function canEmit(commandName) {
-  return !!_codeExportCsharpCommons.Command.emitters[commandName];
-}
-
-var _default = {
-  canEmit,
-  emit,
-  register,
-  extras: {
-    emitWaitForWindow: _codeExportCsharpCommons.Command.extras.emitWaitForWindow
-  }
-};
-exports.default = _default;

package/dist/hook.js

@@ -1,216 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.generateHooks = generateHooks;
-
-var _sideUtils = require("@seleniumhq/side-utils");
-
-// 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.
-const emitters = {
-  afterAll,
-  afterEach,
-  beforeAll,
-  beforeEach,
-  declareDependencies,
-  declareMethods: empty,
-  declareVariables,
-  inEachBegin: empty,
-  inEachEnd: empty
-};
-
-function generate(hookName) {
-  return new _sideUtils.codeExport.hook(emitters[hookName]());
-}
-
-function generateHooks() {
-  let result = {};
-  Object.keys(emitters).forEach(hookName => {
-    result[hookName] = generate(hookName);
-  });
-  return result;
-}
-
-function afterAll() {
-  const params = {
-    startingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '[OneTimeTearDown]'
-      }, {
-        level: 0,
-        statement: 'public void FinalTearDown() {'
-      }]
-    },
-    endingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '}'
-      }]
-    },
-    registrationLevel: 1
-  };
-  return params;
-}
-
-function afterEach() {
-  const params = {
-    startingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '[TearDown]'
-      }, {
-        level: 0,
-        statement: 'protected void TearDown() {'
-      }, {
-        level: 1,
-        statement: 'driver.Quit();'
-      }]
-    },
-    endingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '}'
-      }]
-    }
-  };
-  return params;
-}
-
-function beforeAll() {
-  const params = {
-    startingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '[OneTimeSetUp]'
-      }, {
-        level: 0,
-        statement: 'public void InitialSetUp() {'
-      }]
-    },
-    endingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '}'
-      }]
-    },
-    registrationLevel: 1
-  };
-  return params;
-}
-
-function beforeEach() {
-  const params = {
-    startingSyntax: ({
-      browserName,
-      gridUrl
-    } = {}) => ({
-      commands: [{
-        level: 0,
-        statement: '[SetUp]'
-      }, {
-        level: 0,
-        statement: 'public void SetUp() {'
-      }, {
-        level: 1,
-        statement: gridUrl ? `driver = new RemoteWebDriver(new Uri("${gridUrl}"), new ${browserName ? browserName : 'Chrome'}Options().ToCapabilities());` : `driver = new ${browserName ? browserName : 'Chrome'}Driver();`
-      }, {
-        level: 1,
-        statement: 'js = (IJavaScriptExecutor)driver;'
-      }, {
-        level: 1,
-        statement: 'vars = new Dictionary<string, object>();'
-      }]
-    }),
-    endingSyntax: {
-      commands: [{
-        level: 0,
-        statement: '}'
-      }]
-    }
-  };
-  return params;
-}
-
-function declareDependencies() {
-  const params = {
-    startingSyntax: {
-      commands: [{
-        level: 0,
-        statement: 'using System;'
-      }, {
-        level: 0,
-        statement: 'using System.Collections;'
-      }, {
-        level: 0,
-        statement: 'using System.Collections.Generic;'
-      }, {
-        level: 0,
-        statement: 'using System.Linq;'
-      }, {
-        level: 0,
-        statement: 'using System.Threading;'
-      }, {
-        level: 0,
-        statement: 'using OpenQA.Selenium;'
-      }, {
-        level: 0,
-        statement: 'using OpenQA.Selenium.Chrome;'
-      }, {
-        level: 0,
-        statement: 'using OpenQA.Selenium.Firefox;'
-      }, {
-        level: 0,
-        statement: `using OpenQA.Selenium.Remote;`
-      }, {
-        level: 0,
-        statement: 'using OpenQA.Selenium.Support.UI;'
-      }, {
-        level: 0,
-        statement: 'using OpenQA.Selenium.Interactions;'
-      }, {
-        level: 0,
-        statement: 'using NUnit.Framework;'
-      }]
-    }
-  };
-  return params;
-}
-
-function declareVariables() {
-  const params = {
-    startingSyntax: {
-      commands: [{
-        level: 0,
-        statement: 'private IWebDriver driver;'
-      }, {
-        level: 0,
-        statement: 'public IDictionary<string, object> vars {get; private set;}'
-      }, {
-        level: 0,
-        statement: 'private IJavaScriptExecutor js;'
-      }]
-    }
-  };
-  return params;
-}
-
-function empty() {
-  return {};
-}

package/dist/hooks/afterAll.js

@@ -1,48 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// 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.
-
-let afterAll = `
-    @AfterAll
-    public void finalTearDown() {
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return afterAll + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/afterEach.js

@@ -1,49 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// 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.
-
-let afterEach = `
-    @After
-    public void tearDown() {
-        driver.quit();
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return afterEach + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/beforeAll.js

@@ -1,48 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// 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.
-
-let beforeAll = `
-    @BeforeAll
-    public void initialSetUp() {
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return beforeAll + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/beforeEach.js

@@ -1,50 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// 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.
-
-let beforeEach = `
-    @Before
-    public void setUp() {
-        driver = new FirefoxDriver();
-        js = (JavascriptExecutor) driver;
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return beforeEach + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};