@twilio/flex-plugin-e2e-tests 6.1.3-alpha.202309260818 → 6.1.3-alpha.202401300747

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 (13) hide show
  1. package/dist/utils/assertion.d.ts +3 -3
  2. package/dist/utils/pages/view/admin-dashboard.d.ts +1 -1
  3. package/dist/utils/pages/view/agent-desktop.d.ts +1 -1
  4. package/dist/utils/pages/view/base.d.ts +4 -4
  5. package/dist/utils/pages/view/base.js +10 -10
  6. package/dist/utils/pages/view/base.js.map +1 -1
  7. package/dist/utils/pages/view/plugins.d.ts +1 -1
  8. package/dist/utils/pages/view/twilio-console.js +1 -1
  9. package/dist/utils/pages/view/twilio-console.js.map +1 -1
  10. package/dist/utils/spawn.d.ts +1 -1
  11. package/dist/utils/spawn.js +42 -18
  12. package/dist/utils/spawn.js.map +1 -1
  13. package/package.json +5 -5
package/dist/utils/assertion.d.ts CHANGED
@@ -21,15 +21,15 @@ declare const _default: {
21
21
  app: {
22
22
  readonly view: {
23
23
  agentDesktop: {
24
- isVisible: () => Promise<import("puppeteer").ElementHandle<Element>>;
24
+ isVisible: () => Promise<import("puppeteer").ElementHandle<Node | Element>>;
25
25
  };
26
26
  adminDashboard: {
27
- isVisible: () => Promise<import("puppeteer").ElementHandle<Element>>;
27
+ isVisible: () => Promise<import("puppeteer").ElementHandle<Node | Element>>;
28
28
  };
29
29
  twilioConsole: {};
30
30
  plugins: {
31
31
  plugin: {
32
- isVisible: (pluginText: string) => Promise<import("puppeteer").ElementHandle<Element>>;
32
+ isVisible: (pluginText: string) => Promise<import("puppeteer").ElementHandle<Node | Element>>;
33
33
  };
34
34
  };
35
35
  };
package/dist/utils/pages/view/admin-dashboard.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class AdminDashboard extends Base {
6
6
  /**
7
7
  * Checks whether Welcome Banner is visible on Admin Dashboard
8
8
  */
9
- isVisible: () => Promise<ElementHandle<Element>>;
9
+ isVisible: () => Promise<ElementHandle<Element | Node>>;
10
10
  };
11
11
  private readonly _baseUrl;
12
12
  constructor(page: Page, baseUrl: string);
package/dist/utils/pages/view/agent-desktop.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class AgentDesktop extends Base {
6
6
  /**
7
7
  * Checks whether task canvas are visible on the Agent Desktop
8
8
  */
9
- isVisible: () => Promise<ElementHandle<Element>>;
9
+ isVisible: () => Promise<ElementHandle<Element | Node>>;
10
10
  };
11
11
  private readonly _baseUrl;
12
12
  constructor(page: Page, baseUrl: string);
package/dist/utils/pages/view/base.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ElementHandle, Page } from 'puppeteer';
2
2
  export declare abstract class Base {
3
- protected static readonly DEFAULT_LOCATE_TIMEOUT = 60000;
4
- protected static readonly DEFAULT_PAGE_LOAD_TIMEOUT = 60000;
3
+ protected static readonly DEFAULT_LOCATE_TIMEOUT = 600000;
4
+ protected static readonly DEFAULT_PAGE_LOAD_TIMEOUT = 600000;
5
5
  protected readonly page: Page;
6
6
  constructor(page: Page);
7
7
  /**
@@ -18,7 +18,7 @@ export declare abstract class Base {
18
18
  * @param element
19
19
  * @param elementName
20
20
  */
21
- protected getText(element: ElementHandle<Element>, elementName: string): Promise<string>;
21
+ protected getText(element: ElementHandle<Node>, elementName: string): Promise<string>;
22
22
  /**
23
23
  * Input value into an element
24
24
  * @param element
@@ -36,5 +36,5 @@ export declare abstract class Base {
36
36
  * @param elementName name of the searchable element
37
37
  * @param timeout time to wait for until element is visible in the UI
38
38
  */
39
- protected elementVisible(seletor: string, elementName: string, timeout?: number): Promise<ElementHandle<Element>>;
39
+ protected elementVisible(seletor: string, elementName: string, timeout?: number): Promise<ElementHandle<Node | Element>>;
40
40
  }
package/dist/utils/pages/view/base.js CHANGED
@@ -54,7 +54,7 @@ var Base = /** @class */ (function () {
54
54
  switch (_b.label) {
55
55
  case 0:
56
56
  fullPath = path ? baseUrl + "/" + path : baseUrl;
57
- return [4 /*yield*/, this.page.goto(fullPath, { waitUntil: 'load', timeout: 60000 })];
57
+ return [4 /*yield*/, this.page.goto(fullPath, { waitUntil: 'load', timeout: Base.DEFAULT_PAGE_LOAD_TIMEOUT })];
58
58
  case 1:
59
59
  _b.sent();
60
60
  return [2 /*return*/];
@@ -139,22 +139,22 @@ var Base = /** @class */ (function () {
139
139
  Base.prototype.elementVisible = function (seletor, elementName, timeout) {
140
140
  if (timeout === void 0) { timeout = Base.DEFAULT_LOCATE_TIMEOUT; }
141
141
  return __awaiter(this, void 0, void 0, function () {
142
- var waitOptions, element, _a;
143
- return __generator(this, function (_b) {
144
- switch (_b.label) {
142
+ var waitOptions, element;
143
+ return __generator(this, function (_a) {
144
+ switch (_a.label) {
145
145
  case 0:
146
146
  waitOptions = { timeout: timeout };
147
147
  if (!seletor.startsWith('//')) return [3 /*break*/, 2];
148
148
  return [4 /*yield*/, this.page.waitForXPath(seletor, waitOptions)];
149
149
  case 1:
150
- _a = _b.sent();
150
+ element = _a.sent();
151
151
  return [3 /*break*/, 4];
152
152
  case 2: return [4 /*yield*/, this.page.waitForSelector(seletor, waitOptions)];
153
153
  case 3:
154
- _a = _b.sent();
155
- _b.label = 4;
154
+ // @ts-ignore
155
+ element = _a.sent();
156
+ _a.label = 4;
156
157
  case 4:
157
- element = _a;
158
158
  if (!element) {
159
159
  throw new Error("Element: " + elementName + " is not visible in the UI");
160
160
  }
@@ -163,8 +163,8 @@ var Base = /** @class */ (function () {
163
163
  });
164
164
  });
165
165
  };
166
- Base.DEFAULT_LOCATE_TIMEOUT = 60000;
167
- Base.DEFAULT_PAGE_LOAD_TIMEOUT = 60000;
166
+ Base.DEFAULT_LOCATE_TIMEOUT = 600000;
167
+ Base.DEFAULT_PAGE_LOAD_TIMEOUT = 600000;
168
168
  return Base;
169
169
  }());
170
170
  exports.Base = Base;
package/dist/utils/pages/view/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/utils/pages/view/base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IAOE,cAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACa,mBAAI,GAApB,UAAqB,EAAqD;YAAnD,OAAO,aAAA,EAAE,IAAI,UAAA;;;;;;wBAC5B,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAI,OAAO,SAAI,IAAM,CAAC,CAAC,CAAC,OAAO,CAAC;wBACvD,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAA;;wBAArE,SAAqE,CAAC;;;;;KACvE;IAED;;;;OAIG;IACa,sBAAO,GAAvB,UAAwB,OAA+B,EAAE,WAAmB;;;;;4BAC7D,qBAAM,OAAO,CAAC,QAAQ,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,WAAW,EAAd,CAAc,CAAC,EAAA;;wBAArD,IAAI,GAAG,SAA8C;wBAE3D,IAAI,CAAC,IAAI,EAAE;4BACT,MAAM,IAAI,KAAK,CAAI,WAAW,+BAA4B,CAAC,CAAC;yBAC7D;wBAED,sBAAO,IAAI,EAAC;;;;KACb;IAED;;;;OAIG;IACa,wBAAS,GAAzB,UAA0B,QAAgB,EAAE,KAAa;;;;;4BACvC,qBAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;wBAApE,OAAO,GAAG,SAA0D;6BACtE,OAAO,EAAP,wBAAO;wBACT,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAA;;wBAArC,SAAqC,CAAC;;4BAEtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;;;;;KAEhE;IAED;;;OAGG;IACa,oBAAK,GAArB,UAAsB,QAAgB;;;;;4BACpB,qBAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;wBAApE,OAAO,GAAG,SAA0D;6BACtE,OAAO,EAAP,wBAAO;wBACT,qBAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;4BAEhC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;;;;;KAEnE;IAED;;;;;OAKG;IACa,6BAAc,GAA9B,UACE,OAAe,EACf,WAAmB,EACnB,OAAqC;QAArC,wBAAA,EAAA,UAAU,IAAI,CAAC,sBAAsB;;;;;;wBAE/B,WAAW,GAAG,EAAE,OAAO,SAAA,EAAE,CAAC;6BAGhB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAxB,wBAAwB;wBACpC,qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAAlD,KAAA,SAAkD,CAAA;;4BAClD,qBAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAArD,KAAA,SAAqD,CAAA;;;wBAFnD,OAAO,KAE4C;wBAEzD,IAAI,CAAC,OAAO,EAAE;4BACZ,MAAM,IAAI,KAAK,CAAC,cAAY,WAAW,8BAA2B,CAAC,CAAC;yBACrE;wBACD,sBAAO,OAAO,EAAC;;;;KAChB;IApFyB,2BAAsB,GAAG,KAAK,CAAC;IAE/B,8BAAyB,GAAG,KAAK,CAAC;IAmF9D,WAAC;CAAA,AAtFD,IAsFC;AAtFqB,oBAAI"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/utils/pages/view/base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IAOE,cAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACa,mBAAI,GAApB,UAAqB,EAAqD;YAAnD,OAAO,aAAA,EAAE,IAAI,UAAA;;;;;;wBAC5B,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAI,OAAO,SAAI,IAAM,CAAC,CAAC,CAAC,OAAO,CAAC;wBACvD,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB,EAAE,CAAC,EAAA;;wBAA9F,SAA8F,CAAC;;;;;KAChG;IAED;;;;OAIG;IACa,sBAAO,GAAvB,UAAwB,OAA4B,EAAE,WAAmB;;;;;4BAC1D,qBAAM,OAAO,CAAC,QAAQ,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,WAAW,EAAd,CAAc,CAAC,EAAA;;wBAArD,IAAI,GAAG,SAA8C;wBAE3D,IAAI,CAAC,IAAI,EAAE;4BACT,MAAM,IAAI,KAAK,CAAI,WAAW,+BAA4B,CAAC,CAAC;yBAC7D;wBAED,sBAAO,IAAI,EAAC;;;;KACb;IAED;;;;OAIG;IACa,wBAAS,GAAzB,UAA0B,QAAgB,EAAE,KAAa;;;;;4BACvC,qBAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;wBAApE,OAAO,GAAG,SAA0D;6BACtE,OAAO,EAAP,wBAAO;wBACT,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAA;;wBAArC,SAAqC,CAAC;;4BAEtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;;;;;KAEhE;IAED;;;OAGG;IACa,oBAAK,GAArB,UAAsB,QAAgB;;;;;4BACpB,qBAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;wBAApE,OAAO,GAAG,SAA0D;6BACtE,OAAO,EAAP,wBAAO;wBACT,qBAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;4BAEhC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;;;;;KAEnE;IAED;;;;;OAKG;IACa,6BAAc,GAA9B,UACE,OAAe,EACf,WAAmB,EACnB,OAAqC;QAArC,wBAAA,EAAA,UAAU,IAAI,CAAC,sBAAsB;;;;;;wBAE/B,WAAW,GAAG,EAAE,OAAO,SAAA,EAAE,CAAC;6BAI5B,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAxB,wBAAwB;wBAChB,qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAA5D,OAAO,GAAG,SAAkD,CAAC;;4BAGnD,qBAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;wBAD/D,aAAa;wBACb,OAAO,GAAG,SAAqD,CAAC;;;wBAGlE,IAAI,CAAC,OAAO,EAAE;4BACZ,MAAM,IAAI,KAAK,CAAC,cAAY,WAAW,8BAA2B,CAAC,CAAC;yBACrE;wBACD,sBAAO,OAAO,EAAC;;;;KAChB;IAxFyB,2BAAsB,GAAG,MAAM,CAAC;IAEhC,8BAAyB,GAAG,MAAM,CAAC;IAuF/D,WAAC;CAAA,AA1FD,IA0FC;AA1FqB,oBAAI"}
package/dist/utils/pages/view/plugins.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare class Plugins extends Base {
14
14
  * Checks whether plugin with the given text is visible in the UI
15
15
  * @param pluginText
16
16
  */
17
- isVisible: (pluginText: string) => Promise<ElementHandle<Element>>;
17
+ isVisible: (pluginText: string) => Promise<ElementHandle<Element | Node>>;
18
18
  };
19
19
  };
20
20
  private readonly _baseUrl;
package/dist/utils/pages/view/twilio-console.js CHANGED
@@ -117,7 +117,7 @@ var TwilioConsole = /** @class */ (function (_super) {
117
117
  TwilioConsole._loginForm = '#email';
118
118
  TwilioConsole._password = '#password';
119
119
  TwilioConsole._nextBtn = '#email-next';
120
- TwilioConsole._loginBtn = '._button-login-password';
120
+ TwilioConsole._loginBtn = 'button[type=submit]';
121
121
  /**
122
122
  * Creates a localhost url
123
123
  * @param port
package/dist/utils/pages/view/twilio-console.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"twilio-console.js","sourceRoot":"","sources":["../../../../src/utils/pages/view/twilio-console.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+BAA8B;AAE9B,sCAA2C;AAC3C,uCAAqC;AAErC;IAAmC,iCAAI;IAerC,uBAAY,IAAU,EAAE,EAAgE;YAA9D,IAAI,UAAA,EAAE,aAAa,mBAAA;QAA7C,YACE,kBAAM,IAAI,CAAC,SAGZ;QAVD,YAAM,GAAG,EAAE,CAAC;QAQV,KAAI,CAAC,QAAQ,GAAG,aAAa,CAAC;QAC9B,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;;IAC3B,CAAC;IAQD;;;;;;OAMG;IACG,6BAAK,GAAX,UACE,OAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,aAAqB,EACrB,SAAyB;QAAzB,0BAAA,EAAA,gBAAyB;;;;;;wBAEnB,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;4BACzD,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,aAAa,CAAC;4BAClD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;wBAChB,IAAI,GAAG,gCAA8B,UAAU,gBAAW,QAAQ,iBAAY,WAAa,CAAC;wBAElG,qBAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,MAAA,EAAE,CAAC,EAAA;;wBAAjD,SAAiD,CAAC;6BAE9C,SAAS,EAAT,wBAAS;wBACX,qBAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,UAAU,EAAE,6BAA6B,CAAC,EAAA;;wBAAlF,SAAkF,CAAC;wBACnF,qBAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,iBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAA;;wBAAhF,SAAgF,CAAC;wBACjF,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;wBACzC,qBAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,iBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAA;;wBAAlF,SAAkF,CAAC;wBACnF,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;wBAAzC,SAAyC,CAAC;wBAC1C,qBAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;4BAGvC,qBAAM,cAAK,CAAC,KAAK,CAAC,EAAA;;wBAAlB,SAAkB,CAAC;;;;;KACpB;IAzDc,wBAAU,GAAG,QAAQ,CAAC;IAEtB,uBAAS,GAAG,WAAW,CAAC;IAExB,sBAAQ,GAAG,aAAa,CAAC;IAEzB,uBAAS,GAAG,yBAAyB,CAAC;IAcrD;;;OAGG;IACY,iCAAmB,GAAG,UAAC,IAAY,IAAK,OAAA,sBAAoB,IAAI,mBAAc,IAAM,EAA5C,CAA4C,CAAC;IAkCtG,oBAAC;CAAA,AA3DD,CAAmC,WAAI,GA2DtC;AA3DY,sCAAa"}
1
+ {"version":3,"file":"twilio-console.js","sourceRoot":"","sources":["../../../../src/utils/pages/view/twilio-console.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+BAA8B;AAE9B,sCAA2C;AAC3C,uCAAqC;AAErC;IAAmC,iCAAI;IAerC,uBAAY,IAAU,EAAE,EAAgE;YAA9D,IAAI,UAAA,EAAE,aAAa,mBAAA;QAA7C,YACE,kBAAM,IAAI,CAAC,SAGZ;QAVD,YAAM,GAAG,EAAE,CAAC;QAQV,KAAI,CAAC,QAAQ,GAAG,aAAa,CAAC;QAC9B,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;;IAC3B,CAAC;IAQD;;;;;;OAMG;IACG,6BAAK,GAAX,UACE,OAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,aAAqB,EACrB,SAAyB;QAAzB,0BAAA,EAAA,gBAAyB;;;;;;wBAEnB,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;4BACzD,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,aAAa,CAAC;4BAClD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;wBAChB,IAAI,GAAG,gCAA8B,UAAU,gBAAW,QAAQ,iBAAY,WAAa,CAAC;wBAElG,qBAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,MAAA,EAAE,CAAC,EAAA;;wBAAjD,SAAiD,CAAC;6BAE9C,SAAS,EAAT,wBAAS;wBACX,qBAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,UAAU,EAAE,6BAA6B,CAAC,EAAA;;wBAAlF,SAAkF,CAAC;wBACnF,qBAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,iBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAA;;wBAAhF,SAAgF,CAAC;wBACjF,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;wBACzC,qBAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,iBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAA;;wBAAlF,SAAkF,CAAC;wBACnF,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;wBAAzC,SAAyC,CAAC;wBAC1C,qBAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;4BAGvC,qBAAM,cAAK,CAAC,KAAK,CAAC,EAAA;;wBAAlB,SAAkB,CAAC;;;;;KACpB;IAzDc,wBAAU,GAAG,QAAQ,CAAC;IAEtB,uBAAS,GAAG,WAAW,CAAC;IAExB,sBAAQ,GAAG,aAAa,CAAC;IAEzB,uBAAS,GAAG,qBAAqB,CAAC;IAcjD;;;OAGG;IACY,iCAAmB,GAAG,UAAC,IAAY,IAAK,OAAA,sBAAoB,IAAI,mBAAc,IAAM,EAA5C,CAA4C,CAAC;IAkCtG,oBAAC;CAAA,AA3DD,CAAmC,WAAI,GA2DtC;AA3DY,sCAAa"}
package/dist/utils/spawn.d.ts CHANGED
@@ -22,5 +22,5 @@ export declare const logResult: (result: SpawnResult) => void;
22
22
  * @param child child process to kill
23
23
  * @param os operating system
24
24
  */
25
- export declare const killChildProcess: (child: ChildProcessWithoutNullStreams | undefined, os: string) => Promise<void>;
25
+ export declare const killChildProcess: (child: ChildProcessWithoutNullStreams | undefined, os: string, retry?: number) => Promise<void>;
26
26
  export {};
package/dist/utils/spawn.js CHANGED
@@ -147,24 +147,48 @@ exports.logResult = logResult;
147
147
  * @param child child process to kill
148
148
  * @param os operating system
149
149
  */
150
- var killChildProcess = function (child, os) { return __awaiter(void 0, void 0, void 0, function () {
151
- return __generator(this, function (_a) {
152
- switch (_a.label) {
153
- case 0:
154
- if (!child) {
155
- throw new Error('Could not kill child process, process does not exist');
156
- }
157
- if (!(os === 'win32')) return [3 /*break*/, 2];
158
- return [4 /*yield*/, exports.promisifiedSpawn('taskkill', ['/pid', "" + child.pid, '/f', '/t'])];
159
- case 1:
160
- _a.sent();
161
- return [3 /*break*/, 3];
162
- case 2:
163
- child.kill();
164
- _a.label = 3;
165
- case 3: return [2 /*return*/];
166
- }
150
+ var killChildProcess = function (child, os, retry) {
151
+ if (retry === void 0) { retry = 2; }
152
+ return __awaiter(void 0, void 0, void 0, function () {
153
+ var e_1;
154
+ return __generator(this, function (_a) {
155
+ switch (_a.label) {
156
+ case 0:
157
+ if (!child) {
158
+ throw new Error('Could not kill child process, process does not exist');
159
+ }
160
+ if (!(os === 'win32')) return [3 /*break*/, 9];
161
+ _a.label = 1;
162
+ case 1:
163
+ _a.trys.push([1, 5, , 8]);
164
+ if (!(retry !== 2)) return [3 /*break*/, 3];
165
+ flex_dev_utils_1.logger.error("Checking current status of process " + child.pid);
166
+ return [4 /*yield*/, exports.promisifiedSpawn('tasklist', ['/v', '/fi', "\"PID eq " + child.pid + "\""])];
167
+ case 2:
168
+ _a.sent();
169
+ _a.label = 3;
170
+ case 3: return [4 /*yield*/, exports.promisifiedSpawn('taskkill', ['/pid', "" + child.pid, '/f', '/t'])];
171
+ case 4:
172
+ _a.sent();
173
+ return [3 /*break*/, 8];
174
+ case 5:
175
+ e_1 = _a.sent();
176
+ flex_dev_utils_1.logger.error("Error killing the process: " + e_1 + "}");
177
+ if (!(retry > 0)) return [3 /*break*/, 7];
178
+ flex_dev_utils_1.logger.info('Retrying to kill the process');
179
+ return [4 /*yield*/, exports.killChildProcess(child, os, retry - 1)];
180
+ case 6:
181
+ _a.sent();
182
+ _a.label = 7;
183
+ case 7: return [3 /*break*/, 8];
184
+ case 8: return [3 /*break*/, 10];
185
+ case 9:
186
+ child.kill();
187
+ _a.label = 10;
188
+ case 10: return [2 /*return*/];
189
+ }
190
+ });
167
191
  });
168
- }); };
192
+ };
169
193
  exports.killChildProcess = killChildProcess;
170
194
  //# sourceMappingURL=spawn.js.map
package/dist/utils/spawn.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/utils/spawn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/utils/spawn.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@twilio/flex-plugin-e2e-tests",
3
- "version": "6.1.3-alpha.202309260818",
3
+ "version": "6.1.3-alpha.202401300747",
4
4
  "description": "Flex Plugin E2E Tests framework",
5
5
  "keywords": [
6
6
  "flex",
@@ -34,12 +34,12 @@
34
34
  "test": "exit 0"
35
35
  },
36
36
  "dependencies": {
37
- "@twilio/flex-dev-utils": "6.1.3-alpha.202309260818",
38
- "@twilio/flex-plugins-api-client": "6.1.3-alpha.202309260818",
37
+ "@twilio/flex-dev-utils": "6.1.3-alpha.202401300747",
38
+ "@twilio/flex-plugins-api-client": "6.1.3-alpha.202401300747",
39
39
  "axios": "^0.24.0",
40
40
  "lodash": "4.17.21",
41
41
  "package-json": "^7.0.0",
42
- "puppeteer": "^10.4.0",
42
+ "puppeteer": "^19.2.2",
43
43
  "replace-in-file": "^6.3.2",
44
44
  "semver": "^7.3.5"
45
45
  },
@@ -53,5 +53,5 @@
53
53
  "publishConfig": {
54
54
  "access": "public"
55
55
  },
56
- "gitHead": "b08c299ff50664a76e4bafcae95952deebf29894"
56
+ "gitHead": "453cae1d48c873a92394f2559b51f0eb6b00af23"
57
57
  }