@oracle/oraclejet-webdriver 16.1.6 → 17.0.1

package/elements/oj-table/OjTableBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjTableBase.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTableBase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OjTableBase.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTableBase.ts"],"names":[],"mappings":"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"}

package/elements/oj-table/OjTableBase.ts

@@ -37,6 +37,16 @@ export class OjTableBase extends OjWebElement {
     return this.getProperty<string>('as');
   }
 
+  /**
+   * Gets the value of <code>columnResizeBehavior</code> property.
+   * Specifies the column resize behavior for this Table. See the Help documentation for more information.
+   * @return The value of <code>columnResizeBehavior</code> property.
+   *
+   */
+  public getColumnResizeBehavior(): Promise<string> {
+    return this.getProperty<string>('columnResizeBehavior');
+  }
+
   /**
    * Sets the value of <code>columns</code> property.
    * An array of column definitions. See the Help documentation for more information.

package/elements/oj-tree-view/OjTreeView.js

@@ -4,6 +4,7 @@ exports.OjTreeView = void 0;
 const OjTreeViewBase_1 = require("./OjTreeViewBase");
 const __1 = require("../../");
 const selenium_webdriver_1 = require("selenium-webdriver");
+const oj_module_proxy_1 = require("../../lib/oj-module-proxy");
 /**
  * The component WebElement for [oj-tree-view](../../jsdocs/oj.ojTreeView.html).
  * Do not instantiate this class directly, instead, use
@@ -19,12 +20,11 @@ class OjTreeView extends OjTreeViewBase_1.OjTreeViewBase {
      */
     async changeSelected(selected) {
         await this.whenReady();
-        await this.getDriver().executeScript(`
-          const ele = arguments[0];
-          const selected = arguments[1];
-          const keySet = require('ojs/ojkeyset');
-          ele.selected = new keySet.KeySetImpl(selected);
-        `, this, selected);
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeySet'], [this, selected], `
+      (({ KeySetImpl }, ele, selected) => {
+        ele.selected = new KeySetImpl(selected);
+      })
+      `);
     }
     /**
      * Gets the value of "selected" property.
@@ -51,23 +51,20 @@ class OjTreeView extends OjTreeViewBase_1.OjTreeViewBase {
         let item;
         if (itemLocator.key) {
             await this.whenBusyContextReady();
-            item = await this.getDriver().executeAsyncScript(`
-      var element = arguments[0];
-      var key = arguments[1];
-      var done = arguments[2];
-      require([\'ojs/ojcore\'], function(oj) {
-        const items = element.querySelectorAll('.oj-treeview-item');
-        let item;
-        for (var i = 0; i < items.length; i++) {
-          if (oj.KeyUtils.equals(items[i]['oj-item-metadata'].key, key)) {
-            item = items[i];
-            break;
+            item = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeyUtils'], [this, itemLocator.key], `
+        (({ equals }, element, key) => {
+          const items = element.querySelectorAll('.oj-treeview-item');
+          let item;
+          for (var i = 0; i < items.length; i++) {
+            if (equals(items[i]['oj-item-metadata'].key, key)) {
+              item = items[i];
+              break;
+            }
           }
-        }
-        if (item) {
-         done(item.querySelector('.oj-treeview-item-content'));
-        };
-      });`, this, itemLocator.key);
+          if (item) {
+            return item.querySelector('.oj-treeview-item-content');
+          };
+        })`);
         }
         else if (itemLocator.id) {
             await this.whenBusyContextReady();
@@ -92,13 +89,12 @@ class OjTreeView extends OjTreeViewBase_1.OjTreeViewBase {
      */
     async changeExpanded(expanded) {
         await this.whenReady();
-        await this.getDriver().executeScript(`
-        const ele = arguments[0];
-        const expanded  = arguments[1];
-        const keySet = require('ojs/ojkeyset');
-        const expandedKeySet = new keySet.ExpandedKeySet(expanded);
-        ele.expanded = expandedKeySet;`, this, expanded);
-        await this.whenBusyContextReady();
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeySet'], [this, expanded], `
+      (({ ExpandedKeySet }, ele, expanded) => {
+        const expandedKeySet = new ExpandedKeySet(expanded);
+        ele.expanded = expandedKeySet;
+      })
+      `);
     }
     /**
      * Expands a collapsed treeview item. If already expanded it will remain expanded.

package/elements/oj-tree-view/OjTreeView.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjTreeView.js","sourceRoot":"","sources":["../../../elements/oj-tree-view/OjTreeView.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OjTreeView.js","sourceRoot":"","sources":["../../../elements/oj-tree-view/OjTreeView.ts"],"names":[],"mappings":"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"}

package/elements/oj-tree-view/OjTreeView.ts

@@ -1,6 +1,7 @@
 import { OjTreeViewBase } from './OjTreeViewBase';
 import { SlotProxy, slotProxy } from '../../';
 import { WebElement, By } from 'selenium-webdriver';
+import { executeWithModules } from '../../lib/oj-module-proxy';
 
 /**
  * The component WebElement for [oj-tree-view](../../jsdocs/oj.ojTreeView.html).
@@ -17,15 +18,15 @@ export class OjTreeView extends OjTreeViewBase {
    */
   async changeSelected<K>(selected: Array<K>) {
     await this.whenReady();
-    await this.getDriver().executeScript(
+    return executeWithModules(
+      this.getDriver(),
+      ['KeySet'],
+      [this, selected],
+      `
+      (({ KeySetImpl }, ele, selected) => {
+        ele.selected = new KeySetImpl(selected);
+      })
       `
-          const ele = arguments[0];
-          const selected = arguments[1];
-          const keySet = require('ojs/ojkeyset');
-          ele.selected = new keySet.KeySetImpl(selected);
-        `,
-      this,
-      selected
     );
   }
   /**
@@ -56,26 +57,24 @@ export class OjTreeView extends OjTreeViewBase {
     let item;
     if (itemLocator.key) {
       await this.whenBusyContextReady();
-      item = await this.getDriver().executeAsyncScript<WebElement>(
+      item = await executeWithModules<WebElement>(
+        this.getDriver(),
+        ['KeyUtils'],
+        [this, itemLocator.key],
         `
-      var element = arguments[0];
-      var key = arguments[1];
-      var done = arguments[2];
-      require([\'ojs/ojcore\'], function(oj) {
-        const items = element.querySelectorAll('.oj-treeview-item');
-        let item;
-        for (var i = 0; i < items.length; i++) {
-          if (oj.KeyUtils.equals(items[i]['oj-item-metadata'].key, key)) {
-            item = items[i];
-            break;
+        (({ equals }, element, key) => {
+          const items = element.querySelectorAll('.oj-treeview-item');
+          let item;
+          for (var i = 0; i < items.length; i++) {
+            if (equals(items[i]['oj-item-metadata'].key, key)) {
+              item = items[i];
+              break;
+            }
           }
-        }
-        if (item) {
-         done(item.querySelector('.oj-treeview-item-content'));
-        };
-      });`,
-        this,
-        itemLocator.key
+          if (item) {
+            return item.querySelector('.oj-treeview-item-content');
+          };
+        })`
       );
     } else if (itemLocator.id) {
       await this.whenBusyContextReady();
@@ -104,17 +103,17 @@ export class OjTreeView extends OjTreeViewBase {
    */
   async changeExpanded(expanded: Array<any>) {
     await this.whenReady();
-    await this.getDriver().executeScript(
+    return executeWithModules(
+      this.getDriver(),
+      ['KeySet'],
+      [this, expanded],
+      `
+      (({ ExpandedKeySet }, ele, expanded) => {
+        const expandedKeySet = new ExpandedKeySet(expanded);
+        ele.expanded = expandedKeySet;
+      })
       `
-        const ele = arguments[0];
-        const expanded  = arguments[1];
-        const keySet = require('ojs/ojkeyset');
-        const expandedKeySet = new keySet.ExpandedKeySet(expanded);
-        ele.expanded = expandedKeySet;`,
-      this,
-      expanded
     );
-    await this.whenBusyContextReady();
   }
   /**
    * Expands a collapsed treeview item. If already expanded it will remain expanded.

package/elements/oj-treemap/OjTreemapBase.ts

@@ -594,6 +594,14 @@ export interface Translations {
    * Used to describe the isolated state for accessibility.
    */
   stateIsolated: string;
+  /**
+   * Used by the component when data is loaded.
+   */
+  stateLoaded: string;
+  /**
+   * Used by the component when waiting for data.
+   */
+  stateLoading: string;
   /**
    * Used to describe the maximized state for accessibility.
    */

package/index.js

@@ -11,6 +11,8 @@ Object.defineProperty(exports, "Expectation", { enumerable: true, get: function
 const sm = require("./lib/ScreenshotManager");
 exports.ScreenshotManager = sm;
 const busy_context_utils_1 = require("./lib/busy-context-utils");
+const viewmodel_utils_1 = require("./lib/viewmodel-utils");
+const no_require_jet_1 = require("./lib/no-require-jet");
 // Export register function before importing elements so that they can
 // call it to register themselves
 var dataprovider_utils_1 = require("./lib/dataprovider-utils");
@@ -21,96 +23,6 @@ var driver_override_1 = require("./lib/driver-override");
 Object.defineProperty(exports, "register", { enumerable: true, get: function () { return driver_override_1.register; } });
 var slot_proxy_1 = require("./lib/slot-proxy");
 Object.defineProperty(exports, "slotProxy", { enumerable: true, get: function () { return slot_proxy_1.slotProxy; } });
-/**
- * Create a Condition for WebDriver to wait on the page's BusyContext to be ready
- */
-function pageReady() {
-    return new selenium_webdriver_1.Condition('for JET page to indicate ready', async (driver) => {
-        // Check that <html> element has a size after page ready
-        // Call thru executeScript to bypass WebElement overrides
-        const size = await driver.executeScript(`
-      const html = document.querySelector('html');
-      return { width: html.clientWidth, height: html.clientHeight }
-    `);
-        if (!(size.width && size.height)) {
-            return Promise.resolve(false);
-        }
-        // Test if the page BusyContext is ready. BusyContext.whenReady() will return
-        // true; anything else (timeouts, exceptions) will return false.
-        const remoteScript = `
-    const done = arguments[0];
-    try {
-      require('ojs/ojcontext').getPageContext().getBusyContext()
-      .whenReady().then(done)
-      .catch(ex => done(false))
-    } catch (ex) {
-      done(false);
-    }
-    `;
-        return driver.executeAsyncScript(remoteScript);
-    });
-}
-/**
- * Script executed by ojwd.assert() to run the Chai assertion on the browser
- * @private
- */
-const ASSERT_SCRIPT = `
-var viewmodelEl = arguments[0];
-var assertion = arguments[1];
-var callback = arguments[arguments.length - 1];
-require([
-  'chai',
-  'knockout',
-  'ojs/ojcspexpressionevaluator'
-], function(chai, ko, ExpressionEval) {
-  if (chai) {
-    try {
-      var viewmodel = ko.dataFor(viewmodelEl);
-      var evaluator = new ExpressionEval();
-      // Use ExpressionEval to get the value from the viewmodel
-      var value = evaluator.createEvaluator(assertion.expression).evaluate([viewmodel]);
-
-      function compare(value) {
-        var expect = chai.expect(value);
-        // For each chained assertion, call the assertion method with the arguments
-        assertion.chain.forEach((desc) => {
-          if (typeof desc === 'string') {
-            // Simple assertions, "is", "to", "be", etc
-            expect = expect[desc];
-          } else {
-            // Complex assertions (chained functions)
-            const name = desc.name;
-            const args = desc.args;
-            let evaluatedArgs = [];
-
-            if (name === 'match') {
-              args[0] = new RegExp(args[0]);
-            }
-
-            if (args) {
-              evaluatedArgs = args;
-            }
-
-            expect = expect[name](...evaluatedArgs);
-          }
-        });
-        callback(true);
-      }
-
-      // If "value" is a Promise
-      if (value && typeof value.then === 'function') {
-        value.then(compare).catch(function(ex) { callback(ex.message) });
-      } else {
-        compare(value);
-      }
-    } catch (ex) {
-      callback(ex.message);
-    }
-  } else {
-    callback('Chai not found');
-  }
-}, function(ex) { callback(ex.message); });
-`;
 /**
  * Check the running JET UI version against this oraclejet-webdriver package
  * version. It's expected that the JET UI is already fully loaded so that
@@ -150,6 +62,12 @@ ${mismatch}
  * ```
  */
 const ojwd = {
+    /**
+     * Flag to indicate if testing environment is running a JET application without
+     * RequireJS, such as WebPack. This property can only be set once.
+     * Defaults to false.
+     */
+    noRequireJet: false,
     /**
      * Opens a JET page and wait for the UI to be ready for testing. This method
      * should be used in place of WebDriver.get() to open a page for test. It will
@@ -165,7 +83,7 @@ const ojwd = {
         await driver.get(url);
         const timeouts = await driver.manage().getTimeouts();
         try {
-            await driver.wait(pageReady(), timeouts.pageLoad);
+            await driver.wait((0, busy_context_utils_1.pageReady)(), timeouts.pageLoad);
             await checkVersions(driver);
         }
         catch (ex) {
@@ -191,7 +109,7 @@ const ojwd = {
     pageReady() {
         console.warn('pageReady() is deprecated and will be removed in the next release. ' +
             'Use ojwd.get() to open and wait for the page to be ready for testing');
-        return pageReady();
+        return (0, busy_context_utils_1.pageReady)();
     },
     /**
      * Invoke fetch in the browser to permit interaction with REST services.
@@ -314,54 +232,25 @@ const ojwd = {
         // findElement will wait on busy context before executing
         return driver.findElement(by);
     },
-    /**
-     * Assert a given expectation against a JET application's viewmodel.
-     * Assertions are [Chai](https://www.chaijs.com)-like expressions, represented
-     * by the {@link Expectation} class, and compared remotely on the test browser
-     * against the identified viewmodel and its path to the target value.
-     *
-     * The viewmodel is typically identiied by the DOM node on which Knockout's
-     * <code>ko.applyBindings</code> was called, but can also be descendants of
-     * that originial "root" node.
-     * ```javascript
-     * new Expectation(...)
-     * ```
-     *
-     * The target value within the viewmodel is identified by a dot-notated path
-     * and/or expression which yields the value. For instance, a value may be an
-     * observable, therefore, the expression must include parenthesis to unwrap
-     * the observable.
-     * ```javascript
-     * new Expecation(By.id('view-container'), 'firstName()')
-     * ```
-     *
-     * The expression to which the viewmodel value will be compared is expressed
-     * as BDD-style chains, such as
-     * ```javascript
-     * const fnExpectation = new Expectation('firstName()')
-     *   .to.equal('Joe');
-     * ```
-     *
-     * If a viewmodel value returns a Promise, the assertion will wait for it to
-     * resolve before doing the comparison.
-     *
-     * @param driver The instance of WebDriver to use in performing the expectation
-     * @param vmLocator The Locator which identifies the DOM node associated with the
-     * viewmodel on the client.
-     * @param expression The path within the viewmodel to locate the value
-     * @param expectation The Expectation object to evaluate on the client browser.
+    assertViewModelValue: viewmodel_utils_1.assertViewModelValue
+};
+Object.defineProperties(ojwd, {
+    /*
+     * Add a guard to only set the noRequireJet flag once
      */
-    async assertViewModelValue(driver, vmLocator, expectation) {
-        const viewmodelEl = (await driver.findElement(vmLocator));
-        // Script executes on client to build the Chai assertion from the Expectation.
-        // Any exceptions (including failed assertions) will be returned to the test.
-        await viewmodelEl.whenBusyContextReady();
-        const result = await driver.executeAsyncScript(ASSERT_SCRIPT, viewmodelEl, expectation.assertion);
-        if (result !== true) {
-            throw Error(String(result));
-        }
-        return result;
+    noRequireJet: {
+        set: function (v) {
+            if ((0, no_require_jet_1.isNoRequireJet)() === undefined) {
+                (0, no_require_jet_1.setNoRequireJet)(v);
+            }
+            else {
+                throw Error('noRequireJet cannot be set more than once');
+            }
+        },
+        get: no_require_jet_1.isNoRequireJet,
+        enumerable: false,
+        configurable: false
     }
-};
+});
 exports.default = ojwd;
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}