@oracle/oraclejet-webdriver 15.0.4 → 15.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (217) hide show
  1. package/elements/OjWebElement.js +10 -7
  2. package/elements/OjWebElement.js.map +1 -1
  3. package/elements/OjWebElement.ts +7 -8
  4. package/elements/oj-accordion/OjAccordion.js.map +1 -1
  5. package/elements/oj-accordion/OjAccordion.ts +0 -1
  6. package/elements/oj-checkboxset/OjCheckboxset.js.map +1 -1
  7. package/elements/oj-checkboxset/OjCheckboxset.ts +2 -2
  8. package/elements/oj-combobox-many/OjComboboxMany.js.map +1 -1
  9. package/elements/oj-combobox-many/OjComboboxMany.ts +1 -2
  10. package/elements/oj-data-grid/OjDataGrid.js +0 -2
  11. package/elements/oj-data-grid/OjDataGrid.js.map +1 -1
  12. package/elements/oj-data-grid/OjDataGrid.ts +4 -6
  13. package/elements/oj-dialog/OjDialog.js.map +1 -1
  14. package/elements/oj-dialog/OjDialog.ts +0 -2
  15. package/elements/oj-drawer-popup/OjDrawerPopup.js.map +1 -1
  16. package/elements/oj-drawer-popup/OjDrawerPopup.ts +0 -1
  17. package/elements/oj-input-search/OjInputSearch.js.map +1 -1
  18. package/elements/oj-input-search/OjInputSearch.ts +0 -1
  19. package/elements/oj-input-text/OjInputText.js.map +1 -1
  20. package/elements/oj-input-text/OjInputText.ts +0 -2
  21. package/elements/oj-list-view/OjListView.js +3 -8
  22. package/elements/oj-list-view/OjListView.js.map +1 -1
  23. package/elements/oj-list-view/OjListView.ts +3 -8
  24. package/elements/oj-menu/OjMenu.js.map +1 -1
  25. package/elements/oj-menu/OjMenu.ts +1 -1
  26. package/elements/oj-navigation-list/OjNavigationList.js +3 -6
  27. package/elements/oj-navigation-list/OjNavigationList.js.map +1 -1
  28. package/elements/oj-navigation-list/OjNavigationList.ts +10 -11
  29. package/elements/oj-radioset/OjRadioset.js.map +1 -1
  30. package/elements/oj-radioset/OjRadioset.ts +1 -1
  31. package/elements/oj-select-many/OjSelectMany.js.map +1 -1
  32. package/elements/oj-select-many/OjSelectMany.ts +1 -2
  33. package/elements/oj-stream-list/OjStreamList.js.map +1 -1
  34. package/elements/oj-stream-list/OjStreamList.ts +0 -1
  35. package/elements/oj-switch/OjSwitch.ts +1 -1
  36. package/elements/oj-table/OjTable.js +25 -20
  37. package/elements/oj-table/OjTable.js.map +1 -1
  38. package/elements/oj-table/OjTable.ts +25 -21
  39. package/elements/oj-text-area/OjTextArea.js.map +1 -1
  40. package/elements/oj-text-area/OjTextArea.ts +0 -1
  41. package/lib/OjFetch.js +11 -18
  42. package/lib/OjFetch.js.map +1 -1
  43. package/lib/OjFetch.ts +15 -20
  44. package/lib/ScreenshotManager.js +5 -11
  45. package/lib/ScreenshotManager.js.map +1 -1
  46. package/lib/ScreenshotManager.ts +5 -11
  47. package/lib/driver-manager.js +15 -8
  48. package/lib/driver-manager.js.map +1 -1
  49. package/lib/driver-manager.ts +18 -10
  50. package/lib/driver-override.js +3 -2
  51. package/lib/driver-override.js.map +1 -1
  52. package/lib/driver-override.ts +11 -10
  53. package/lib/slot-proxy.js +24 -12
  54. package/lib/slot-proxy.js.map +1 -1
  55. package/lib/slot-proxy.ts +27 -15
  56. package/package.json +6 -7
  57. package/wdtsdoc/classes/elements.OjAccordion.html +3 -3
  58. package/wdtsdoc/classes/elements.OjActionCard.html +3 -3
  59. package/wdtsdoc/classes/elements.OjButton.html +3 -3
  60. package/wdtsdoc/classes/elements.OjButtonsetMany.html +3 -3
  61. package/wdtsdoc/classes/elements.OjButtonsetOne.html +3 -3
  62. package/wdtsdoc/classes/elements.OjChart.html +3 -3
  63. package/wdtsdoc/classes/elements.OjCheckboxset.html +5 -5
  64. package/wdtsdoc/classes/elements.OjCollapsible.html +3 -3
  65. package/wdtsdoc/classes/elements.OjColorPalette.html +3 -3
  66. package/wdtsdoc/classes/elements.OjColorSpectrum.html +3 -3
  67. package/wdtsdoc/classes/elements.OjComboboxMany.html +3 -3
  68. package/wdtsdoc/classes/elements.OjComboboxOne.html +3 -3
  69. package/wdtsdoc/classes/elements.OjConveyorBelt.html +3 -3
  70. package/wdtsdoc/classes/elements.OjDataGrid.html +7 -27
  71. package/wdtsdoc/classes/elements.OjDatePicker.html +3 -3
  72. package/wdtsdoc/classes/elements.OjDateTimePicker.html +3 -3
  73. package/wdtsdoc/classes/elements.OjDiagram.html +3 -3
  74. package/wdtsdoc/classes/elements.OjDialog.html +3 -3
  75. package/wdtsdoc/classes/elements.OjDrawerLayout.html +3 -3
  76. package/wdtsdoc/classes/elements.OjDrawerPopup.html +3 -3
  77. package/wdtsdoc/classes/elements.OjFilePicker.html +3 -3
  78. package/wdtsdoc/classes/elements.OjFilmStrip.html +3 -3
  79. package/wdtsdoc/classes/elements.OjGantt.html +3 -3
  80. package/wdtsdoc/classes/elements.OjIndexer.html +3 -3
  81. package/wdtsdoc/classes/elements.OjInputDate.html +3 -3
  82. package/wdtsdoc/classes/elements.OjInputDateTime.html +3 -3
  83. package/wdtsdoc/classes/elements.OjInputNumber.html +3 -3
  84. package/wdtsdoc/classes/elements.OjInputPassword.html +3 -3
  85. package/wdtsdoc/classes/elements.OjInputSearch.html +3 -3
  86. package/wdtsdoc/classes/elements.OjInputText.html +3 -3
  87. package/wdtsdoc/classes/elements.OjInputTime.html +3 -3
  88. package/wdtsdoc/classes/elements.OjLabel.html +3 -3
  89. package/wdtsdoc/classes/elements.OjLedGauge.html +3 -3
  90. package/wdtsdoc/classes/elements.OjLegend.html +3 -3
  91. package/wdtsdoc/classes/elements.OjListView.html +3 -3
  92. package/wdtsdoc/classes/elements.OjMasonryLayout.html +3 -3
  93. package/wdtsdoc/classes/elements.OjMenu.html +3 -3
  94. package/wdtsdoc/classes/elements.OjMenuButton.html +3 -3
  95. package/wdtsdoc/classes/elements.OjMessage.html +3 -3
  96. package/wdtsdoc/classes/elements.OjNBox.html +3 -3
  97. package/wdtsdoc/classes/elements.OjNavigationList.html +3 -3
  98. package/wdtsdoc/classes/elements.OjPagingControl.html +3 -3
  99. package/wdtsdoc/classes/elements.OjPictoChart.html +3 -3
  100. package/wdtsdoc/classes/elements.OjPopup.html +3 -3
  101. package/wdtsdoc/classes/elements.OjProgress.html +3 -3
  102. package/wdtsdoc/classes/elements.OjProgressList.html +3 -3
  103. package/wdtsdoc/classes/elements.OjRadioset.html +3 -3
  104. package/wdtsdoc/classes/elements.OjRatingGauge.html +3 -3
  105. package/wdtsdoc/classes/elements.OjRefresher.html +3 -3
  106. package/wdtsdoc/classes/elements.OjRowExpander.html +3 -3
  107. package/wdtsdoc/classes/elements.OjSelectMany.html +3 -3
  108. package/wdtsdoc/classes/elements.OjSelectOne.html +3 -3
  109. package/wdtsdoc/classes/elements.OjSelectSingle.html +3 -3
  110. package/wdtsdoc/classes/elements.OjSelector.html +3 -3
  111. package/wdtsdoc/classes/elements.OjSlider.html +3 -3
  112. package/wdtsdoc/classes/elements.OjSparkChart.html +3 -3
  113. package/wdtsdoc/classes/elements.OjStatusMeterGauge.html +3 -3
  114. package/wdtsdoc/classes/elements.OjStreamList.html +3 -3
  115. package/wdtsdoc/classes/elements.OjSunburst.html +3 -3
  116. package/wdtsdoc/classes/elements.OjSwipeActions.html +3 -3
  117. package/wdtsdoc/classes/elements.OjSwitch.html +5 -5
  118. package/wdtsdoc/classes/elements.OjTabBar.html +3 -3
  119. package/wdtsdoc/classes/elements.OjTable.html +3 -3
  120. package/wdtsdoc/classes/elements.OjTagCloud.html +3 -3
  121. package/wdtsdoc/classes/elements.OjTextArea.html +3 -3
  122. package/wdtsdoc/classes/elements.OjThematicMap.html +3 -3
  123. package/wdtsdoc/classes/elements.OjTimeAxis.html +3 -3
  124. package/wdtsdoc/classes/elements.OjTimeline.html +3 -3
  125. package/wdtsdoc/classes/elements.OjTrain.html +3 -3
  126. package/wdtsdoc/classes/elements.OjTreeView.html +3 -3
  127. package/wdtsdoc/classes/elements.OjTreemap.html +3 -3
  128. package/wdtsdoc/classes/elements.OjWaterfallLayout.html +3 -3
  129. package/wdtsdoc/classes/elements.OjWebElement.html +3 -3
  130. package/wdtsdoc/classes/index.DriverManager.html +3 -3
  131. package/wdtsdoc/classes/index.Expectation.html +3 -3
  132. package/wdtsdoc/functions/elements.ojAccordion-1.html +3 -3
  133. package/wdtsdoc/functions/elements.ojActionCard-1.html +3 -3
  134. package/wdtsdoc/functions/elements.ojButton-1.html +3 -3
  135. package/wdtsdoc/functions/elements.ojButtonsetMany-1.html +3 -3
  136. package/wdtsdoc/functions/elements.ojButtonsetOne-1.html +3 -3
  137. package/wdtsdoc/functions/elements.ojChart-1.html +3 -3
  138. package/wdtsdoc/functions/elements.ojCheckboxset-1.html +3 -3
  139. package/wdtsdoc/functions/elements.ojCollapsible-1.html +3 -3
  140. package/wdtsdoc/functions/elements.ojColorPalette-1.html +3 -3
  141. package/wdtsdoc/functions/elements.ojColorSpectrum-1.html +3 -3
  142. package/wdtsdoc/functions/elements.ojComboboxMany-1.html +3 -3
  143. package/wdtsdoc/functions/elements.ojComboboxOne-1.html +3 -3
  144. package/wdtsdoc/functions/elements.ojConveyorBelt-1.html +3 -3
  145. package/wdtsdoc/functions/elements.ojDataGrid-1.html +3 -3
  146. package/wdtsdoc/functions/elements.ojDatePicker-1.html +3 -3
  147. package/wdtsdoc/functions/elements.ojDateTimePicker-1.html +3 -3
  148. package/wdtsdoc/functions/elements.ojDiagram-1.html +3 -3
  149. package/wdtsdoc/functions/elements.ojDialog-1.html +3 -3
  150. package/wdtsdoc/functions/elements.ojDrawerLayout-1.html +3 -3
  151. package/wdtsdoc/functions/elements.ojDrawerPopup-1.html +3 -3
  152. package/wdtsdoc/functions/elements.ojFilePicker-1.html +3 -3
  153. package/wdtsdoc/functions/elements.ojFilmStrip-1.html +3 -3
  154. package/wdtsdoc/functions/elements.ojGantt-1.html +3 -3
  155. package/wdtsdoc/functions/elements.ojIndexer-1.html +3 -3
  156. package/wdtsdoc/functions/elements.ojInputDate-1.html +3 -3
  157. package/wdtsdoc/functions/elements.ojInputDateTime-1.html +3 -3
  158. package/wdtsdoc/functions/elements.ojInputNumber-1.html +3 -3
  159. package/wdtsdoc/functions/elements.ojInputPassword-1.html +3 -3
  160. package/wdtsdoc/functions/elements.ojInputSearch-1.html +3 -3
  161. package/wdtsdoc/functions/elements.ojInputText-1.html +3 -3
  162. package/wdtsdoc/functions/elements.ojInputTime-1.html +3 -3
  163. package/wdtsdoc/functions/elements.ojLabel-1.html +3 -3
  164. package/wdtsdoc/functions/elements.ojLedGauge-1.html +3 -3
  165. package/wdtsdoc/functions/elements.ojLegend-1.html +3 -3
  166. package/wdtsdoc/functions/elements.ojListView-1.html +3 -3
  167. package/wdtsdoc/functions/elements.ojMasonryLayout-1.html +3 -3
  168. package/wdtsdoc/functions/elements.ojMenu-1.html +3 -3
  169. package/wdtsdoc/functions/elements.ojMenuButton-1.html +3 -3
  170. package/wdtsdoc/functions/elements.ojMessage-1.html +3 -3
  171. package/wdtsdoc/functions/elements.ojNBox-1.html +3 -3
  172. package/wdtsdoc/functions/elements.ojNavigationList-1.html +3 -3
  173. package/wdtsdoc/functions/elements.ojPagingControl-1.html +3 -3
  174. package/wdtsdoc/functions/elements.ojPictoChart-1.html +3 -3
  175. package/wdtsdoc/functions/elements.ojPopup-1.html +3 -3
  176. package/wdtsdoc/functions/elements.ojProgress-1.html +3 -3
  177. package/wdtsdoc/functions/elements.ojProgressList-1.html +3 -3
  178. package/wdtsdoc/functions/elements.ojRadioset-1.html +3 -3
  179. package/wdtsdoc/functions/elements.ojRatingGauge-1.html +3 -3
  180. package/wdtsdoc/functions/elements.ojRefresher-1.html +3 -3
  181. package/wdtsdoc/functions/elements.ojRowExpander-1.html +3 -3
  182. package/wdtsdoc/functions/elements.ojSelectMany-1.html +3 -3
  183. package/wdtsdoc/functions/elements.ojSelectOne-1.html +3 -3
  184. package/wdtsdoc/functions/elements.ojSelectSingle-1.html +3 -3
  185. package/wdtsdoc/functions/elements.ojSelector-1.html +3 -3
  186. package/wdtsdoc/functions/elements.ojSlider-1.html +3 -3
  187. package/wdtsdoc/functions/elements.ojSparkChart-1.html +3 -3
  188. package/wdtsdoc/functions/elements.ojStatusMeterGauge-1.html +3 -3
  189. package/wdtsdoc/functions/elements.ojStreamList-1.html +3 -3
  190. package/wdtsdoc/functions/elements.ojSunburst-1.html +3 -3
  191. package/wdtsdoc/functions/elements.ojSwipeActions-1.html +3 -3
  192. package/wdtsdoc/functions/elements.ojSwitch-1.html +3 -3
  193. package/wdtsdoc/functions/elements.ojTabBar-1.html +3 -3
  194. package/wdtsdoc/functions/elements.ojTable-1.html +3 -3
  195. package/wdtsdoc/functions/elements.ojTagCloud-1.html +3 -3
  196. package/wdtsdoc/functions/elements.ojTextArea-1.html +3 -3
  197. package/wdtsdoc/functions/elements.ojThematicMap-1.html +3 -3
  198. package/wdtsdoc/functions/elements.ojTimeAxis-1.html +3 -3
  199. package/wdtsdoc/functions/elements.ojTimeline-1.html +3 -3
  200. package/wdtsdoc/functions/elements.ojTrain-1.html +3 -3
  201. package/wdtsdoc/functions/elements.ojTreeView-1.html +3 -3
  202. package/wdtsdoc/functions/elements.ojTreemap-1.html +3 -3
  203. package/wdtsdoc/functions/elements.ojWaterfallLayout-1.html +3 -3
  204. package/wdtsdoc/functions/elements.ojWebElement-1.html +3 -3
  205. package/wdtsdoc/functions/index.ScreenshotManager.create.html +3 -3
  206. package/wdtsdoc/functions/index.ScreenshotManager.get.html +3 -3
  207. package/wdtsdoc/functions/index.ScreenshotManager.set.html +3 -3
  208. package/wdtsdoc/functions/index.fetchKeyByFilter.html +3 -3
  209. package/wdtsdoc/functions/index.register.html +3 -3
  210. package/wdtsdoc/functions/index.slotProxy-1.html +3 -3
  211. package/wdtsdoc/index.html +4 -4
  212. package/wdtsdoc/interfaces/index.DriverLike.html +3 -3
  213. package/wdtsdoc/interfaces/index.SlotProxy.html +3 -3
  214. package/wdtsdoc/modules/elements.html +3 -3
  215. package/wdtsdoc/modules/index.ScreenshotManager.html +3 -3
  216. package/wdtsdoc/modules/index.html +3 -3
  217. package/wdtsdoc/variables/index.default.html +3 -3
@@ -28,6 +28,11 @@ class OjTable extends OjTableBase_1.OjTableBase {
28
28
  };
29
29
  `, this, selected);
30
30
  }
31
+ _changeScrollPosition(scrollPosition) {
32
+ // OjTableBase.ScrollPosition marks all properties required, although they're not
33
+ // @ts-ignore
34
+ return super.changeScrollPosition(scrollPosition);
35
+ }
31
36
  /**
32
37
  * Gets the value of "selected" property.
33
38
  * Specifies the current selected rows and/or columns in the table. See the Help documentation for more information.
@@ -55,16 +60,16 @@ class OjTable extends OjTableBase_1.OjTableBase {
55
60
  async findCell(itemLocator) {
56
61
  // Call changeScrollPosition to scroll the row into view and ensure it's
57
62
  // rendered in DOM
58
- await this.changeScrollPosition({
59
- rowIndex: itemLocator.rowIndex,
60
- columnIndex: undefined,
61
- offsetX: undefined,
62
- offsetY: undefined,
63
- rowKey: itemLocator.rowKey,
64
- columnKey: undefined,
65
- x: undefined,
66
- y: undefined
67
- });
63
+ if (typeof itemLocator.rowIndex !== 'undefined') {
64
+ await this._changeScrollPosition({
65
+ rowIndex: itemLocator.rowIndex
66
+ });
67
+ }
68
+ else {
69
+ await this._changeScrollPosition({
70
+ rowKey: itemLocator.rowKey
71
+ });
72
+ }
68
73
  const el = await this.getDriver().executeAsyncScript(`
69
74
  const element = arguments[0];
70
75
  const rowIndex = arguments[1];
@@ -136,16 +141,16 @@ class OjTable extends OjTableBase_1.OjTableBase {
136
141
  async findRow(itemLocator) {
137
142
  // Call changeScrollPosition to scroll the row into view and ensure it's
138
143
  // rendered in DOM
139
- await this.changeScrollPosition({
140
- rowIndex: itemLocator.rowIndex,
141
- columnIndex: undefined,
142
- offsetX: undefined,
143
- offsetY: undefined,
144
- rowKey: itemLocator.rowKey,
145
- columnKey: undefined,
146
- x: undefined,
147
- y: undefined
148
- });
144
+ if (typeof itemLocator.rowIndex !== 'undefined') {
145
+ await this._changeScrollPosition({
146
+ rowIndex: itemLocator.rowIndex
147
+ });
148
+ }
149
+ else {
150
+ await this._changeScrollPosition({
151
+ rowKey: itemLocator.rowKey
152
+ });
153
+ }
149
154
  const el = await this.getDriver().executeAsyncScript(`
150
155
  const element = arguments[0];
151
156
  const rowIndex = arguments[1];
@@ -1 +1 @@
1
- {"version":3,"file":"OjTable.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OjTable.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTable.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { By, WebElement } from 'selenium-webdriver';
1
+ import { WebElement } from 'selenium-webdriver';
2
2
  import { OjTableBase } from './OjTableBase';
3
3
  import { slotProxy, SlotProxy } from '../../';
4
4
 
@@ -32,6 +32,12 @@ export class OjTable extends OjTableBase {
32
32
  );
33
33
  }
34
34
 
35
+ private _changeScrollPosition(scrollPosition: { rowIndex: number } | { rowKey: any }) {
36
+ // OjTableBase.ScrollPosition marks all properties required, although they're not
37
+ // @ts-ignore
38
+ return super.changeScrollPosition(scrollPosition);
39
+ }
40
+
35
41
  /**
36
42
  * Gets the value of "selected" property.
37
43
  * Specifies the current selected rows and/or columns in the table. See the Help documentation for more information.
@@ -69,16 +75,15 @@ export class OjTable extends OjTableBase {
69
75
  ): Promise<SlotProxy> {
70
76
  // Call changeScrollPosition to scroll the row into view and ensure it's
71
77
  // rendered in DOM
72
- await this.changeScrollPosition({
73
- rowIndex: itemLocator.rowIndex,
74
- columnIndex: undefined,
75
- offsetX: undefined,
76
- offsetY: undefined,
77
- rowKey: itemLocator.rowKey,
78
- columnKey: undefined,
79
- x: undefined,
80
- y: undefined
81
- });
78
+ if (typeof itemLocator.rowIndex !== 'undefined') {
79
+ await this._changeScrollPosition({
80
+ rowIndex: itemLocator.rowIndex
81
+ });
82
+ } else {
83
+ await this._changeScrollPosition({
84
+ rowKey: itemLocator.rowKey
85
+ });
86
+ }
82
87
  const el = await this.getDriver().executeAsyncScript<WebElement>(
83
88
  `
84
89
  const element = arguments[0];
@@ -159,16 +164,15 @@ export class OjTable extends OjTableBase {
159
164
  ): Promise<SlotProxy> {
160
165
  // Call changeScrollPosition to scroll the row into view and ensure it's
161
166
  // rendered in DOM
162
- await this.changeScrollPosition({
163
- rowIndex: itemLocator.rowIndex,
164
- columnIndex: undefined,
165
- offsetX: undefined,
166
- offsetY: undefined,
167
- rowKey: itemLocator.rowKey,
168
- columnKey: undefined,
169
- x: undefined,
170
- y: undefined
171
- });
167
+ if (typeof itemLocator.rowIndex !== 'undefined') {
168
+ await this._changeScrollPosition({
169
+ rowIndex: itemLocator.rowIndex
170
+ });
171
+ } else {
172
+ await this._changeScrollPosition({
173
+ rowKey: itemLocator.rowKey
174
+ });
175
+ }
172
176
  const el = await this.getDriver().executeAsyncScript<WebElement>(
173
177
  `
174
178
  const element = arguments[0];
@@ -1 +1 @@
1
- {"version":3,"file":"OjTextArea.js","sourceRoot":"","sources":["../../../elements/oj-text-area/OjTextArea.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAElD,uDAAqE;AAErE;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;CAAG;AAAjD,gCAAiD;AACjD,IAAA,8BAAgB,EAAC,UAAU,CAAC,CAAC;AAC7B,IAAA,wBAAU,EAAC,UAAU,CAAC,CAAC"}
1
+ {"version":3,"file":"OjTextArea.js","sourceRoot":"","sources":["../../../elements/oj-text-area/OjTextArea.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,uDAAqE;AAErE;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;CAAG;AAAjD,gCAAiD;AACjD,IAAA,8BAAgB,EAAC,UAAU,CAAC,CAAC;AAC7B,IAAA,wBAAU,EAAC,UAAU,CAAC,CAAC"}
@@ -1,5 +1,4 @@
1
1
  import { OjTextAreaBase } from './OjTextAreaBase';
2
- import { By } from 'selenium-webdriver';
3
2
  import { mixinChangeValue, mixinClear } from '../../lib/input-utils';
4
3
 
5
4
  /**
package/lib/OjFetch.js CHANGED
@@ -5,7 +5,6 @@ class OjFetch {
5
5
  async fetch(driver, requestInfo, responseInfo, init) {
6
6
  // webdriver's async call marshalls objects on callback, so we have to unmarshall back into promise
7
7
  // We need to retrieve the body and headers during remote call, to use for recreation.
8
- let errResults;
9
8
  let retResults;
10
9
  const rInfo = JSON.stringify(requestInfo, null, 2);
11
10
  const remoteScript = `var input=arguments[0], info=arguments[1], init=arguments[2], callback = arguments[arguments.length - 1], resp = {};
@@ -58,26 +57,20 @@ class OjFetch {
58
57
  };
59
58
  // console.log("myResponse = " + JSON.stringify(myResponse,null,2));
60
59
  if (resp.error) {
61
- return new Promise((resolve, reject) => {
62
- reject('Response encountered error: ' +
63
- resp.error +
64
- '(requestInfo = ' +
65
- rInfo +
66
- ', response = ' +
67
- JSON.stringify(resp, null, 2) +
68
- ' status = ' +
69
- resp.status +
70
- ')');
71
- });
60
+ return Promise.reject('Response encountered error: ' +
61
+ resp.error +
62
+ '(requestInfo = ' +
63
+ rInfo +
64
+ ', response = ' +
65
+ JSON.stringify(resp, null, 2) +
66
+ ' status = ' +
67
+ resp.status +
68
+ ')');
72
69
  }
73
- retResults = new Promise((resolve, reject) => {
74
- resolve(myResponse);
75
- });
70
+ retResults = Promise.resolve(myResponse);
76
71
  }
77
72
  catch (err) {
78
- retResults = new Promise((resolve, reject) => {
79
- reject('Unable to read Response: ' + err + '(requestInfo = ' + rInfo + ')');
80
- });
73
+ retResults = Promise.reject('Unable to read Response: ' + err + '(requestInfo = ' + rInfo + ')');
81
74
  }
82
75
  return retResults;
83
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"OjFetch.js","sourceRoot":"","sources":["../../lib/OjFetch.ts"],"names":[],"mappings":";;;AA2FA,MAAa,OAAO;IAClB,KAAK,CAAC,KAAK,CACT,MAAiB,EACjB,WAAmC,EACnC,YAAqC,EACrC,IAA6B;QAE7B,mGAAmG;QACnG,sFAAsF;QACtF,IAAI,UAAkB,CAAC;QACvB,IAAI,UAAsC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;aA0BZ,CAAC;QAEV,IAAI;YACF,+FAA+F;YAC/F,IAAI,SAAc,CAAC;YACnB,IAAI,IAAI,EAAE;gBACR,SAAS,GAAG,IAAI,CAAC;gBACjB,IAAI,IAAI,CAAC,IAAI,EAAE;oBACb,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;iBACjC;aACF;YACD,IAAI,IAAI,GAAkB,CAAC,MAAM,MAAM,CAAC,kBAAkB,CACxD,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,SAAS,CACV,CAAkB,CAAC;YACpB,wDAAwD;YACxD,IAAI,UAAU,GAAsB;gBAClC,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,OAAO,EAAE,IAAI,CAAC,kBAAkB;gBAChC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd,CAAC;YACF,oEAAoE;YACpE,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACxD,MAAM,CACJ,8BAA8B;wBAC5B,IAAI,CAAC,KAAK;wBACV,iBAAiB;wBACjB,KAAK;wBACL,eAAe;wBACf,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC7B,YAAY;wBACZ,IAAI,CAAC,MAAM;wBACX,GAAG,CACN,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;YACD,UAAU,GAAG,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9D,OAAO,CAAC,UAAU,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,UAAU,GAAG,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9D,MAAM,CAAC,2BAA2B,GAAG,GAAG,GAAG,iBAAiB,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA7FD,0BA6FC"}
1
+ {"version":3,"file":"OjFetch.js","sourceRoot":"","sources":["../../lib/OjFetch.ts"],"names":[],"mappings":";;;AA2FA,MAAa,OAAO;IAClB,KAAK,CAAC,KAAK,CACT,MAAiB,EACjB,WAAmC,EACnC,YAAqC,EACrC,IAA6B;QAE7B,mGAAmG;QACnG,sFAAsF;QACtF,IAAI,UAAsC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;aA0BZ,CAAC;QAEV,IAAI;YACF,+FAA+F;YAC/F,IAAI,SAAc,CAAC;YACnB,IAAI,IAAI,EAAE;gBACR,SAAS,GAAG,IAAI,CAAC;gBACjB,IAAI,IAAI,CAAC,IAAI,EAAE;oBACb,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;iBACjC;aACF;YACD,IAAI,IAAI,GAAkB,CAAC,MAAM,MAAM,CAAC,kBAAkB,CACxD,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,SAAS,CACV,CAAkB,CAAC;YACpB,wDAAwD;YACxD,IAAI,UAAU,GAAsB;gBAClC,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,OAAO,EAAE,IAAI,CAAC,kBAAkB;gBAChC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;aACd,CAAC;YACF,oEAAoE;YACpE,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,OAAO,CAAC,MAAM,CACnB,8BAA8B;oBAC5B,IAAI,CAAC,KAAK;oBACV,iBAAiB;oBACjB,KAAK;oBACL,eAAe;oBACf,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC7B,YAAY;oBACZ,IAAI,CAAC,MAAM;oBACX,GAAG,CACN,CAAC;aACH;YACD,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACZ,UAAU,GAAG,OAAO,CAAC,MAAM,CACzB,2BAA2B,GAAG,GAAG,GAAG,iBAAiB,GAAG,KAAK,GAAG,GAAG,CACpE,CAAC;SACH;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAxFD,0BAwFC"}
package/lib/OjFetch.ts CHANGED
@@ -98,7 +98,6 @@ export class OjFetch implements ClientFetch {
98
98
  ): Promise<MarshaledResponse> {
99
99
  // webdriver's async call marshalls objects on callback, so we have to unmarshall back into promise
100
100
  // We need to retrieve the body and headers during remote call, to use for recreation.
101
- let errResults: string;
102
101
  let retResults: Promise<MarshaledResponse>;
103
102
  const rInfo = JSON.stringify(requestInfo, null, 2);
104
103
  const remoteScript = `var input=arguments[0], info=arguments[1], init=arguments[2], callback = arguments[arguments.length - 1], resp = {};
@@ -157,27 +156,23 @@ export class OjFetch implements ClientFetch {
157
156
  };
158
157
  // console.log("myResponse = " + JSON.stringify(myResponse,null,2));
159
158
  if (resp.error) {
160
- return new Promise<MarshaledResponse>((resolve, reject) => {
161
- reject(
162
- 'Response encountered error: ' +
163
- resp.error +
164
- '(requestInfo = ' +
165
- rInfo +
166
- ', response = ' +
167
- JSON.stringify(resp, null, 2) +
168
- ' status = ' +
169
- resp.status +
170
- ')'
171
- );
172
- });
159
+ return Promise.reject(
160
+ 'Response encountered error: ' +
161
+ resp.error +
162
+ '(requestInfo = ' +
163
+ rInfo +
164
+ ', response = ' +
165
+ JSON.stringify(resp, null, 2) +
166
+ ' status = ' +
167
+ resp.status +
168
+ ')'
169
+ );
173
170
  }
174
- retResults = new Promise<MarshaledResponse>((resolve, reject) => {
175
- resolve(myResponse);
176
- });
171
+ retResults = Promise.resolve(myResponse);
177
172
  } catch (err) {
178
- retResults = new Promise<MarshaledResponse>((resolve, reject) => {
179
- reject('Unable to read Response: ' + err + '(requestInfo = ' + rInfo + ')');
180
- });
173
+ retResults = Promise.reject(
174
+ 'Unable to read Response: ' + err + '(requestInfo = ' + rInfo + ')'
175
+ );
181
176
  }
182
177
 
183
178
  return retResults;
@@ -7,10 +7,10 @@ const path = require("path");
7
7
  * This implementation of ScreenshotManager Interface will not take any screenshot
8
8
  */
9
9
  class NoOpScreenShotManager {
10
- beforeTest(suiteName, testName) { }
11
- afterTest(passed) { }
12
- takeAndSaveScreenShot(screenshotTaker, name) {
13
- return null;
10
+ beforeTest() { }
11
+ afterTest() { }
12
+ takeAndSaveScreenShot() {
13
+ return Promise.resolve();
14
14
  }
15
15
  }
16
16
  /**
@@ -39,7 +39,6 @@ class TakeScreenshotManager {
39
39
  }
40
40
  catch (err) {
41
41
  console.error(err);
42
- console.error(err.stack);
43
42
  }
44
43
  this._screenshotsDir = mochawesomeReportDir + path.sep + 'screenshots';
45
44
  try {
@@ -48,7 +47,6 @@ class TakeScreenshotManager {
48
47
  }
49
48
  catch (err) {
50
49
  console.error(err);
51
- console.error(err.stack);
52
50
  }
53
51
  }
54
52
  /**
@@ -68,7 +66,6 @@ class TakeScreenshotManager {
68
66
  }
69
67
  catch (err) {
70
68
  console.error(err);
71
- console.error(err.stack);
72
69
  }
73
70
  try {
74
71
  if (!fs.existsSync(testF))
@@ -76,7 +73,6 @@ class TakeScreenshotManager {
76
73
  }
77
74
  catch (err) {
78
75
  console.error(err);
79
- console.error(err.stack);
80
76
  }
81
77
  }
82
78
  /**
@@ -98,7 +94,6 @@ class TakeScreenshotManager {
98
94
  }
99
95
  catch (err) {
100
96
  console.error(err);
101
- console.error(err.stack);
102
97
  }
103
98
  }
104
99
  }
@@ -123,9 +118,8 @@ class TakeScreenshotManager {
123
118
  }
124
119
  catch (err) {
125
120
  console.error(err);
126
- console.error(err.stack);
127
121
  }
128
- return null;
122
+ return Promise.resolve();
129
123
  }
130
124
  }
131
125
  //Below are the top-level methods of the ScreenshotManager module
@@ -1 +1 @@
1
- {"version":3,"file":"ScreenshotManager.js","sourceRoot":"","sources":["../../lib/ScreenshotManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ScreenshotManager.js","sourceRoot":"","sources":["../../lib/ScreenshotManager.ts"],"names":[],"mappings":"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"}
@@ -40,10 +40,10 @@ interface ScreenshotManager {
40
40
  * This implementation of ScreenshotManager Interface will not take any screenshot
41
41
  */
42
42
  class NoOpScreenShotManager implements ScreenshotManager {
43
- beforeTest(suiteName: string, testName: string): void {}
44
- afterTest(passed: boolean): void {}
45
- takeAndSaveScreenShot(screenshotTaker: ScreenshotTaker, name: string): Promise<void> {
46
- return null;
43
+ beforeTest(): void {}
44
+ afterTest(): void {}
45
+ takeAndSaveScreenShot(): Promise<void> {
46
+ return Promise.resolve();
47
47
  }
48
48
  }
49
49
 
@@ -74,14 +74,12 @@ class TakeScreenshotManager implements ScreenshotManager {
74
74
  if (!fs.existsSync(mochawesomeReportDir)) fs.mkdirSync(mochawesomeReportDir);
75
75
  } catch (err) {
76
76
  console.error(err);
77
- console.error(err.stack);
78
77
  }
79
78
  this._screenshotsDir = mochawesomeReportDir + path.sep + 'screenshots';
80
79
  try {
81
80
  if (!fs.existsSync(this._screenshotsDir)) fs.mkdirSync(this._screenshotsDir);
82
81
  } catch (err) {
83
82
  console.error(err);
84
- console.error(err.stack);
85
83
  }
86
84
  }
87
85
 
@@ -101,13 +99,11 @@ class TakeScreenshotManager implements ScreenshotManager {
101
99
  if (!fs.existsSync(suiteF)) fs.mkdirSync(suiteF);
102
100
  } catch (err) {
103
101
  console.error(err);
104
- console.error(err.stack);
105
102
  }
106
103
  try {
107
104
  if (!fs.existsSync(testF)) fs.mkdirSync(testF);
108
105
  } catch (err) {
109
106
  console.error(err);
110
- console.error(err.stack);
111
107
  }
112
108
  }
113
109
 
@@ -129,7 +125,6 @@ class TakeScreenshotManager implements ScreenshotManager {
129
125
  }
130
126
  } catch (err) {
131
127
  console.error(err);
132
- console.error(err.stack);
133
128
  }
134
129
  }
135
130
  }
@@ -157,10 +152,9 @@ class TakeScreenshotManager implements ScreenshotManager {
157
152
  );
158
153
  } catch (err) {
159
154
  console.error(err);
160
- console.error(err.stack);
161
155
  }
162
156
 
163
- return null;
157
+ return Promise.resolve();
164
158
  }
165
159
  }
166
160
 
@@ -29,8 +29,8 @@ const configs = {};
29
29
  * @private
30
30
  */
31
31
  let currentInstance = {
32
- configName: null,
33
- driver: null
32
+ configName: undefined,
33
+ driver: undefined
34
34
  };
35
35
  /**
36
36
  * The delay, in milliseconds, that the manager will wait after the driver is
@@ -238,8 +238,10 @@ class DriverManager {
238
238
  if (configName === currentInstance.configName) {
239
239
  // Test if current driver is still valid
240
240
  try {
241
- await currentInstance.driver.getCurrentUrl();
242
- return currentInstance.driver;
241
+ if (currentInstance.driver) {
242
+ await currentInstance.driver.getCurrentUrl();
243
+ return currentInstance.driver;
244
+ }
243
245
  }
244
246
  catch (ex) { }
245
247
  }
@@ -266,7 +268,7 @@ class DriverManager {
266
268
  // Wait for the delay to quit the driver. If [getDriver] was called before
267
269
  // the timeout expired, then it will have cleared the timeout so that the
268
270
  // instance isn't closed.
269
- releaseTimer = setTimeout(quitCurrentDriver, quitDelay);
271
+ releaseTimer = setTimeout(() => quitDriver(driver), quitDelay);
270
272
  }
271
273
  }
272
274
  exports.DriverManager = DriverManager;
@@ -305,11 +307,16 @@ function createDriver(configName) {
305
307
  * @private
306
308
  */
307
309
  function quitCurrentDriver() {
308
- const driver = currentInstance.driver;
310
+ quitDriver(currentInstance.driver);
311
+ }
312
+ /**
313
+ * @private
314
+ */
315
+ function quitDriver(driver) {
309
316
  if (driver) {
310
317
  currentInstance = {
311
- configName: null,
312
- driver: null
318
+ configName: undefined,
319
+ driver: undefined
313
320
  };
314
321
  quitPromise = driver.quit().catch((ex) => console.warn(ex));
315
322
  }
@@ -1 +1 @@
1
- {"version":3,"file":"driver-manager.js","sourceRoot":"","sources":["../../lib/driver-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver-manager.js","sourceRoot":"","sources":["../../lib/driver-manager.ts"],"names":[],"mappings":";;;AAAA,2DAAsE;AA2BtE;;GAEG;AACH,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B;;GAEG;AACH,MAAM,mBAAmB,GAAG,IAAI,iCAAY,CAAC;IAC3C,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,QAAQ;CACtB,CAAC,CAAC;AACH;;GAEG;AACH,MAAM,eAAe,GAAa;IAChC,QAAQ,EAAE,CAAC;IACX,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,KAAK;CACd,CAAC;AACF;;GAEG;AACH,MAAM,OAAO,GAAiD,EAAE,CAAC;AACjE;;GAEG;AACH,IAAI,eAAe,GAAsE;IACvF,UAAU,EAAE,SAAS;IACrB,MAAM,EAAE,SAAS;CAClB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,SAAS,GAAG,GAAG,CAAC;AACtB;;GAEG;AACH,IAAI,OAAgB,CAAC;AACrB;;;;;;GAMG;AACH,IAAI,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC7C;;GAEG;AACH,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,MAAa,aAAa;IACxB;;;;;;;;;;;;;;;OAeG;IACI,MAAM,CAAC,UAAU,CAAC,CAAU;QACjC,IAAI,OAAO,EAAE;YACX,MAAM,KAAK,CAAC,8EAA8E,CAAC,CAAC;SAC7F;QACD,OAAO,GAAG,CAAC,CAAC;IACd,CAAC;IACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACI,MAAM,CAAC,cAAc,CAAC,MAAiC,EAAE,IAAa;QAC3E,OAAO,CAAC,IAAI,IAAI,iBAAiB,CAAC,GAAG,MAAM,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAmB;QAC/C,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,UAAU,GAAG,UAAU,IAAI,iBAAiB,CAAC;QAE7C,IAAI,UAAU,KAAK,eAAe,CAAC,UAAU,EAAE;YAC7C,wCAAwC;YACxC,IAAI;gBACF,IAAI,eAAe,CAAC,MAAM,EAAE;oBAC1B,MAAM,eAAe,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;oBAC7C,OAAO,eAAe,CAAC,MAAM,CAAC;iBAC/B;aACF;YAAC,OAAO,EAAE,EAAE,GAAE;SAChB;QAED,iBAAiB,EAAE,CAAC;QACpB,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,gBAAgB;QAClC,OAAO,aAAa,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,MAAiB;QAC3C,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,0EAA0E;QAC1E,yEAAyE;QACzE,yBAAyB;QACzB,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC;CACF;AAxID,sCAwIC;AACD,aAAa,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;AAE/F;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,UAAkB;IACtC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,KAAK,CAAC,uCAAuC,UAAU,GAAG,CAAC,CAAC;KACnE;IACD,8CAA8C;IAC9C,MAAM,IAAI,GAAG,IAAI,iCAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,CAAC;IACvE,IAAI,MAAM,CAAC,YAAY,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;KACjC;IACD,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzF,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,IAAI,4BAAO,EAAE,CAAC;KACzB;IACD,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,MAAM,GAAc,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACjE,eAAe,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QACzC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB;IACxB,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,MAAkB;IACpC,IAAI,MAAM,EAAE;QACV,eAAe,GAAG;YAChB,UAAU,EAAE,SAAS;YACrB,MAAM,EAAE,SAAS;SAClB,CAAC;QACF,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;KAC7D;AACH,CAAC"}
@@ -18,7 +18,7 @@ interface CapabilitiesConfiguration {
18
18
  /**
19
19
  * The WebDriver Capabilties for the configuration
20
20
  */
21
- capabilities?: Capabilities;
21
+ capabilities?: Capabilities | Map<string, any> | {};
22
22
  /**
23
23
  * The WebDriver timeout values for the configuration
24
24
  */
@@ -51,9 +51,9 @@ const configs: { [key: string]: CapabilitiesConfiguration } = {};
51
51
  /**
52
52
  * @private
53
53
  */
54
- let currentInstance: { configName: string; driver: WebDriver } = {
55
- configName: null,
56
- driver: null
54
+ let currentInstance: { configName: string | undefined; driver: WebDriver | undefined } = {
55
+ configName: undefined,
56
+ driver: undefined
57
57
  };
58
58
 
59
59
  /**
@@ -265,8 +265,10 @@ export class DriverManager {
265
265
  if (configName === currentInstance.configName) {
266
266
  // Test if current driver is still valid
267
267
  try {
268
- await currentInstance.driver.getCurrentUrl();
269
- return currentInstance.driver;
268
+ if (currentInstance.driver) {
269
+ await currentInstance.driver.getCurrentUrl();
270
+ return currentInstance.driver;
271
+ }
270
272
  } catch (ex) {}
271
273
  }
272
274
 
@@ -295,7 +297,7 @@ export class DriverManager {
295
297
  // Wait for the delay to quit the driver. If [getDriver] was called before
296
298
  // the timeout expired, then it will have cleared the timeout so that the
297
299
  // instance isn't closed.
298
- releaseTimer = setTimeout(quitCurrentDriver, quitDelay);
300
+ releaseTimer = setTimeout(() => quitDriver(driver), quitDelay);
299
301
  }
300
302
  }
301
303
  DriverManager.registerConfig({ capabilities: defaultCapabilities, timeouts: defaultTimeouts });
@@ -335,11 +337,17 @@ function createDriver(configName: string) {
335
337
  * @private
336
338
  */
337
339
  function quitCurrentDriver() {
338
- const driver = currentInstance.driver;
340
+ quitDriver(currentInstance.driver);
341
+ }
342
+
343
+ /**
344
+ * @private
345
+ */
346
+ function quitDriver(driver?: WebDriver) {
339
347
  if (driver) {
340
348
  currentInstance = {
341
- configName: null,
342
- driver: null
349
+ configName: undefined,
350
+ driver: undefined
343
351
  };
344
352
  quitPromise = driver.quit().catch((ex) => console.warn(ex));
345
353
  }
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.register = void 0;
4
+ // @ts-nocheck
4
5
  const selenium_webdriver_1 = require("selenium-webdriver");
5
6
  // Import OjWebElement directly from its file rather than through
6
7
  // 'elements' package, to avoid circular dependency (elements will
@@ -76,7 +77,7 @@ function wrapFindElement(origFunc) {
76
77
  // Only inspect page when called by driver object (not from WebElement)
77
78
  lastIsJetPage = isDriver ? await isJetPage(this) : lastIsJetPage;
78
79
  const el = await origFunc.call(this, locator);
79
- const parentEl = !isDriver && this;
80
+ const parentEl = !isDriver ? this : undefined;
80
81
  try {
81
82
  resolve(lastIsJetPage ? await createTestAdapter(el, locator, parentEl) : el);
82
83
  }
@@ -103,7 +104,7 @@ function wrapFindElements(origFunc) {
103
104
  // Only inspect page when called by driver object (not from WebElement)
104
105
  lastIsJetPage = isDriver ? await isJetPage(this) : lastIsJetPage;
105
106
  // Pass ourselves as parent if this is WebElement.findElements
106
- const elRef = !isDriver && this;
107
+ const elRef = !isDriver ? this : undefined;
107
108
  const matches = await origFunc.call(this, locator);
108
109
  let weMatches = [];
109
110
  if (lastIsJetPage) {
@@ -1 +1 @@
1
- {"version":3,"file":"driver-override.js","sourceRoot":"","sources":["../../lib/driver-override.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver-override.js","sourceRoot":"","sources":["../../lib/driver-override.ts"],"names":[],"mappings":"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"}