oxygen-cli 1.33.4 → 1.33.5
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.
package/CHANGELOG.md
CHANGED
|
@@ -53,8 +53,15 @@ async function waitForAngular(rootSelector, softWait = false, timeout = 60 * 100
|
|
|
53
53
|
return testable;
|
|
54
54
|
} else {
|
|
55
55
|
const stable = await this.driver.execute(() => {
|
|
56
|
-
// following way of obtaining testability is the same as using: var testability = window.getAllAngularTestabilities()[0];
|
|
57
56
|
// eslint-disable-next-line no-undef
|
|
57
|
+
if (!window.getAllAngularRootElements && window !== window.parent) {
|
|
58
|
+
// if we are running inside iframe where getAllAngularRootElements is not unavailable
|
|
59
|
+
// we return true
|
|
60
|
+
return true;
|
|
61
|
+
} // following way of obtaining testability is the same as using: var testability = window.getAllAngularTestabilities()[0];
|
|
62
|
+
// eslint-disable-next-line no-undef
|
|
63
|
+
|
|
64
|
+
|
|
58
65
|
const rootElement = window.getAllAngularRootElements()[0]; // eslint-disable-next-line no-undef
|
|
59
66
|
|
|
60
67
|
const testability = window.getAngularTestability(rootElement); // use isStable instead of whenStable due to this issue:
|
|
@@ -62,19 +69,11 @@ async function waitForAngular(rootSelector, softWait = false, timeout = 60 * 100
|
|
|
62
69
|
|
|
63
70
|
return testability.isStable();
|
|
64
71
|
});
|
|
65
|
-
|
|
66
|
-
// eslint-disable-next-line no-undef
|
|
67
|
-
const el = document.querySelector('[ng-version]');
|
|
68
|
-
|
|
69
|
-
if (!el) {
|
|
70
|
-
return null;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
return el.getAttribute('ng-version');
|
|
74
|
-
});
|
|
75
|
-
return version && stable;
|
|
72
|
+
return stable;
|
|
76
73
|
}
|
|
77
|
-
} catch (err) {
|
|
74
|
+
} catch (err) {
|
|
75
|
+
// if we got here then it's executeAsync timeout
|
|
76
|
+
console.log('executeAsync err', err);
|
|
78
77
|
}
|
|
79
78
|
}, {
|
|
80
79
|
timeout: timeout,
|
|
@@ -86,4 +85,4 @@ async function waitForAngular(rootSelector, softWait = false, timeout = 60 * 100
|
|
|
86
85
|
}
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../../src/ox_modules/module-web/commands/waitForAngular.js"],"names":["waitForAngular","rootSelector","softWait","timeout","helpers","assertArgumentTimeout","driver","waitUntil","angular1","execute","window","angular","assertArgumentString","testable","rootElement","element","testability","getTestability","isStable","stable","getAllAngularRootElements","parent","getAngularTestability","err","console","log","timeoutMsg","e","OxError","errHelper","errorCode","TIMEOUT","message"],"mappings":";;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEO,eAAeA,cAAf,CAA8BC,YAA9B,EAA4CC,QAAQ,GAAG,KAAvD,EAA8DC,OAAO,GAAG,KAAG,IAA3E,EAAiF;AACpF,OAAKC,OAAL,CAAaC,qBAAb,CAAmCF,OAAnC,EAA4C,SAA5C;;AAEA,MAAI;AACA,UAAM,KAAKG,MAAL,CAAYC,SAAZ,CAAsB,YAAY;AACpC,UAAI;AAEA;AACA;AACA,cAAMC,QAAQ,GAAG,MAAM,KAAKF,MAAL,CAAYG,OAAZ,CAAoB,MAAM;AAC7C;AACA,iBAAO,CAAC,CAACC,MAAM,CAACC,OAAhB;AACH,SAHsB,CAAvB;;AAKA,YAAIH,QAAJ,EAAc;AACV,eAAKJ,OAAL,CAAaQ,oBAAb,CAAkCX,YAAlC,EAAgD,cAAhD;AACA,gBAAMY,QAAQ,GAAG,MAAM,KAAKP,MAAL,CAAYG,OAAZ,CAAqBR,YAAD,IAAkB;AACzD;AACA,kBAAMa,WAAW,GAAGJ,MAAM,CAACC,OAAP,CAAeI,OAAf,CAAuBd,YAAvB,CAApB,CAFyD,CAGzD;;AACA,kBAAMe,WAAW,GAAGN,MAAM,CAACC,OAAP,CAAeM,cAAf,CAA8BH,WAA9B,CAApB;AACA,mBAAOE,WAAW,CAACE,QAAZ,EAAP;AACH,WANsB,EAMpBjB,YANoB,CAAvB;AAQA,iBAAOY,QAAP;AACH,SAXD,MAWO;AACH,gBAAMM,MAAM,GAAG,MAAM,KAAKb,MAAL,CAAYG,OAAZ,CAAoB,MAAM;AAC3C;AACA,gBAAI,CAACC,MAAM,CAACU,yBAAR,IAAqCV,MAAM,KAAKA,MAAM,CAACW,MAA3D,EAAmE;AACjE;AACA;AACE,qBAAO,IAAP;AACH,aAN0C,CAQ3C;AACA;;;AACA,kBAAMP,WAAW,GAAGJ,MAAM,CAACU,yBAAP,GAAmC,CAAnC,CAApB,CAV2C,CAW1C;;AACD,kBAAMJ,WAAW,GAAGN,MAAM,CAACY,qBAAP,CAA6BR,WAA7B,CAApB,CAZ2C,CAa3C;AACA;;AACA,mBAAOE,WAAW,CAACE,QAAZ,EAAP;AACH,WAhBoB,CAArB;AAkBA,iBAAOC,MAAP;AACH;AACJ,OAzCD,CAyCE,OAAOI,GAAP,EAAY;AACV;AACAC,QAAAA,OAAO,CAACC,GAAR,CAAY,kBAAZ,EAAgCF,GAAhC;AACH;AACJ,KA9CK,EA8CJ;AACEpB,MAAAA,OAAO,EAAEA,OADX;AAEEuB,MAAAA,UAAU,EAAG,qCAAoCvB,OAAQ;AAF3D,KA9CI,CAAN;AAkDH,GAnDD,CAmDE,OAAOwB,CAAP,EAAU;AACR,QAAI,CAACzB,QAAL,EAAe;AACX,YAAM,IAAI,KAAK0B,OAAT,CAAiB,KAAKC,SAAL,CAAeC,SAAf,CAAyBC,OAA1C,EAAmDJ,CAAC,CAACK,OAArD,CAAN;AACH;AACJ;AACJ","sourcesContent":["/*\r\n * Copyright (C) 2015-present CloudBeat Limited\r\n *\r\n * This program is free software: you can redistribute it and/or modify\r\n * it under the terms of the GNU General Public License as published by\r\n * the Free Software Foundation, either version 3 of the License, or\r\n * (at your option) any later version.\r\n */\r\n\r\n/**\r\n * @summary Wait for Angular based app will be loaded\r\n * @function waitForAngular\r\n * @param {String=} rootSelector - Selector for root element, needed only for AngularJS (v1). \r\n *                                 In Angular (v2) first available root node will be selected automatically.\r\n * @param {Boolean=} softWait - If true then do not produce error if stability cannot be attained. Default is false.\r\n * @param {Number=} timeout - Timeout in milliseconds. Default is 60 seconds.\r\n * @example <caption>[javascript] Usage example</caption>\r\n * web.init();\r\n * web.open(\"www.yourwebsite.com\");\r\n * web.waitForAngular();\r\n */\r\n\r\nexport async function waitForAngular(rootSelector, softWait = false, timeout = 60*1000) {\r\n    this.helpers.assertArgumentTimeout(timeout, 'timeout');\r\n\r\n    try {\r\n        await this.driver.waitUntil(async () => {\r\n            try {\r\n\r\n                // in AngularJS (v1) window.angular will be defined \r\n                // in Angular (v2) window.angular will be undefined\r\n                const angular1 = await this.driver.execute(() => {\r\n                    // eslint-disable-next-line no-undef\r\n                    return !!window.angular;\r\n                });\r\n\r\n                if (angular1) {\r\n                    this.helpers.assertArgumentString(rootSelector, 'rootSelector');\r\n                    const testable = await this.driver.execute((rootSelector) => {\r\n                        // eslint-disable-next-line no-undef\r\n                        const rootElement = window.angular.element(rootSelector);\r\n                        // eslint-disable-next-line no-undef\r\n                        const testability = window.angular.getTestability(rootElement);\r\n                        return testability.isStable();\r\n                    }, rootSelector);\r\n\r\n                    return testable;\r\n                } else {\r\n                    const stable = await this.driver.execute(() => {\r\n                        // eslint-disable-next-line no-undef\r\n                        if (!window.getAllAngularRootElements && window !== window.parent) {\r\n                          // if we are running inside iframe where getAllAngularRootElements is not unavailable\r\n                          // we return true\r\n                            return true;\r\n                        }\r\n\r\n                        // following way of obtaining testability is the same as using: var testability = window.getAllAngularTestabilities()[0];\r\n                        // eslint-disable-next-line no-undef\r\n                        const rootElement = window.getAllAngularRootElements()[0];\r\n                         // eslint-disable-next-line no-undef\r\n                        const testability = window.getAngularTestability(rootElement);\r\n                        // use isStable instead of whenStable due to this issue:\r\n                        // https://stackoverflow.com/questions/54509647/testability-whenstable-returns-testability-isstable-returns-false\r\n                        return testability.isStable();\r\n                    });\r\n\r\n                    return stable;\r\n                }\r\n            } catch (err) {\r\n                // if we got here then it's executeAsync timeout\r\n                console.log('executeAsync err', err);\r\n            }\r\n        },{\r\n            timeout: timeout,\r\n            timeoutMsg: `Unable to attain stability within ${timeout}ms (or this is not an Angular application)`\r\n        });\r\n    } catch (e) {\r\n        if (!softWait) {\r\n            throw new this.OxError(this.errHelper.errorCode.TIMEOUT, e.message);\r\n        }\r\n    }\r\n}"]}
|