You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2020/12/08 21:39:01 UTC
[myfaces-tobago] branch master updated (ac07392 -> aacd962)
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from ac07392 fix CVE in tomcat-spring-boot-starter
new 657a299 replace outdated testFrameQuerySelectorFn with querySelectorFn
new aacd962 remove QUnit
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../20-component/010-input/10-in/In.test.js | 6 +-
.../010-input/20-suggest/Suggest.test.js | 26 +-
.../20-component/010-input/40-date/Date.test.js | 49 +-
.../010-input/50-input-group/Group.test.js | 36 +-
.../10-selectBooleanCheckbox/Checkbox.test.js | 56 +-
.../15-selectBooleanToggle/Toggle.test.js | 55 +-
.../030-select/20-selectOneChoice/Dropdown.test.js | 43 +-
.../030-select/40-selectOneListbox/Listbox.test.js | 35 +-
.../50-selectManyCheckbox/Multi_Checkbox.test.js | 36 +-
.../70-selectManyShuttle/Shuttle.test.js | 41 +-
.../content/20-component/060-popup/Popup.test.js | 85 +-
.../content/20-component/070-tab/Tab_Group.test.js | 29 +-
.../080-sheet/70-tree/Sheet_Tree.test.js | 28 +-
.../090-tree/00-command/Tree_Command_Types.test.js | 20 +-
.../090-tree/01-select/Tree_Select.test.js | 74 +-
.../10-collapsible-popup/Collapsible_Popup.test.js | 10 +
.../15-suggest-method/Suggest_Method.test.js | 20 +-
.../1020-suggest-quotMark/Suggest_QuotMark.test.js | 18 +-
.../webapp/content/40-test/1040-date/Date.test.js | 20 +-
.../40-test/1041-date-pattern/Date_Pattern.test.js | 14 +-
.../Date_TobagoConverter.test.js | 104 +-
.../4050-ajax-dropdown/Ajax_Dropdown.test.js | 22 +-
.../40-test/4000-button-link/Button_Link.test.js | 45 +-
.../100-auto-column/Auto-Column.test.js | 16 +-
.../4600-gridLayout/90-style-tag/Style_Tag.test.js | 16 +-
.../100-id-markup/Id_Markup.test.js | 31 +-
.../4810-labelLayoutTop/LabelLayoutTop.test.js | 16 +-
.../content/40-test/4950-severity/Severity.test.js | 29 +-
.../20-ajax-execute/Ajax_Execute.test.js | 25 +-
.../Composite_Components.test.js | 38 +-
.../content/40-test/6000-event/Event.test.js | 44 +-
.../content/40-test/6500-behavior/Behavior.test.js | 70 +-
.../src/main/webapp/script/qunit-2.9.2.js | 6604 --------------------
.../src/main/webapp/script/tobago-test.js | 56 +-
.../tobago-example-demo/src/main/webapp/test.xhtml | 4 -
35 files changed, 720 insertions(+), 7101 deletions(-)
delete mode 100644 tobago-example/tobago-example-demo/src/main/webapp/script/qunit-2.9.2.js
[myfaces-tobago] 01/02: replace outdated testFrameQuerySelectorFn
with querySelectorFn
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 657a29994796462efedab91890b9d4e4adbcb792
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Tue Dec 8 13:00:09 2020 +0100
replace outdated testFrameQuerySelectorFn with querySelectorFn
---
.../20-component/010-input/10-in/In.test.js | 6 +-
.../010-input/20-suggest/Suggest.test.js | 16 ++--
.../20-component/010-input/40-date/Date.test.js | 40 ++++-----
.../010-input/50-input-group/Group.test.js | 26 +++---
.../10-selectBooleanCheckbox/Checkbox.test.js | 46 +++++------
.../15-selectBooleanToggle/Toggle.test.js | 46 +++++------
.../030-select/20-selectOneChoice/Dropdown.test.js | 34 ++++----
.../030-select/40-selectOneListbox/Listbox.test.js | 26 +++---
.../50-selectManyCheckbox/Multi_Checkbox.test.js | 26 +++---
.../70-selectManyShuttle/Shuttle.test.js | 32 ++++----
.../content/20-component/060-popup/Popup.test.js | 76 ++++++++---------
.../content/20-component/070-tab/Tab_Group.test.js | 20 ++---
.../080-sheet/70-tree/Sheet_Tree.test.js | 28 +++----
.../090-tree/00-command/Tree_Command_Types.test.js | 10 +--
.../090-tree/01-select/Tree_Select.test.js | 64 +++++++--------
.../15-suggest-method/Suggest_Method.test.js | 10 +--
.../1020-suggest-quotMark/Suggest_QuotMark.test.js | 8 +-
.../webapp/content/40-test/1040-date/Date.test.js | 10 +--
.../Date_TobagoConverter.test.js | 94 +++++++++++-----------
.../4050-ajax-dropdown/Ajax_Dropdown.test.js | 12 +--
.../40-test/4000-button-link/Button_Link.test.js | 36 ++++-----
.../100-auto-column/Auto-Column.test.js | 6 +-
.../4600-gridLayout/90-style-tag/Style_Tag.test.js | 6 +-
.../100-id-markup/Id_Markup.test.js | 22 ++---
.../4810-labelLayoutTop/LabelLayoutTop.test.js | 6 +-
.../content/40-test/4950-severity/Severity.test.js | 20 ++---
.../20-ajax-execute/Ajax_Execute.test.js | 16 ++--
.../Composite_Components.test.js | 38 ++++-----
.../content/40-test/6000-event/Event.test.js | 34 ++++----
.../content/40-test/6500-behavior/Behavior.test.js | 60 +++++++-------
.../src/main/webapp/script/tobago-test.js | 18 +----
31 files changed, 440 insertions(+), 452 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
index 8ca212b..eaeacc3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {querySelectorFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn, querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("inputfield with label", function (done) {
- let labelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:iNormal > label");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:iNormal\\:\\:field");
+ let labelFn = querySelectorFn("#page\\:mainForm\\:iNormal > label");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:iNormal\\:\\:field");
const test = new JasmineTestTool(done);
test.do(() => expect(labelFn().textContent).toBe("Input"));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
index f22cab7..2483139 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Basics: 'M'", function (assert) {
@@ -47,7 +47,7 @@ QUnit.test("Basics: 'Mars'", function (assert) {
});
function testMarsBasics(assert, inputString, expectedLength) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
let TTT = new TobagoTestTool(assert);
@@ -66,7 +66,7 @@ function testMarsBasics(assert, inputString, expectedLength) {
}
QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inBasic\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inBasic");
let TTT = new TobagoTestTool(assert);
@@ -93,7 +93,7 @@ QUnit.test("Basics: Add 'eus' and click first entry.", function (assert) {
});
QUnit.test("Advanced: 'C'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
let suggestionDelay = 2000;
@@ -110,7 +110,7 @@ QUnit.test("Advanced: 'C'", function (assert) {
});
QUnit.test("Advanced: 'Ca'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inAdvanced\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inAdvanced");
let suggestionDelay = 2000;
let startTime = Date.now();
@@ -137,7 +137,7 @@ QUnit.test("Advanced: 'Ca'", function (assert) {
});
QUnit.test("Client side: 'Ju'", function (assert) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inClient\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:inClient\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:inClient");
let TTT = new TobagoTestTool(assert);
@@ -158,6 +158,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
index d2afd34..8ecca86 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
function getToday(dateFieldFn) {
@@ -27,10 +27,10 @@ function getToday(dateFieldFn) {
QUnit.test("date with label", function (assert) {
assert.expect(5);
- let labelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal > label");
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dNormal button");
- let dayTodayFn = testFrameQuerySelectorFn(".day.today");
+ let labelFn = querySelectorFn("#page\\:mainForm\\:dNormal > label");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:dNormal\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dNormal button");
+ let dayTodayFn = querySelectorFn(".day.today");
let today = getToday(dateFieldFn);
assert.equal(labelFn().textContent, "Date");
@@ -51,11 +51,11 @@ QUnit.test("date with label", function (assert) {
});
QUnit.test("date+time pattern", function (assert) {
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
- let datepickerFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget");
- let firstLiFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
- let lastLiFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
- let togglePickerButtonFn = testFrameQuerySelectorFn(".bootstrap-datetimepicker-widget .picker-switch a");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dateTimePattern .datepickerbutton");
+ let datepickerFn = querySelectorFn(".bootstrap-datetimepicker-widget");
+ let firstLiFn = querySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:first-child");
+ let lastLiFn = querySelectorFn(".bootstrap-datetimepicker-widget .list-unstyled li:last-child");
+ let togglePickerButtonFn = querySelectorFn(".bootstrap-datetimepicker-widget .picker-switch a");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -81,12 +81,12 @@ QUnit.test("date+time pattern", function (assert) {
});
QUnit.test("submit", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:input button");
- let outFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:output span");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:formSubmit\\:button");
- let widgetFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
- let daysFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget .day");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:input\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:input button");
+ let outFieldFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:output span");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:formSubmit\\:button");
+ let widgetFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let daysFn = querySelectorAllFn(".bootstrap-datetimepicker-widget .day");
let day22 = 0;
let TTT = new TobagoTestTool(assert);
@@ -125,10 +125,10 @@ QUnit.test("submit", function (assert) {
});
QUnit.test("ajax", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxinput button");
- let outFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputfield span");
- let widgetFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:ajaxinput\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:ajaxinput button");
+ let outFieldFn = querySelectorFn("#page\\:mainForm\\:outputfield span");
+ let widgetFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
let today = getToday(dateFieldFn);
let TTT = new TobagoTestTool(assert);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
index dc68d8c..c64bd4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("ajax: chat send button", function (assert) {
- let chatlogFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tachatlog\\:\\:field");
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inewmessage\\:\\:field");
- let sendButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendButton");
+ let chatlogFn = querySelectorFn("#page\\:mainForm\\:tachatlog\\:\\:field");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inewmessage\\:\\:field");
+ let sendButtonFn = querySelectorFn("#page\\:mainForm\\:sendButton");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -44,11 +44,11 @@ QUnit.test("ajax: chat send button", function (assert) {
});
QUnit.test("ajax: dropdown button", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command");
- let buttonLabelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command span");
- let sendToPeterFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToPeter");
- let sendToBobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToBob");
- let sendToAllFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sendToAll");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command");
+ let buttonLabelFn = querySelectorFn("#page\\:mainForm\\:lsendtoc\\:\\:command span");
+ let sendToPeterFn = querySelectorFn("#page\\:mainForm\\:sendToPeter");
+ let sendToBobFn = querySelectorFn("#page\\:mainForm\\:sendToBob");
+ let sendToAllFn = querySelectorFn("#page\\:mainForm\\:sendToAll");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -79,10 +79,10 @@ QUnit.test("ajax: dropdown button", function (assert) {
});
QUnit.test("ajax: currency change event", function (assert) {
- let currencyInputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:value\\:\\:field");
- let currencyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:currency");
- let currencyOptionFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:currency option");
- let outputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:valueInEuro .tobago-out");
+ let currencyInputFn = querySelectorFn("#page\\:mainForm\\:value\\:\\:field");
+ let currencyFn = querySelectorFn("#page\\:mainForm\\:currency");
+ let currencyOptionFn = querySelectorAllFn("#page\\:mainForm\\:currency option");
+ let outputFieldFn = querySelectorFn("#page\\:mainForm\\:valueInEuro .tobago-out");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
index 994ce61..b47584e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select A", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,11 +40,11 @@ QUnit.test("submit: select A", function (assert) {
});
QUnit.test("submit: select B and C", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -61,8 +61,8 @@ QUnit.test("submit: select B and C", function (assert) {
});
QUnit.test("ajax: select D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,8 +77,8 @@ QUnit.test("ajax: select D", function (assert) {
});
QUnit.test("ajax: deselect D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -93,8 +93,8 @@ QUnit.test("ajax: deselect D", function (assert) {
});
QUnit.test("ajax: select E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -109,8 +109,8 @@ QUnit.test("ajax: select E", function (assert) {
});
QUnit.test("ajax: deselect E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -125,8 +125,8 @@ QUnit.test("ajax: deselect E", function (assert) {
});
QUnit.test("ajax: select F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -141,8 +141,8 @@ QUnit.test("ajax: select F", function (assert) {
});
QUnit.test("ajax: deselect F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
index 994ce61..b47584e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select A", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,11 +40,11 @@ QUnit.test("submit: select A", function (assert) {
});
QUnit.test("submit: select B and C", function (assert) {
- let selectAFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectA input");
- let selectBFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectB input");
- let selectCFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectC input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitOutput span");
+ let selectAFn = querySelectorFn("#page\\:mainForm\\:selectA input");
+ let selectBFn = querySelectorFn("#page\\:mainForm\\:selectB input");
+ let selectCFn = querySelectorFn("#page\\:mainForm\\:selectC input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:submitOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -61,8 +61,8 @@ QUnit.test("submit: select B and C", function (assert) {
});
QUnit.test("ajax: select D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,8 +77,8 @@ QUnit.test("ajax: select D", function (assert) {
});
QUnit.test("ajax: deselect D", function (assert) {
- let selectDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectD input");
- let outputDFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputD span");
+ let selectDFn = querySelectorFn("#page\\:mainForm\\:selectD input");
+ let outputDFn = querySelectorFn("#page\\:mainForm\\:outputD span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -93,8 +93,8 @@ QUnit.test("ajax: deselect D", function (assert) {
});
QUnit.test("ajax: select E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -109,8 +109,8 @@ QUnit.test("ajax: select E", function (assert) {
});
QUnit.test("ajax: deselect E", function (assert) {
- let selectEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectE input");
- let outputEFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputE span");
+ let selectEFn = querySelectorFn("#page\\:mainForm\\:selectE input");
+ let outputEFn = querySelectorFn("#page\\:mainForm\\:outputE span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -125,8 +125,8 @@ QUnit.test("ajax: deselect E", function (assert) {
});
QUnit.test("ajax: select F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -141,8 +141,8 @@ QUnit.test("ajax: select F", function (assert) {
});
QUnit.test("ajax: deselect F", function (assert) {
- let selectFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectF input");
- let outputFFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputF span");
+ let selectFFn = querySelectorFn("#page\\:mainForm\\:selectF input");
+ let outputFFn = querySelectorFn("#page\\:mainForm\\:outputF span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
index 9297334..d4e4c56 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: Alice", function (assert) {
- let aliceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
- let bobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputPerson span");
+ let aliceFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
+ let bobFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputPerson span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -38,10 +38,10 @@ QUnit.test("submit: Alice", function (assert) {
});
QUnit.test("submit: Bob", function (assert) {
- let aliceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
- let bobFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputPerson span");
+ let aliceFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Alice']");
+ let bobFn = querySelectorFn("#page\\:mainForm\\:selectPerson\\:\\:field option[value^='Bob']");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputPerson span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -57,10 +57,10 @@ QUnit.test("submit: Bob", function (assert) {
});
QUnit.test("ajax: select Mars", function (assert) {
- let planetFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
- let marsOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
- let jupiterOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
- let moonsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+ let planetFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
+ let marsOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
+ let jupiterOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
+ let moonsFn = querySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -77,10 +77,10 @@ QUnit.test("ajax: select Mars", function (assert) {
});
QUnit.test("ajax: select Jupiter", function (assert) {
- let planetFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
- let marsOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
- let jupiterOptionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
- let moonsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
+ let planetFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field");
+ let marsOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='1']");
+ let jupiterOptionFn = querySelectorFn("#page\\:mainForm\\:selectPlanet\\:\\:field option[value='2']");
+ let moonsFn = querySelectorAllFn("#page\\:mainForm\\:moonbox\\:\\:field option");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
index 6e72010..6d189b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select 'Nile'", function (assert) {
- let riversFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:riverList option");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverSubmit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverOutput span");
+ let riversFn = querySelectorAllFn("#page\\:mainForm\\:riverList option");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:riverSubmit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:riverOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -40,9 +40,9 @@ QUnit.test("submit: select 'Nile'", function (assert) {
});
QUnit.test("submit: select 'Yangtze'", function (assert) {
- let riversFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:riverList option");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverSubmit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:riverOutput span");
+ let riversFn = querySelectorAllFn("#page\\:mainForm\\:riverList option");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:riverSubmit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:riverOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -62,9 +62,9 @@ QUnit.test("submit: select 'Yangtze'", function (assert) {
});
QUnit.test("ajax: select Everest", function (assert) {
- let mountainListFn = testFrameQuerySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
- let mountainsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:mountainList option");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedMountain span");
+ let mountainListFn = querySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
+ let mountainsFn = querySelectorAllFn("#page\\:mainForm\\:mountainList option");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedMountain span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -83,9 +83,9 @@ QUnit.test("ajax: select Everest", function (assert) {
});
QUnit.test("ajax: select Makalu", function (assert) {
- let mountainListFn = testFrameQuerySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
- let mountainsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:mountainList option");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedMountain span");
+ let mountainListFn = querySelectorFn("#page\\:mainForm\\:mountainList\\:\\:field");
+ let mountainsFn = querySelectorAllFn("#page\\:mainForm\\:mountainList option");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedMountain span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
index 19a864f..1da03d0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: select cat", function (assert) {
- let animalsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:animals input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:animalsOutput span");
+ let animalsFn = querySelectorAllFn("#page\\:mainForm\\:animals input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:animalsOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -39,9 +39,9 @@ QUnit.test("submit: select cat", function (assert) {
});
QUnit.test("submit: select fox and rabbit", function (assert) {
- let animalsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:animals input");
- let submitFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:animalsOutput span");
+ let animalsFn = querySelectorAllFn("#page\\:mainForm\\:animals input");
+ let submitFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:animalsOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -59,8 +59,8 @@ QUnit.test("submit: select fox and rabbit", function (assert) {
});
QUnit.test("ajax: click 'Two'", function (assert) {
- let number2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number2Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
@@ -83,8 +83,8 @@ QUnit.test("ajax: click 'Two'", function (assert) {
});
QUnit.test("ajax: click 'Three'", function (assert) {
- let number3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:2");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number3Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:2");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
@@ -107,8 +107,8 @@ QUnit.test("ajax: click 'Three'", function (assert) {
});
QUnit.test("ajax: click 'Two'", function (assert) {
- let number2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:resultOutput span");
+ let number2Fn = querySelectorFn("#page\\:mainForm\\:numbers\\:\\:1");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:resultOutput span");
let newOutputValue;
let TTT = new TobagoTestTool(assert);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
index 1593716..727c6ba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("submit: addAll, removeAll, addItem0to4, removeItem2to3", function (assert) {
- let unselectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:unselected option");
- let selectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:selected option");
- let addAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:addAll");
- let addButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:add");
- let removeButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:remove");
- let removeAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExample\\:\\:removeAll");
- let submitButton = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
- let output = testFrameQuerySelectorFn("#page\\:mainForm\\:submitExampleOutput span");
+ let unselectedOptions = querySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:unselected option");
+ let selectedOptions = querySelectorAllFn("#page\\:mainForm\\:submitExample\\:\\:selected option");
+ let addAllButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:addAll");
+ let addButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:add");
+ let removeButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:remove");
+ let removeAllButton = querySelectorFn("#page\\:mainForm\\:submitExample\\:\\:removeAll");
+ let submitButton = querySelectorFn("#page\\:mainForm\\:submitButton");
+ let output = querySelectorFn("#page\\:mainForm\\:submitExampleOutput span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -80,13 +80,13 @@ QUnit.test("submit: addAll, removeAll, addItem0to4, removeItem2to3", function (a
});
QUnit.test("ajax: addAll, removeAll, addItem1to2, removeItem0", function (assert) {
- let unselectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:unselected option");
- let selectedOptions = testFrameQuerySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:selected option");
- let addAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:addAll");
- let addButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:add");
- let removeButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:remove");
- let removeAllButton = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:removeAll");
- let output = testFrameQuerySelectorFn("#page\\:mainForm\\:outputStars span");
+ let unselectedOptions = querySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:unselected option");
+ let selectedOptions = querySelectorAllFn("#page\\:mainForm\\:ajaxExample\\:\\:selected option");
+ let addAllButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:addAll");
+ let addButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:add");
+ let removeButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:remove");
+ let removeAllButton = querySelectorFn("#page\\:mainForm\\:ajaxExample\\:\\:removeAll");
+ let output = querySelectorFn("#page\\:mainForm\\:outputStars span");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
index fbbea0e..e2e8fc1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
assert.expect(3);
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
assert.equal(popupFn().getAttribute("value"), "true");
openButtonFn().dispatchEvent(new Event("click", {bubbles: true}));
@@ -33,13 +33,13 @@ QUnit.test("Open 'Client Popup' and press 'Cancel'.", function (assert) {
});
QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Cancel'.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let messagesFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let messagesFn = querySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
let outputValue = outputFn().textContent;
let TTT = new TobagoTestTool(assert);
@@ -71,13 +71,13 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field is empty. Press 'Can
});
QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press 'Cancel'.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let messagesFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
- let cancelButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let messagesFn = querySelectorAllFn("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
+ let cancelButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
@@ -108,11 +108,11 @@ QUnit.test("Open 'Client Popup', press 'Submit' while field has content. Press '
});
QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitCloseButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitCloseButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
let outputValue = outputFn().textContent;
let TTT = new TobagoTestTool(assert);
@@ -138,11 +138,11 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field is empty.",
});
QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.", function (assert) {
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:open");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:out span");
- let inputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
- let submitCloseButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup input");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:open");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:form2\\:out span");
+ let inputFieldFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
+ let submitCloseButtonFn = querySelectorFn("#page\\:mainForm\\:form2\\:clientPopup\\:submitClose2");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
@@ -167,11 +167,11 @@ QUnit.test("Open 'Client Popup', press 'Submit & Close' while field has content.
});
QUnit.test("Open 'Large Popup'.", function (assert) {
- let dropdownContainerFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton");
- let dropdownButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopupLink");
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopup");
- let closeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
+ let dropdownContainerFn = querySelectorFn("#page\\:mainForm\\:dropdownButton");
+ let dropdownButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:largePopupLink");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:largePopup");
+ let closeButtonFn = querySelectorFn("#page\\:mainForm\\:largePopup\\:closeLargePopup");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -213,11 +213,11 @@ QUnit.test("Open 'Large Popup'.", function (assert) {
});
QUnit.test("Open 'Small Popup'.", function (assert) {
- let dropdownContainerFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton");
- let dropdownButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
- let openButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopupLink");
- let popupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopup");
- let closeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
+ let dropdownContainerFn = querySelectorFn("#page\\:mainForm\\:dropdownButton");
+ let dropdownButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownButton\\:\\:command");
+ let openButtonFn = querySelectorFn("#page\\:mainForm\\:smallPopupLink");
+ let popupFn = querySelectorFn("#page\\:mainForm\\:smallPopup");
+ let closeButtonFn = querySelectorFn("#page\\:mainForm\\:smallPopup\\:closeSmallPopup");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
index d9bf8af..12fcc53 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Client: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupClient");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1Client");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3Client");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupClient");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1Client");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3Client");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
@@ -45,9 +45,9 @@ QUnit.test("Client: Select Tab 3", function (assert) {
});
QUnit.test("Ajax: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupAjax");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1Ajax");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3Ajax");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupAjax");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1Ajax");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3Ajax");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
@@ -72,9 +72,9 @@ QUnit.test("Ajax: Select Tab 3", function (assert) {
});
QUnit.test("FullReload: Select Tab 3", function (assert) {
- let tabGroupFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tabGroupFullReload");
- let tab1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab1FullReload");
- let tab3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tab3FullReload");
+ let tabGroupFn = querySelectorFn("#page\\:mainForm\\:tabGroupFullReload");
+ let tab1Fn = querySelectorFn("#page\\:mainForm\\:tab1FullReload");
+ let tab3Fn = querySelectorFn("#page\\:mainForm\\:tab3FullReload");
let TTT = new TobagoTestTool(assert);
TTT.asserts(5, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
index 814506f..def1b1c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
@@ -15,23 +15,23 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("Collapse tree", function (done) {
- let row0nameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameOut");
- let row0centralBodyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:centralBodyOut");
- let row0distanceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:distanceOut");
- let row0periodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:periodOut");
- let row0discovererFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:discovererOut");
- let row0yearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:yearOut");
- let row1nameFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:nameOut");
- let row1centralBodyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:centralBodyOut");
- let row1distanceFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:distanceOut");
- let row1periodFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:periodOut");
- let row1discovererFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:discovererOut");
- let row1yearFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:1\\:yearOut");
- let rootTreeButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameCol .tobago-treeNode-toggle");
+ let row0nameFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameOut");
+ let row0centralBodyFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:centralBodyOut");
+ let row0distanceFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:distanceOut");
+ let row0periodFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:periodOut");
+ let row0discovererFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:discovererOut");
+ let row0yearFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:yearOut");
+ let row1nameFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:nameOut");
+ let row1centralBodyFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:centralBodyOut");
+ let row1distanceFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:distanceOut");
+ let row1periodFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:periodOut");
+ let row1discovererFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:discovererOut");
+ let row1yearFn = querySelectorFn("#page\\:mainForm\\:sheet\\:1\\:yearOut");
+ let rootTreeButtonFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:nameCol .tobago-treeNode-toggle");
let test = new JasmineTestTool(done);
test.do(() => expect(row0nameFn().textContent).toBe("Sun"));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
index de1a714..170ce03 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("execute both 'Action 1' and 'Action 2' two times", function (assert) {
- let action1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tree\\:2\\:actionCommand");
- let action2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:tree\\:3\\:actionCommand");
- let actionCount1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCount1 .tobago-out");
- let actionCount2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCount2 .tobago-out");
+ let action1Fn = querySelectorFn("#page\\:mainForm\\:tree\\:2\\:actionCommand");
+ let action2Fn = querySelectorFn("#page\\:mainForm\\:tree\\:3\\:actionCommand");
+ let actionCount1Fn = querySelectorFn("#page\\:mainForm\\:actionCount1 .tobago-out");
+ let actionCount2Fn = querySelectorFn("#page\\:mainForm\\:actionCount2 .tobago-out");
const counterBeforeTestResult1 = Number(actionCount1Fn().textContent);
const counterBeforeTestResult2 = Number(actionCount2Fn().textContent);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
index 0c67389..b0bd21f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("single: select Music, select Mathematics", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let mathematicsFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableSingleFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:1");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let mathematicsFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableSingleFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:1");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -63,12 +63,12 @@ QUnit.test("single: select Music, select Mathematics", function (assert) {
});
QUnit.test("singleLeafOnly: select Classic, select Geography", function (assert) {
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableSingleLeafOnlyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:2");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableSingleLeafOnlyFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:2");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -107,12 +107,12 @@ QUnit.test("singleLeafOnly: select Classic, select Geography", function (assert)
});
QUnit.test("multi: select Music, select Geography, deselect Music", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:3");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:10\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:3");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -159,12 +159,12 @@ QUnit.test("multi: select Music, select Geography, deselect Music", function (as
});
QUnit.test("multiLeafOnly: select Classic, select Geography, deselect Classic", function (assert) {
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let geographyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiLeafOnlyFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:4");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let geographyFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiLeafOnlyFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:4");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -211,13 +211,13 @@ QUnit.test("multiLeafOnly: select Classic, select Geography, deselect Classic",
});
QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", function (assert) {
- let musicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
- let classicFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
- let mathematicsFn = testFrameQuerySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
- let selectableNoneFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
- let selectableMultiCascadeFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectable\\:\\:5");
- let inputFn = testFrameQuerySelectorFn("tobago-tree-select input");
+ let musicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:3\\:select");
+ let classicFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:4\\:select");
+ let mathematicsFn = querySelectorFn("#page\\:mainForm\\:categoriesTree\\:9\\:select");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:selectedNodesOutput span");
+ let selectableNoneFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:0");
+ let selectableMultiCascadeFn = querySelectorFn("#page\\:mainForm\\:selectable\\:\\:5");
+ let inputFn = querySelectorFn("tobago-tree-select input");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
index c3d87da..435920b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Deprecated: 'Ma'", function (assert) {
let inputString = "Ma";
let expectedLength = 4;
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:deprecated\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:deprecated\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:deprecated");
let TTT = new TobagoTestTool(assert);
@@ -44,7 +44,7 @@ QUnit.test("Replacement: 'Ma'", function (assert) {
let inputString = "Ma";
let expectedLength = 4;
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:replacement\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:replacement\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:replacement");
let TTT = new TobagoTestTool(assert);
@@ -67,6 +67,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
index 2cfeae4..461e21c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Basics: 'M'", function (assert) {
@@ -47,7 +47,7 @@ QUnit.test("Basics: 'Mars'", function (assert) {
});
function testMarsBasics(assert, inputString, expectedLength) {
- let inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:input\\:\\:field");
+ let inFn = querySelectorFn("#page\\:mainForm\\:input\\:\\:field");
let suggestionsFn = getSuggestions("#page\\:mainForm\\:input");
let TTT = new TobagoTestTool(assert);
@@ -70,6 +70,6 @@ function escapeClientId(clientId) {
}
function getSuggestions(id) {
- return testFrameQuerySelectorAllFn(escapeClientId(
- testFrameQuerySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
+ return querySelectorAllFn(escapeClientId(
+ querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
index dd0f42a..3afe132 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
QUnit.test("inputfield with label", function (assert) {
- let dateFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateNoPattern\\:\\:field");
- let dateButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dateNoPattern button");
+ let dateFieldFn = querySelectorFn("#page\\:mainForm\\:dateNoPattern\\:\\:field");
+ let dateButtonFn = querySelectorFn("#page\\:mainForm\\:dateNoPattern button");
assert.equal(dateFieldFn().value, "");
- let datepickerFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ let datepickerFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
assert.notOk(datepickerFn().item(0));
dateButtonFn().dispatchEvent(new Event("click", {bubbles: true}));
- datepickerFn = testFrameQuerySelectorAllFn(".bootstrap-datetimepicker-widget");
+ datepickerFn = querySelectorAllFn(".bootstrap-datetimepicker-widget");
assert.ok(datepickerFn().item(0));
assert.notEqual(dateFieldFn().value, "");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
index d3907d8..7eb8b88 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Date - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -30,9 +30,9 @@ QUnit.test("Date - f:convertDateTime", function (assert) {
});
QUnit.test("Date - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -41,9 +41,9 @@ QUnit.test("Date - tc:convertDateTime", function (assert) {
});
QUnit.test("Calendar - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -52,9 +52,9 @@ QUnit.test("Calendar - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalDate - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -67,9 +67,9 @@ QUnit.test("LocalDate - f:convertDateTime", function (assert) {
});
QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -78,9 +78,9 @@ QUnit.test("LocalDate - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -93,9 +93,9 @@ QUnit.test("LocalTime - f:convertDateTime", function (assert) {
});
QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -104,9 +104,9 @@ QUnit.test("LocalTime - tc:convertDateTime", function (assert) {
});
QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesLocalDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -119,9 +119,9 @@ QUnit.test("LocalDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoLocalDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -130,9 +130,9 @@ QUnit.test("LocalDateTime - tc:convertDateTime", function (assert) {
});
QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -145,9 +145,9 @@ QUnit.test("OffsetTime - f:convertDateTime", function (assert) {
});
QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -156,9 +156,9 @@ QUnit.test("OffsetTime - tc:convertDateTime", function (assert) {
});
QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesOffsetDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -171,9 +171,9 @@ QUnit.test("OffsetDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoOffsetDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -182,9 +182,9 @@ QUnit.test("OffsetDateTime - tc:convertDateTime", function (assert) {
});
QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:myfacesZonedDateTimeOutput .tobago-out");
if (inputFn() !== null) {
testConvertDateTime(assert,
@@ -197,9 +197,9 @@ QUnit.test("ZonedDateTime - f:convertDateTime", function (assert) {
});
QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
- let datepickerButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput\\:\\:field");
+ let datepickerButtonFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeInput .datepickerbutton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:tobagoZonedDateTimeOutput .tobago-out");
testConvertDateTime(assert,
inputFn, datepickerButtonFn, outputFn,
@@ -210,7 +210,7 @@ QUnit.test("ZonedDateTime - tc:convertDateTime", function (assert) {
function testConvertDateTime(assert, inputFn, datepickerButtonFn, outputFn,
expectPattern, expectCalendarIcon, expectClockIcon,
inputValue, expectOutputValue) {
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submitButton");
let TTT = new TobagoTestTool(assert);
TTT.asserts(3, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
index bf4502f..b70198c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Execute 'AJAX' entry in dropdown menu", function (assert) {
- let dropdownMenuButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
+ let dropdownMenuButtonFn = querySelectorFn("#page\\:mainForm\\:dropdownMenuButton\\:\\:command");
const ajaxEntryId = "#page\\:mainForm\\:ajaxEntry";
- let ajaxEntryFn = testFrameQuerySelectorFn(ajaxEntryId);
- let tobagoPageMenuStoreFn = testFrameQuerySelectorFn(".tobago-page-menuStore");
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inputAjax\\:\\:field");
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:outputAjax .tobago-out");
+ let ajaxEntryFn = querySelectorFn(ajaxEntryId);
+ let tobagoPageMenuStoreFn = querySelectorFn(".tobago-page-menuStore");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inputAjax\\:\\:field");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:outputAjax .tobago-out");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
index 356946d..a86817b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
@@ -15,35 +15,35 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Standard Action Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardButtonAction");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:actionSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardButtonAction");
+ let destinationSectionFn = querySelectorFn("#page\\:actionSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Link Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardButtonLink");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:linkSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardButtonLink");
+ let destinationSectionFn = querySelectorFn("#page\\:linkSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Action Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardLinkAction");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:actionSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardLinkAction");
+ let destinationSectionFn = querySelectorFn("#page\\:actionSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
QUnit.test("Standard Link Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:standardLinkLink");
- let destinationSectionFn = testFrameQuerySelectorFn("#page\\:linkSection");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:standardLinkLink");
+ let destinationSectionFn = querySelectorFn("#page\\:linkSection");
testStandardCommands(commandFn, destinationSectionFn, assert);
});
function testStandardCommands(commandFn, destinationSectionFn, assert) {
- let backFn = testFrameQuerySelectorFn("#page\\:back");
+ let backFn = querySelectorFn("#page\\:back");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -64,31 +64,31 @@ function testStandardCommands(commandFn, destinationSectionFn, assert) {
}
QUnit.test("Target Action Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetButtonAction");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetButtonAction");
testTargetCommands(commandFn, "accessed by action", assert);
});
QUnit.test("Target Link Button", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetButtonLink");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetButtonLink");
testTargetCommands(commandFn, "accessed by link", assert);
});
QUnit.test("Target Action Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetLinkAction");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetLinkAction");
testTargetCommands(commandFn, "accessed by action", assert);
});
QUnit.test("Target Link Link", function (assert) {
- let commandFn = testFrameQuerySelectorFn("#page\\:mainForm\\:targetLinkLink");
+ let commandFn = querySelectorFn("#page\\:mainForm\\:targetLinkLink");
testTargetCommands(commandFn, "accessed by link", assert);
});
QUnit.test("Style must not be a dropdown item", function (assert) {
assert.expect(3);
- let dropdownMenuFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
- let styleAsItemFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
+ let dropdownMenuFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu");
+ let styleAsItemFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle .dropdown-menu .dropdown-item > style");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:dropdownWithStyle > .tobago-button");
assert.ok(dropdownMenuFn() !== null);
assert.equal(styleAsItemFn(), null);
@@ -108,6 +108,6 @@ function testTargetCommands(commandFn, expectedText, assert) {
}
function getTargetFrameTestInputValue() {
- return testFrameQuerySelectorFn("#page\\:mainForm\\:targetFrame")().contentWindow
+ return querySelectorFn("#page\\:mainForm\\:targetFrame")().contentWindow
.document.querySelector("#textInput").value;
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
index ef5f04f..143877e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("test width of grid layout and 'auto' button", function (assert) {
assert.expect(2);
- let gridLayoutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:grid");
- let buttonAutoFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonAuto");
+ let gridLayoutFn = querySelectorFn("#page\\:mainForm\\:grid");
+ let buttonAutoFn = querySelectorFn("#page\\:mainForm\\:buttonAuto");
assert.equal(gridLayoutFn().offsetWidth, 358);
assert.equal(buttonAutoFn().offsetWidth, 58);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
index 1dbdd57..b4336d3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Style tag inside grid layout", function (assert) {
- let outputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:output .tobago-out");
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submitButton");
+ let outputFn = querySelectorFn("#page\\:mainForm\\:output .tobago-out");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:submitButton");
let TTT = new TobagoTestTool(assert);
TTT.asserts(1, function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
index d317001..e37c8fb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("No label set", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionNoLabel");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionNoLabel");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -35,7 +35,7 @@ QUnit.test("No label set", function (assert) {
QUnit.test("labelLayout=none", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionNone");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionNone");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -50,7 +50,7 @@ QUnit.test("labelLayout=none", function (assert) {
QUnit.test("labelLayout=skip", function (assert) {
assert.expect(3);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSkip");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSkip");
let rootInput = sectionFn().querySelector(".tobago-section-content > input");
let label = sectionFn().querySelector("label");
@@ -62,7 +62,7 @@ QUnit.test("labelLayout=skip", function (assert) {
QUnit.test("labelLayout=top", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionTop");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionTop");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -77,7 +77,7 @@ QUnit.test("labelLayout=top", function (assert) {
QUnit.test("labelLayout=flowLeft", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlowLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlowLeft");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -92,7 +92,7 @@ QUnit.test("labelLayout=flowLeft", function (assert) {
QUnit.test("labelLayout=flowRight", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlowRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlowRight");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -107,7 +107,7 @@ QUnit.test("labelLayout=flowRight", function (assert) {
QUnit.test("labelLayout=flexLeft", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlexLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlexLeft");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -122,7 +122,7 @@ QUnit.test("labelLayout=flexLeft", function (assert) {
QUnit.test("labelLayout=flexRight", function (assert) {
assert.expect(5);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionFlexRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionFlexRight");
let rootDiv = sectionFn().querySelector(".tobago-section-content > tobago-in");
let label = rootDiv.querySelector("label");
let input = rootDiv.querySelector("input");
@@ -137,7 +137,7 @@ QUnit.test("labelLayout=flexRight", function (assert) {
QUnit.test("labelLayout=segmentLeft", function (assert) {
assert.expect(6);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSegmentLeft");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSegmentLeft");
let segmentLayout = sectionFn().querySelector(".tobago-section-content > div");
let labelSegment = segmentLayout.querySelector(".col-3 > tobago-in");
let inputSegment = segmentLayout.querySelector(".col-9 > tobago-in");
@@ -155,7 +155,7 @@ QUnit.test("labelLayout=segmentLeft", function (assert) {
QUnit.test("labelLayout=segmentRight", function (assert) {
assert.expect(6);
- let sectionFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sectionSegmentRight");
+ let sectionFn = querySelectorFn("#page\\:mainForm\\:sectionSegmentRight");
let segmentLayout = sectionFn().querySelector(".tobago-section-content > div");
let labelSegment = segmentLayout.querySelector(".col-3 > tobago-in");
let inputSegment = segmentLayout.querySelector(".col-9 > tobago-in");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
index 68e0e65..17c8abb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("Check width for tc:date", function (assert) {
assert.expect(2);
@@ -83,8 +83,8 @@ QUnit.test("Check width for tc:textarea", function (assert) {
});
function testWidth(assert, idPart) {
- let compLabelFn = testFrameQuerySelectorFn("#page\\:mainForm\\:" + idPart + " label");
- let compTopFn = testFrameQuerySelectorFn("#page\\:mainForm\\:" + idPart + "Top");
+ let compLabelFn = querySelectorFn("#page\\:mainForm\\:" + idPart + " label");
+ let compTopFn = querySelectorFn("#page\\:mainForm\\:" + idPart + "Top");
assert.equal(getComputedStyle(compLabelFn()).width, "155px");
assert.equal(getComputedStyle(compTopFn().querySelector("label")).width, getComputedStyle(compTopFn()).width);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
index 68443fa..6ca21f7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Check severity CSS classes", function (assert) {
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let fatalInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:fatal\\:\\:field");
- let errorInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:error\\:\\:field");
- let warnInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:warn\\:\\:field");
- let infoInputFieldFn = testFrameQuerySelectorFn("#page\\:mainForm\\:info\\:\\:field");
- let fatalButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:fatal .tobago-messages-button");
- let errorButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:error .tobago-messages-button");
- let warnButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:warn .tobago-messages-button");
- let infoButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:info .tobago-messages-button");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let fatalInputFieldFn = querySelectorFn("#page\\:mainForm\\:fatal\\:\\:field");
+ let errorInputFieldFn = querySelectorFn("#page\\:mainForm\\:error\\:\\:field");
+ let warnInputFieldFn = querySelectorFn("#page\\:mainForm\\:warn\\:\\:field");
+ let infoInputFieldFn = querySelectorFn("#page\\:mainForm\\:info\\:\\:field");
+ let fatalButtonFn = querySelectorFn("#page\\:mainForm\\:fatal .tobago-messages-button");
+ let errorButtonFn = querySelectorFn("#page\\:mainForm\\:error .tobago-messages-button");
+ let warnButtonFn = querySelectorFn("#page\\:mainForm\\:warn .tobago-messages-button");
+ let infoButtonFn = querySelectorFn("#page\\:mainForm\\:info .tobago-messages-button");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
index c3245fc..391d78f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("ajax excecute", function (assert) {
- let in1Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in1\\:\\:field");
- let in2Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in2\\:\\:field");
- let in3Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in3\\:\\:field");
- let in4Fn = testFrameQuerySelectorFn("#page\\:mainForm\\:in4\\:\\:field");
- let clearButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:clear");
- let submitButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:submit");
- let reloadButtonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:reload");
+ let in1Fn = querySelectorFn("#page\\:mainForm\\:in1\\:\\:field");
+ let in2Fn = querySelectorFn("#page\\:mainForm\\:in2\\:\\:field");
+ let in3Fn = querySelectorFn("#page\\:mainForm\\:in3\\:\\:field");
+ let in4Fn = querySelectorFn("#page\\:mainForm\\:in4\\:\\:field");
+ let clearButtonFn = querySelectorFn("#page\\:mainForm\\:clear");
+ let submitButtonFn = querySelectorFn("#page\\:mainForm\\:submit");
+ let reloadButtonFn = querySelectorFn("#page\\:mainForm\\:reload");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
index 6464aed..03f0006 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.test.js
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
it("no layout manager", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:noLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:noLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:noLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:noLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -28,9 +28,9 @@ it("no layout manager", function () {
});
it("flowlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flowLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:flowLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:flowLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:flowLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -38,9 +38,9 @@ it("flowlayout", function () {
});
it("flexlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:flexLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:flexLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:flexLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:flexLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -48,9 +48,9 @@ it("flexlayout", function () {
});
it("segmentlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:segLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:segLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:segLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:segLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -58,9 +58,9 @@ it("segmentlayout", function () {
});
it("gridlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:gridLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:gridLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:gridLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:gridLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
@@ -68,9 +68,9 @@ it("gridlayout", function () {
});
it("splitlayout", function () {
- const inFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutIn\\:in\\:\\:field");
- const outFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutOut\\:out");
- const notRenderedFn = testFrameQuerySelectorFn("#page\\:mainForm\\:splitLayoutNotRendered\\:in\\:\\:field");
+ const inFn = querySelectorFn("#page\\:mainForm\\:splitLayoutIn\\:in\\:\\:field");
+ const outFn = querySelectorFn("#page\\:mainForm\\:splitLayoutOut\\:out");
+ const notRenderedFn = querySelectorFn("#page\\:mainForm\\:splitLayoutNotRendered\\:in\\:\\:field");
expect(inFn()).not.toBeNull();
expect(outFn()).not.toBeNull();
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
index 66c9eab..87c25bd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("tc:button", function (assert) {
let eventNames = ["click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonevent");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonajax");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:buttonevent");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:buttonajax");
testEvent(assert, "button", eventNames, eventComponentFn, ajaxComponentFn, null);
});
QUnit.test("tc:in", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:inevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:inajax\\:\\:field");
let changeValue = function (componentFn) {
let oldValue = componentFn().value;
let newValue = "hello";
@@ -42,15 +42,15 @@ QUnit.test("tc:in", function (assert) {
QUnit.test("tc:row", function (assert) {
let eventNames = ["click", "dblclick"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:sheetevent\\:0\\:selectPlanet");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:sheetajax\\:0\\:selectPlanet");
testEvent(assert, "row", eventNames, eventComponentFn, ajaxComponentFn, null);
});
QUnit.test("tc:selectBooleanCheckbox", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:selectBooleanCheckboxajax\\:\\:field");
let changeValue = function (componentFn) {
componentFn().checked = !componentFn().checked;
};
@@ -59,8 +59,8 @@ QUnit.test("tc:selectBooleanCheckbox", function (assert) {
QUnit.test("tc:textarea", function (assert) {
let eventNames = ["change", "click", "dblclick", "focus", "blur"];
- let eventComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:textareaevent\\:\\:field");
- let ajaxComponentFn = testFrameQuerySelectorFn("#page\\:mainForm\\:textareaajax\\:\\:field");
+ let eventComponentFn = querySelectorFn("#page\\:mainForm\\:textareaevent\\:\\:field");
+ let ajaxComponentFn = querySelectorFn("#page\\:mainForm\\:textareaajax\\:\\:field");
let changeValue = function (componentFn) {
let oldValue = componentFn().value;
let newValue = "hello";
@@ -144,7 +144,7 @@ function testEvent(assert, componentName, eventNames, eventComponentFn, ajaxComp
}
function activateComponent(componentName, eventName) {
- const rows = testFrameQuerySelectorAllFn("#page\\:mainForm\\:componentTable .tobago-sheet-row")();
+ const rows = querySelectorAllFn("#page\\:mainForm\\:componentTable .tobago-sheet-row")();
Array.prototype.forEach.call(rows, function (element, i) {
if (element.querySelectorAll("td").item(0).querySelector(".tobago-out").textContent === componentName) {
const buttons = element.querySelectorAll("button");
@@ -159,21 +159,21 @@ function activateComponent(componentName, eventName) {
}
function getActionCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inAction\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inAction\\:\\:field")().value);
}
function getActionListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inActionListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inActionListener\\:\\:field")().value);
}
function getAjaxListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inAjaxListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inAjaxListener\\:\\:field")().value);
}
function getValueChangeListenerCount() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inValueChangeListener\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inValueChangeListener\\:\\:field")().value);
}
function getTimestamp() {
- return parseInt(testFrameQuerySelectorFn("#page\\:mainForm\\:inTimestamp\\:\\:field")().value);
+ return parseInt(querySelectorFn("#page\\:mainForm\\:inTimestamp\\:\\:field")().value);
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
index dfb4c79..b1a5ccf 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-import {testFrameQuerySelectorAllFn, testFrameQuerySelectorFn} from "/script/tobago-test.js";
+import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("Simple Event", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleEvent");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleEvent");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -34,7 +34,7 @@ QUnit.test("Simple Event", function (assert) {
});
QUnit.test("Simple Ajax", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleAjax");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleAjax");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -49,7 +49,7 @@ QUnit.test("Simple Ajax", function (assert) {
});
QUnit.test("Simple EventAjax", function (assert) {
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:simpleEventAjax");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:simpleEventAjax");
let oldCounterValues = getCounterValues();
let TTT = new TobagoTestTool(assert);
@@ -65,42 +65,42 @@ QUnit.test("Simple EventAjax", function (assert) {
QUnit.test("Advanced Button: Option 1", function (assert) {
const optionId = 0; //Event 1 + no Ajax enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testEventOption(assert, optionId, buttonFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
});
QUnit.test("Advanced Button: Option 2", function (assert) {
const optionId = 1; //Event 2 + Ajax 3 enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testAjaxOption(assert, optionId, buttonFn, "dblclick", 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
});
QUnit.test("Advanced Button: Option 3", function (assert) {
const optionId = 2; //Event 3 + all Ajax enabled
- let buttonFn = testFrameQuerySelectorFn("#page\\:mainForm\\:advancedButton");
+ let buttonFn = querySelectorFn("#page\\:mainForm\\:advancedButton");
testAjaxOption(assert, optionId, buttonFn, "click", 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1);
});
QUnit.test("Row: Option 1", function (assert) {
const optionId = 0; //Event 1 + no Ajax enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testEventOption(assert, optionId, rowFn, "dblclick", 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0);
});
QUnit.test("Row: Option 2", function (assert) {
const optionId = 1; //Event 2 + Ajax 3 enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testAjaxOption(assert, optionId, rowFn, "dblclick", 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1);
});
QUnit.test("Row: Option 3", function (assert) {
const optionId = 2; //Event 3 + all Ajax enabled
- let rowFn = testFrameQuerySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
+ let rowFn = querySelectorFn("#page\\:mainForm\\:sheet\\:0\\:row");
testAjaxOption(assert, optionId, rowFn, "click", 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1);
});
QUnit.test("Input: Click Event", function (assert) {
- let inputFn = testFrameQuerySelectorFn("#page\\:mainForm\\:inputClick\\:\\:field");
+ let inputFn = querySelectorFn("#page\\:mainForm\\:inputClick\\:\\:field");
testInputSection(assert, inputFn, "click");
});
@@ -109,10 +109,10 @@ function testEventOption(assert, optionId, componentFn, eventName,
action1Plus, actionListener1Plus, ajaxListener1Plus,
action2Plus, actionListener2Plus, ajaxListener2Plus,
action3Plus, actionListener3Plus, ajaxListener3Plus) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let oldCounterValues = getCounterValues();
- let optionsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
+ let optionsFn = querySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -151,10 +151,10 @@ function testAjaxOption(assert, optionId, componentFn, eventName,
action1Plus, actionListener1Plus, ajaxListener1Plus,
action2Plus, actionListener2Plus, ajaxListener2Plus,
action3Plus, actionListener3Plus, ajaxListener3Plus) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let oldCounterValues = getCounterValues();
- let optionsFn = testFrameQuerySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
+ let optionsFn = querySelectorAllFn("#page\\:mainForm\\:advancedSelector input[type='radio']");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -189,8 +189,8 @@ function testAjaxOption(assert, optionId, componentFn, eventName,
}
function testInputSection(assert, inputFn, eventName) {
- let hideFn = testFrameQuerySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
- let operationOutFn = testFrameQuerySelectorFn("#page\\:mainForm\\:operationOut");
+ let hideFn = querySelectorFn("#page\\:mainForm\\:hideOperationTextBox");
+ let operationOutFn = querySelectorFn("#page\\:mainForm\\:operationOut");
let TTT = new TobagoTestTool(assert);
TTT.action(function () {
@@ -211,20 +211,20 @@ function testInputSection(assert, inputFn, eventName) {
}
function getCounterValues() {
- let buttonActionCounter = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonActionCounter.tobago-out")().textContent;
- let buttonActionListenerCounter = testFrameQuerySelectorFn("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out")().textContent;
+ let buttonActionCounter = querySelectorFn("#page\\:mainForm\\:buttonActionCounter.tobago-out")().textContent;
+ let buttonActionListenerCounter = querySelectorFn("#page\\:mainForm\\:buttonActionListenerCounter.tobago-out")().textContent;
- let actionCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter1.tobago-out")().textContent;
- let actionListenerCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter1.tobago-out")().textContent;
- let ajaxListenerCount1 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out")().textContent;
+ let actionCount1 = querySelectorFn("#page\\:mainForm\\:actionCounter1.tobago-out")().textContent;
+ let actionListenerCount1 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter1.tobago-out")().textContent;
+ let ajaxListenerCount1 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter1.tobago-out")().textContent;
- let actionCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter2.tobago-out")().textContent;
- let actionListenerCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter2.tobago-out")().textContent;
- let ajaxListenerCount2 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out")().textContent;
+ let actionCount2 = querySelectorFn("#page\\:mainForm\\:actionCounter2.tobago-out")().textContent;
+ let actionListenerCount2 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter2.tobago-out")().textContent;
+ let ajaxListenerCount2 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter2.tobago-out")().textContent;
- let actionCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionCounter3.tobago-out")().textContent;
- let actionListenerCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:actionListenerCounter3.tobago-out")().textContent;
- let ajaxListenerCount3 = testFrameQuerySelectorFn("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out")().textContent;
+ let actionCount3 = querySelectorFn("#page\\:mainForm\\:actionCounter3.tobago-out")().textContent;
+ let actionListenerCount3 = querySelectorFn("#page\\:mainForm\\:actionListenerCounter3.tobago-out")().textContent;
+ let ajaxListenerCount3 = querySelectorFn("#page\\:mainForm\\:ajaxListenerCounter3.tobago-out")().textContent;
return [buttonActionCounter, buttonActionListenerCounter,
actionCount1, actionListenerCount1, ajaxListenerCount1,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
index f53ac48..a5cb2b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
@@ -37,19 +37,7 @@ function querySelectorAllFn(expression) {
}
}
-function testFrameQuerySelectorFn(expression) {
- return function () {
- return document.getElementById("page:testframe").contentWindow.document.querySelector(expression);
- }
-}
-
-function testFrameQuerySelectorAllFn(expression) {
- return function () {
- return document.getElementById("page:testframe").contentWindow.document.querySelectorAll(expression);
- }
-}
-
-export {elementByIdFn, querySelectorFn, querySelectorAllFn, testFrameQuerySelectorFn, testFrameQuerySelectorAllFn};
+export {elementByIdFn, querySelectorFn, querySelectorAllFn};
QUnit.test("wait for test", function (assert) {
let done = assert.async();
@@ -87,7 +75,7 @@ QUnit.test("duplicated IDs", function (assert) {
});
QUnit.test("test '???'", function (assert) {
- assert.ok(testFrameQuerySelectorFn("html")().textContent.indexOf("???") <= -1,
+ assert.ok(querySelectorFn("html")().textContent.indexOf("???") <= -1,
"There must no '???' on the site.");
});
@@ -119,7 +107,7 @@ describe("general", function () {
});
it("test '???", function () {
- let result = testFrameQuerySelectorFn("html")().textContent;
+ let result = querySelectorFn("html")().textContent;
expect(result.indexOf("???")).toBeLessThanOrEqual(-1, "There must no '???' on the site.");
});
[myfaces-tobago] 02/02: remove QUnit
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit aacd962474b08591b0af9067b2f3a16a1678ca59
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Tue Dec 8 13:20:17 2020 +0100
remove QUnit
---
.../20-component/010-input/10-in/In.test.js | 2 +-
.../010-input/20-suggest/Suggest.test.js | 10 +
.../20-component/010-input/40-date/Date.test.js | 9 +
.../010-input/50-input-group/Group.test.js | 10 +
.../10-selectBooleanCheckbox/Checkbox.test.js | 10 +
.../15-selectBooleanToggle/Toggle.test.js | 9 +
.../030-select/20-selectOneChoice/Dropdown.test.js | 9 +
.../030-select/40-selectOneListbox/Listbox.test.js | 9 +
.../50-selectManyCheckbox/Multi_Checkbox.test.js | 10 +
.../70-selectManyShuttle/Shuttle.test.js | 9 +
.../content/20-component/060-popup/Popup.test.js | 9 +
.../content/20-component/070-tab/Tab_Group.test.js | 9 +
.../090-tree/00-command/Tree_Command_Types.test.js | 10 +
.../090-tree/01-select/Tree_Select.test.js | 10 +
.../10-collapsible-popup/Collapsible_Popup.test.js | 10 +
.../15-suggest-method/Suggest_Method.test.js | 10 +
.../1020-suggest-quotMark/Suggest_QuotMark.test.js | 10 +
.../webapp/content/40-test/1040-date/Date.test.js | 10 +
.../40-test/1041-date-pattern/Date_Pattern.test.js | 14 +-
.../Date_TobagoConverter.test.js | 10 +
.../4050-ajax-dropdown/Ajax_Dropdown.test.js | 10 +
.../40-test/4000-button-link/Button_Link.test.js | 9 +
.../100-auto-column/Auto-Column.test.js | 10 +
.../4600-gridLayout/90-style-tag/Style_Tag.test.js | 10 +
.../100-id-markup/Id_Markup.test.js | 9 +
.../4810-labelLayoutTop/LabelLayoutTop.test.js | 10 +
.../content/40-test/4950-severity/Severity.test.js | 9 +
.../20-ajax-execute/Ajax_Execute.test.js | 9 +
.../content/40-test/6000-event/Event.test.js | 10 +
.../content/40-test/6500-behavior/Behavior.test.js | 10 +
.../src/main/webapp/script/qunit-2.9.2.js | 6604 --------------------
.../src/main/webapp/script/tobago-test.js | 40 -
.../tobago-example-demo/src/main/webapp/test.xhtml | 4 -
33 files changed, 282 insertions(+), 6651 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
index eaeacc3..8734a17 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import {querySelectorFn, querySelectorFn} from "/script/tobago-test.js";
+import {querySelectorFn} from "/script/tobago-test.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
it("inputfield with label", function (done) {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
index 2483139..b79c3b6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -161,3 +170,4 @@ function getSuggestions(id) {
return querySelectorAllFn(escapeClientId(
querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
index 8ecca86..b734077 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
@@ -17,6 +17,14 @@
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
function getToday(dateFieldFn) {
let tobagoToday = dateFieldFn().dataset.tobagoToday;
@@ -147,3 +155,4 @@ QUnit.test("ajax", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
index c64bd4b..10e7fad 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -123,3 +132,4 @@ QUnit.test("ajax: currency change event", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
index b47584e..9fc1d31 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -155,3 +164,4 @@ QUnit.test("ajax: deselect F", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
index b47584e..5671dec 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -155,3 +163,4 @@ QUnit.test("ajax: deselect F", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
index d4e4c56..874c159 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -97,3 +105,4 @@ QUnit.test("ajax: select Jupiter", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
index 6d189b7..dcad683 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -102,3 +110,4 @@ QUnit.test("ajax: select Makalu", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
index 1da03d0..b29e09f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -129,3 +138,4 @@ QUnit.test("ajax: click 'Two'", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
index 727c6ba..fe9b85c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -139,3 +147,4 @@ QUnit.test("ajax: addAll, removeAll, addItem1to2, removeItem0", function (assert
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
index e2e8fc1..7326bfa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -257,3 +265,4 @@ QUnit.test("Open 'Small Popup'.", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
index 12fcc53..d278869 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -97,3 +105,4 @@ QUnit.test("FullReload: Select Tab 3", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
index 170ce03..eb5204b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -58,3 +67,4 @@ QUnit.test("execute both 'Action 1' and 'Action 2' two times", function (assert)
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
index b0bd21f..3257353 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -263,3 +272,4 @@ QUnit.test("multiCascade: select Music, select Mathematics, deselect Classic", f
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.test.js
index a9f45db..3e35a29 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -186,3 +195,4 @@ QUnit.test("Client Side", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
index 435920b..c6673de 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -70,3 +79,4 @@ function getSuggestions(id) {
return querySelectorAllFn(escapeClientId(
querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
index 461e21c..22af9cb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -73,3 +82,4 @@ function getSuggestions(id) {
return querySelectorAllFn(escapeClientId(
querySelectorFn(id + " tobago-suggest")().id + "::popup") + " .tt-suggestion");
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
index 3afe132..8a0bbed 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
QUnit.test("inputfield with label", function (assert) {
@@ -33,3 +42,4 @@ QUnit.test("inputfield with label", function (assert) {
assert.notEqual(dateFieldFn().value, "");
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
index c522847..c4c7451 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.test.js
@@ -15,18 +15,28 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
QUnit.test("test patterns", function (assert) {
assert.ok(true, "work in progress");
- /*
+ /!*
assert.ok(false);
TestDateTime.testDate();
TestDateTime.testTime();
TestDateTime.testBoth();
- */
+ *!/
});
+*/
/*TestDateTime = {};
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
index 7eb8b88..a0eeda9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -229,3 +238,4 @@ function testConvertDateTime(assert, inputFn, datepickerButtonFn, outputFn,
});
TTT.startTest();
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
index b70198c..985c1bd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -52,3 +61,4 @@ QUnit.test("Execute 'AJAX' entry in dropdown menu", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
index a86817b..4c8712a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -111,3 +119,4 @@ function getTargetFrameTestInputValue() {
return querySelectorFn("#page\\:mainForm\\:targetFrame")().contentWindow
.document.querySelector("#textInput").value;
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
index 143877e..2db073c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("test width of grid layout and 'auto' button", function (assert) {
@@ -26,3 +35,4 @@ QUnit.test("test width of grid layout and 'auto' button", function (assert) {
assert.equal(gridLayoutFn().offsetWidth, 358);
assert.equal(buttonAutoFn().offsetWidth, 58);
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
index b4336d3..d8d61d6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -35,3 +44,4 @@ QUnit.test("Style tag inside grid layout", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
index e37c8fb..36a4bb7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("No label set", function (assert) {
@@ -169,3 +177,4 @@ QUnit.test("labelLayout=segmentRight", function (assert) {
assert.equal(input.name, "page:mainForm:inSegmentRight");
assert.ok(input.classList.contains("tobago-in-markup-testmarkup"));
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
index 17c8abb..7cd431f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorFn} from "/script/tobago-test.js";
QUnit.test("Check width for tc:date", function (assert) {
@@ -89,3 +98,4 @@ function testWidth(assert, idPart) {
assert.equal(getComputedStyle(compLabelFn()).width, "155px");
assert.equal(getComputedStyle(compTopFn().querySelector("label")).width, getComputedStyle(compTopFn()).width);
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
index 6ca21f7..0377b17 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -47,3 +55,4 @@ QUnit.test("Check severity CSS classes", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
index 391d78f..c48deea 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.test.js
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+/*
import {querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -68,3 +76,4 @@ QUnit.test("ajax excecute", function (assert) {
});
TTT.startTest();
});
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
index 87c25bd..dd7a828 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -177,3 +186,4 @@ function getValueChangeListenerCount() {
function getTimestamp() {
return parseInt(querySelectorFn("#page\\:mainForm\\:inTimestamp\\:\\:field")().value);
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
index b1a5ccf..d7b7cae 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.test.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {JasmineTestTool} from "/tobago/test/tobago-test-tool.js";
+
+it("not implemented yet", function (done) {
+ let test = new JasmineTestTool(done);
+ test.do(() => fail("not implemented yet"));
+ test.start();
+});
+
+/*
import {querySelectorAllFn, querySelectorFn} from "/script/tobago-test.js";
import {TobagoTestTool} from "/tobago/test/tobago-test-tool.js";
@@ -251,3 +260,4 @@ function compareCounterValues(assert, oldCounterValues,
assert.equal(parseInt(newCounterValues[9]), parseInt(oldCounterValues[9]) + actionListener3Plus);
assert.equal(parseInt(newCounterValues[10]), parseInt(oldCounterValues[10]) + ajaxListener3Plus);
}
+*/
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/qunit-2.9.2.js b/tobago-example/tobago-example-demo/src/main/webapp/script/qunit-2.9.2.js
deleted file mode 100644
index f66e5c7..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/qunit-2.9.2.js
+++ /dev/null
@@ -1,6604 +0,0 @@
-/*!
- * QUnit 2.9.2
- * https://qunitjs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2019-02-21T22:49Z
- */
-(function (global$1) {
- 'use strict';
-
- global$1 = global$1 && global$1.hasOwnProperty('default') ? global$1['default'] : global$1;
-
- var window$1 = global$1.window;
- var self$1 = global$1.self;
- var console = global$1.console;
- var setTimeout$1 = global$1.setTimeout;
- var clearTimeout = global$1.clearTimeout;
-
- var document$1 = window$1 && window$1.document;
- var navigator = window$1 && window$1.navigator;
-
- var localSessionStorage = function () {
- var x = "qunit-test-string";
- try {
- global$1.sessionStorage.setItem(x, x);
- global$1.sessionStorage.removeItem(x);
- return global$1.sessionStorage;
- } catch (e) {
- return undefined;
- }
- }();
-
- /**
- * Returns a function that proxies to the given method name on the globals
- * console object. The proxy will also detect if the console doesn't exist and
- * will appropriately no-op. This allows support for IE9, which doesn't have a
- * console if the developer tools are not open.
- */
- function consoleProxy(method) {
- return function () {
- if (console) {
- console[method].apply(console, arguments);
- }
- };
- }
-
- var Logger = {
- warn: consoleProxy("warn")
- };
-
- var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
- return typeof obj;
- } : function (obj) {
- return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
- };
-
-
-
-
-
-
-
-
-
-
-
- var classCallCheck = function (instance, Constructor) {
- if (!(instance instanceof Constructor)) {
- throw new TypeError("Cannot call a class as a function");
- }
- };
-
- var createClass = function () {
- function defineProperties(target, props) {
- for (var i = 0; i < props.length; i++) {
- var descriptor = props[i];
- descriptor.enumerable = descriptor.enumerable || false;
- descriptor.configurable = true;
- if ("value" in descriptor) descriptor.writable = true;
- Object.defineProperty(target, descriptor.key, descriptor);
- }
- }
-
- return function (Constructor, protoProps, staticProps) {
- if (protoProps) defineProperties(Constructor.prototype, protoProps);
- if (staticProps) defineProperties(Constructor, staticProps);
- return Constructor;
- };
- }();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- var toConsumableArray = function (arr) {
- if (Array.isArray(arr)) {
- for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
-
- return arr2;
- } else {
- return Array.from(arr);
- }
- };
-
- var toString = Object.prototype.toString;
- var hasOwn = Object.prototype.hasOwnProperty;
- var now = Date.now || function () {
- return new Date().getTime();
- };
-
- var hasPerformanceApi = detectPerformanceApi();
- var performance = hasPerformanceApi ? window$1.performance : undefined;
- var performanceNow = hasPerformanceApi ? performance.now.bind(performance) : now;
-
- function detectPerformanceApi() {
- return window$1 && typeof window$1.performance !== "undefined" && typeof window$1.performance.mark === "function" && typeof window$1.performance.measure === "function";
- }
-
- function measure(comment, startMark, endMark) {
-
- // `performance.measure` may fail if the mark could not be found.
- // reasons a specific mark could not be found include: outside code invoking `performance.clearMarks()`
- try {
- performance.measure(comment, startMark, endMark);
- } catch (ex) {
- Logger.warn("performance.measure could not be executed because of ", ex.message);
- }
- }
-
- var defined = {
- document: window$1 && window$1.document !== undefined,
- setTimeout: setTimeout$1 !== undefined
- };
-
- // Returns a new Array with the elements that are in a but not in b
- function diff(a, b) {
- var i,
- j,
- result = a.slice();
-
- for (i = 0; i < result.length; i++) {
- for (j = 0; j < b.length; j++) {
- if (result[i] === b[j]) {
- result.splice(i, 1);
- i--;
- break;
- }
- }
- }
- return result;
- }
-
- /**
- * Determines whether an element exists in a given array or not.
- *
- * @method inArray
- * @param {Any} elem
- * @param {Array} array
- * @return {Boolean}
- */
- function inArray(elem, array) {
- return array.indexOf(elem) !== -1;
- }
-
- /**
- * Makes a clone of an object using only Array or Object as base,
- * and copies over the own enumerable properties.
- *
- * @param {Object} obj
- * @return {Object} New object with only the own properties (recursively).
- */
- function objectValues(obj) {
- var key,
- val,
- vals = is("array", obj) ? [] : {};
- for (key in obj) {
- if (hasOwn.call(obj, key)) {
- val = obj[key];
- vals[key] = val === Object(val) ? objectValues(val) : val;
- }
- }
- return vals;
- }
-
- function extend(a, b, undefOnly) {
- for (var prop in b) {
- if (hasOwn.call(b, prop)) {
- if (b[prop] === undefined) {
- delete a[prop];
- } else if (!(undefOnly && typeof a[prop] !== "undefined")) {
- a[prop] = b[prop];
- }
- }
- }
-
- return a;
- }
-
- function objectType(obj) {
- if (typeof obj === "undefined") {
- return "undefined";
- }
-
- // Consider: typeof null === object
- if (obj === null) {
- return "null";
- }
-
- var match = toString.call(obj).match(/^\[object\s(.*)\]$/),
- type = match && match[1];
-
- switch (type) {
- case "Number":
- if (isNaN(obj)) {
- return "nan";
- }
- return "number";
- case "String":
- case "Boolean":
- case "Array":
- case "Set":
- case "Map":
- case "Date":
- case "RegExp":
- case "Function":
- case "Symbol":
- return type.toLowerCase();
- default:
- return typeof obj === "undefined" ? "undefined" : _typeof(obj);
- }
- }
-
- // Safe object type checking
- function is(type, obj) {
- return objectType(obj) === type;
- }
-
- // Based on Java's String.hashCode, a simple but not
- // rigorously collision resistant hashing function
- function generateHash(module, testName) {
- var str = module + "\x1C" + testName;
- var hash = 0;
-
- for (var i = 0; i < str.length; i++) {
- hash = (hash << 5) - hash + str.charCodeAt(i);
- hash |= 0;
- }
-
- // Convert the possibly negative integer hash code into an 8 character hex string, which isn't
- // strictly necessary but increases user understanding that the id is a SHA-like hash
- var hex = (0x100000000 + hash).toString(16);
- if (hex.length < 8) {
- hex = "0000000" + hex;
- }
-
- return hex.slice(-8);
- }
-
- // Test for equality any JavaScript type.
- // Authors: Philippe Rathé <pr...@gmail.com>, David Chan <da...@troi.org>
- var equiv = (function () {
-
- // Value pairs queued for comparison. Used for breadth-first processing order, recursion
- // detection and avoiding repeated comparison (see below for details).
- // Elements are { a: val, b: val }.
- var pairs = [];
-
- var getProto = Object.getPrototypeOf || function (obj) {
- return obj.__proto__;
- };
-
- function useStrictEquality(a, b) {
-
- // This only gets called if a and b are not strict equal, and is used to compare on
- // the primitive values inside object wrappers. For example:
- // `var i = 1;`
- // `var j = new Number(1);`
- // Neither a nor b can be null, as a !== b and they have the same type.
- if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") {
- a = a.valueOf();
- }
- if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") {
- b = b.valueOf();
- }
-
- return a === b;
- }
-
- function compareConstructors(a, b) {
- var protoA = getProto(a);
- var protoB = getProto(b);
-
- // Comparing constructors is more strict than using `instanceof`
- if (a.constructor === b.constructor) {
- return true;
- }
-
- // Ref #851
- // If the obj prototype descends from a null constructor, treat it
- // as a null prototype.
- if (protoA && protoA.constructor === null) {
- protoA = null;
- }
- if (protoB && protoB.constructor === null) {
- protoB = null;
- }
-
- // Allow objects with no prototype to be equivalent to
- // objects with Object as their constructor.
- if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) {
- return true;
- }
-
- return false;
- }
-
- function getRegExpFlags(regexp) {
- return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0];
- }
-
- function isContainer(val) {
- return ["object", "array", "map", "set"].indexOf(objectType(val)) !== -1;
- }
-
- function breadthFirstCompareChild(a, b) {
-
- // If a is a container not reference-equal to b, postpone the comparison to the
- // end of the pairs queue -- unless (a, b) has been seen before, in which case skip
- // over the pair.
- if (a === b) {
- return true;
- }
- if (!isContainer(a)) {
- return typeEquiv(a, b);
- }
- if (pairs.every(function (pair) {
- return pair.a !== a || pair.b !== b;
- })) {
-
- // Not yet started comparing this pair
- pairs.push({ a: a, b: b });
- }
- return true;
- }
-
- var callbacks = {
- "string": useStrictEquality,
- "boolean": useStrictEquality,
- "number": useStrictEquality,
- "null": useStrictEquality,
- "undefined": useStrictEquality,
- "symbol": useStrictEquality,
- "date": useStrictEquality,
-
- "nan": function nan() {
- return true;
- },
-
- "regexp": function regexp(a, b) {
- return a.source === b.source &&
-
- // Include flags in the comparison
- getRegExpFlags(a) === getRegExpFlags(b);
- },
-
- // abort (identical references / instance methods were skipped earlier)
- "function": function _function() {
- return false;
- },
-
- "array": function array(a, b) {
- var i, len;
-
- len = a.length;
- if (len !== b.length) {
-
- // Safe and faster
- return false;
- }
-
- for (i = 0; i < len; i++) {
-
- // Compare non-containers; queue non-reference-equal containers
- if (!breadthFirstCompareChild(a[i], b[i])) {
- return false;
- }
- }
- return true;
- },
-
- // Define sets a and b to be equivalent if for each element aVal in a, there
- // is some element bVal in b such that aVal and bVal are equivalent. Element
- // repetitions are not counted, so these are equivalent:
- // a = new Set( [ {}, [], [] ] );
- // b = new Set( [ {}, {}, [] ] );
- "set": function set$$1(a, b) {
- var innerEq,
- outerEq = true;
-
- if (a.size !== b.size) {
-
- // This optimization has certain quirks because of the lack of
- // repetition counting. For instance, adding the same
- // (reference-identical) element to two equivalent sets can
- // make them non-equivalent.
- return false;
- }
-
- a.forEach(function (aVal) {
-
- // Short-circuit if the result is already known. (Using for...of
- // with a break clause would be cleaner here, but it would cause
- // a syntax error on older Javascript implementations even if
- // Set is unused)
- if (!outerEq) {
- return;
- }
-
- innerEq = false;
-
- b.forEach(function (bVal) {
- var parentPairs;
-
- // Likewise, short-circuit if the result is already known
- if (innerEq) {
- return;
- }
-
- // Swap out the global pairs list, as the nested call to
- // innerEquiv will clobber its contents
- parentPairs = pairs;
- if (innerEquiv(bVal, aVal)) {
- innerEq = true;
- }
-
- // Replace the global pairs list
- pairs = parentPairs;
- });
-
- if (!innerEq) {
- outerEq = false;
- }
- });
-
- return outerEq;
- },
-
- // Define maps a and b to be equivalent if for each key-value pair (aKey, aVal)
- // in a, there is some key-value pair (bKey, bVal) in b such that
- // [ aKey, aVal ] and [ bKey, bVal ] are equivalent. Key repetitions are not
- // counted, so these are equivalent:
- // a = new Map( [ [ {}, 1 ], [ {}, 1 ], [ [], 1 ] ] );
- // b = new Map( [ [ {}, 1 ], [ [], 1 ], [ [], 1 ] ] );
- "map": function map(a, b) {
- var innerEq,
- outerEq = true;
-
- if (a.size !== b.size) {
-
- // This optimization has certain quirks because of the lack of
- // repetition counting. For instance, adding the same
- // (reference-identical) key-value pair to two equivalent maps
- // can make them non-equivalent.
- return false;
- }
-
- a.forEach(function (aVal, aKey) {
-
- // Short-circuit if the result is already known. (Using for...of
- // with a break clause would be cleaner here, but it would cause
- // a syntax error on older Javascript implementations even if
- // Map is unused)
- if (!outerEq) {
- return;
- }
-
- innerEq = false;
-
- b.forEach(function (bVal, bKey) {
- var parentPairs;
-
- // Likewise, short-circuit if the result is already known
- if (innerEq) {
- return;
- }
-
- // Swap out the global pairs list, as the nested call to
- // innerEquiv will clobber its contents
- parentPairs = pairs;
- if (innerEquiv([bVal, bKey], [aVal, aKey])) {
- innerEq = true;
- }
-
- // Replace the global pairs list
- pairs = parentPairs;
- });
-
- if (!innerEq) {
- outerEq = false;
- }
- });
-
- return outerEq;
- },
-
- "object": function object(a, b) {
- var i,
- aProperties = [],
- bProperties = [];
-
- if (compareConstructors(a, b) === false) {
- return false;
- }
-
- // Be strict: don't ensure hasOwnProperty and go deep
- for (i in a) {
-
- // Collect a's properties
- aProperties.push(i);
-
- // Skip OOP methods that look the same
- if (a.constructor !== Object && typeof a.constructor !== "undefined" && typeof a[i] === "function" && typeof b[i] === "function" && a[i].toString() === b[i].toString()) {
- continue;
- }
-
- // Compare non-containers; queue non-reference-equal containers
- if (!breadthFirstCompareChild(a[i], b[i])) {
- return false;
- }
- }
-
- for (i in b) {
-
- // Collect b's properties
- bProperties.push(i);
- }
-
- // Ensures identical properties name
- return typeEquiv(aProperties.sort(), bProperties.sort());
- }
- };
-
- function typeEquiv(a, b) {
- var type = objectType(a);
-
- // Callbacks for containers will append to the pairs queue to achieve breadth-first
- // search order. The pairs queue is also used to avoid reprocessing any pair of
- // containers that are reference-equal to a previously visited pair (a special case
- // this being recursion detection).
- //
- // Because of this approach, once typeEquiv returns a false value, it should not be
- // called again without clearing the pair queue else it may wrongly report a visited
- // pair as being equivalent.
- return objectType(b) === type && callbacks[type](a, b);
- }
-
- function innerEquiv(a, b) {
- var i, pair;
-
- // We're done when there's nothing more to compare
- if (arguments.length < 2) {
- return true;
- }
-
- // Clear the global pair queue and add the top-level values being compared
- pairs = [{ a: a, b: b }];
-
- for (i = 0; i < pairs.length; i++) {
- pair = pairs[i];
-
- // Perform type-specific comparison on any pairs that are not strictly
- // equal. For container types, that comparison will postpone comparison
- // of any sub-container pair to the end of the pair queue. This gives
- // breadth-first search order. It also avoids the reprocessing of
- // reference-equal siblings, cousins etc, which can have a significant speed
- // impact when comparing a container of small objects each of which has a
- // reference to the same (singleton) large object.
- if (pair.a !== pair.b && !typeEquiv(pair.a, pair.b)) {
- return false;
- }
- }
-
- // ...across all consecutive argument pairs
- return arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1));
- }
-
- return function () {
- var result = innerEquiv.apply(undefined, arguments);
-
- // Release any retained objects
- pairs.length = 0;
- return result;
- };
- })();
-
- /**
- * Config object: Maintain internal state
- * Later exposed as QUnit.config
- * `config` initialized at top of scope
- */
- var config = {
-
- // The queue of tests to run
- queue: [],
-
- // Block until document ready
- blocking: true,
-
- // By default, run previously failed tests first
- // very useful in combination with "Hide passed tests" checked
- reorder: true,
-
- // By default, modify document.title when suite is done
- altertitle: true,
-
- // HTML Reporter: collapse every test except the first failing test
- // If false, all failing tests will be expanded
- collapse: true,
-
- // By default, scroll to top of the page when suite is done
- scrolltop: true,
-
- // Depth up-to which object will be dumped
- maxDepth: 5,
-
- // When enabled, all tests must call expect()
- requireExpects: false,
-
- // Placeholder for user-configurable form-exposed URL parameters
- urlConfig: [],
-
- // Set of all modules.
- modules: [],
-
- // The first unnamed module
- currentModule: {
- name: "",
- tests: [],
- childModules: [],
- testsRun: 0,
- unskippedTestsRun: 0,
- hooks: {
- before: [],
- beforeEach: [],
- afterEach: [],
- after: []
- }
- },
-
- callbacks: {},
-
- // The storage module to use for reordering tests
- storage: localSessionStorage
- };
-
- // take a predefined QUnit.config and extend the defaults
- var globalConfig = window$1 && window$1.QUnit && window$1.QUnit.config;
-
- // only extend the global config if there is no QUnit overload
- if (window$1 && window$1.QUnit && !window$1.QUnit.version) {
- extend(config, globalConfig);
- }
-
- // Push a loose unnamed module to the modules collection
- config.modules.push(config.currentModule);
-
- // Based on jsDump by Ariel Flesler
- // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
- var dump = (function () {
- function quote(str) {
- return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
- }
- function literal(o) {
- return o + "";
- }
- function join(pre, arr, post) {
- var s = dump.separator(),
- base = dump.indent(),
- inner = dump.indent(1);
- if (arr.join) {
- arr = arr.join("," + s + inner);
- }
- if (!arr) {
- return pre + post;
- }
- return [pre, inner + arr, base + post].join(s);
- }
- function array(arr, stack) {
- var i = arr.length,
- ret = new Array(i);
-
- if (dump.maxDepth && dump.depth > dump.maxDepth) {
- return "[object Array]";
- }
-
- this.up();
- while (i--) {
- ret[i] = this.parse(arr[i], undefined, stack);
- }
- this.down();
- return join("[", ret, "]");
- }
-
- function isArray(obj) {
- return (
-
- //Native Arrays
- toString.call(obj) === "[object Array]" ||
-
- // NodeList objects
- typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined)
- );
- }
-
- var reName = /^function (\w+)/,
- dump = {
-
- // The objType is used mostly internally, you can fix a (custom) type in advance
- parse: function parse(obj, objType, stack) {
- stack = stack || [];
- var res,
- parser,
- parserType,
- objIndex = stack.indexOf(obj);
-
- if (objIndex !== -1) {
- return "recursion(" + (objIndex - stack.length) + ")";
- }
-
- objType = objType || this.typeOf(obj);
- parser = this.parsers[objType];
- parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser);
-
- if (parserType === "function") {
- stack.push(obj);
- res = parser.call(this, obj, stack);
- stack.pop();
- return res;
- }
- return parserType === "string" ? parser : this.parsers.error;
- },
- typeOf: function typeOf(obj) {
- var type;
-
- if (obj === null) {
- type = "null";
- } else if (typeof obj === "undefined") {
- type = "undefined";
- } else if (is("regexp", obj)) {
- type = "regexp";
- } else if (is("date", obj)) {
- type = "date";
- } else if (is("function", obj)) {
- type = "function";
- } else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) {
- type = "window";
- } else if (obj.nodeType === 9) {
- type = "document";
- } else if (obj.nodeType) {
- type = "node";
- } else if (isArray(obj)) {
- type = "array";
- } else if (obj.constructor === Error.prototype.constructor) {
- type = "error";
- } else {
- type = typeof obj === "undefined" ? "undefined" : _typeof(obj);
- }
- return type;
- },
-
- separator: function separator() {
- if (this.multiline) {
- return this.HTML ? "<br />" : "\n";
- } else {
- return this.HTML ? " " : " ";
- }
- },
-
- // Extra can be a number, shortcut for increasing-calling-decreasing
- indent: function indent(extra) {
- if (!this.multiline) {
- return "";
- }
- var chr = this.indentChar;
- if (this.HTML) {
- chr = chr.replace(/\t/g, " ").replace(/ /g, " ");
- }
- return new Array(this.depth + (extra || 0)).join(chr);
- },
- up: function up(a) {
- this.depth += a || 1;
- },
- down: function down(a) {
- this.depth -= a || 1;
- },
- setParser: function setParser(name, parser) {
- this.parsers[name] = parser;
- },
-
- // The next 3 are exposed so you can use them
- quote: quote,
- literal: literal,
- join: join,
- depth: 1,
- maxDepth: config.maxDepth,
-
- // This is the list of parsers, to modify them, use dump.setParser
- parsers: {
- window: "[Window]",
- document: "[Document]",
- error: function error(_error) {
- return "Error(\"" + _error.message + "\")";
- },
- unknown: "[Unknown]",
- "null": "null",
- "undefined": "undefined",
- "function": function _function(fn) {
- var ret = "function",
-
-
- // Functions never have name in IE
- name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
-
- if (name) {
- ret += " " + name;
- }
- ret += "(";
-
- ret = [ret, dump.parse(fn, "functionArgs"), "){"].join("");
- return join(ret, dump.parse(fn, "functionCode"), "}");
- },
- array: array,
- nodelist: array,
- "arguments": array,
- object: function object(map, stack) {
- var keys,
- key,
- val,
- i,
- nonEnumerableProperties,
- ret = [];
-
- if (dump.maxDepth && dump.depth > dump.maxDepth) {
- return "[object Object]";
- }
-
- dump.up();
- keys = [];
- for (key in map) {
- keys.push(key);
- }
-
- // Some properties are not always enumerable on Error objects.
- nonEnumerableProperties = ["message", "name"];
- for (i in nonEnumerableProperties) {
- key = nonEnumerableProperties[i];
- if (key in map && !inArray(key, keys)) {
- keys.push(key);
- }
- }
- keys.sort();
- for (i = 0; i < keys.length; i++) {
- key = keys[i];
- val = map[key];
- ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack));
- }
- dump.down();
- return join("{", ret, "}");
- },
- node: function node(_node) {
- var len,
- i,
- val,
- open = dump.HTML ? "<" : "<",
- close = dump.HTML ? ">" : ">",
- tag = _node.nodeName.toLowerCase(),
- ret = open + tag,
- attrs = _node.attributes;
-
- if (attrs) {
- for (i = 0, len = attrs.length; i < len; i++) {
- val = attrs[i].nodeValue;
-
- // IE6 includes all attributes in .attributes, even ones not explicitly
- // set. Those have values like undefined, null, 0, false, "" or
- // "inherit".
- if (val && val !== "inherit") {
- ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute");
- }
- }
- }
- ret += close;
-
- // Show content of TextNode or CDATASection
- if (_node.nodeType === 3 || _node.nodeType === 4) {
- ret += _node.nodeValue;
- }
-
- return ret + open + "/" + tag + close;
- },
-
- // Function calls it internally, it's the arguments part of the function
- functionArgs: function functionArgs(fn) {
- var args,
- l = fn.length;
-
- if (!l) {
- return "";
- }
-
- args = new Array(l);
- while (l--) {
-
- // 97 is 'a'
- args[l] = String.fromCharCode(97 + l);
- }
- return " " + args.join(", ") + " ";
- },
-
- // Object calls it internally, the key part of an item in a map
- key: quote,
-
- // Function calls it internally, it's the content of the function
- functionCode: "[code]",
-
- // Node calls it internally, it's a html attribute value
- attribute: quote,
- string: quote,
- date: quote,
- regexp: literal,
- number: literal,
- "boolean": literal,
- symbol: function symbol(sym) {
- return sym.toString();
- }
- },
-
- // If true, entities are escaped ( <, >, \t, space and \n )
- HTML: false,
-
- // Indentation unit
- indentChar: " ",
-
- // If true, items in a collection, are separated by a \n, else just a space.
- multiline: true
- };
-
- return dump;
- })();
-
- var SuiteReport = function () {
- function SuiteReport(name, parentSuite) {
- classCallCheck(this, SuiteReport);
-
- this.name = name;
- this.fullName = parentSuite ? parentSuite.fullName.concat(name) : [];
-
- this.tests = [];
- this.childSuites = [];
-
- if (parentSuite) {
- parentSuite.pushChildSuite(this);
- }
- }
-
- createClass(SuiteReport, [{
- key: "start",
- value: function start(recordTime) {
- if (recordTime) {
- this._startTime = performanceNow();
-
- if (performance) {
- var suiteLevel = this.fullName.length;
- performance.mark("qunit_suite_" + suiteLevel + "_start");
- }
- }
-
- return {
- name: this.name,
- fullName: this.fullName.slice(),
- tests: this.tests.map(function (test) {
- return test.start();
- }),
- childSuites: this.childSuites.map(function (suite) {
- return suite.start();
- }),
- testCounts: {
- total: this.getTestCounts().total
- }
- };
- }
- }, {
- key: "end",
- value: function end(recordTime) {
- if (recordTime) {
- this._endTime = performanceNow();
-
- if (performance) {
- var suiteLevel = this.fullName.length;
- performance.mark("qunit_suite_" + suiteLevel + "_end");
-
- var suiteName = this.fullName.join(" – ");
-
- measure(suiteLevel === 0 ? "QUnit Test Run" : "QUnit Test Suite: " + suiteName, "qunit_suite_" + suiteLevel + "_start", "qunit_suite_" + suiteLevel + "_end");
- }
- }
-
- return {
- name: this.name,
- fullName: this.fullName.slice(),
- tests: this.tests.map(function (test) {
- return test.end();
- }),
- childSuites: this.childSuites.map(function (suite) {
- return suite.end();
- }),
- testCounts: this.getTestCounts(),
- runtime: this.getRuntime(),
- status: this.getStatus()
- };
- }
- }, {
- key: "pushChildSuite",
- value: function pushChildSuite(suite) {
- this.childSuites.push(suite);
- }
- }, {
- key: "pushTest",
- value: function pushTest(test) {
- this.tests.push(test);
- }
- }, {
- key: "getRuntime",
- value: function getRuntime() {
- return this._endTime - this._startTime;
- }
- }, {
- key: "getTestCounts",
- value: function getTestCounts() {
- var counts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : { passed: 0, failed: 0, skipped: 0, todo: 0, total: 0 };
-
- counts = this.tests.reduce(function (counts, test) {
- if (test.valid) {
- counts[test.getStatus()]++;
- counts.total++;
- }
-
- return counts;
- }, counts);
-
- return this.childSuites.reduce(function (counts, suite) {
- return suite.getTestCounts(counts);
- }, counts);
- }
- }, {
- key: "getStatus",
- value: function getStatus() {
- var _getTestCounts = this.getTestCounts(),
- total = _getTestCounts.total,
- failed = _getTestCounts.failed,
- skipped = _getTestCounts.skipped,
- todo = _getTestCounts.todo;
-
- if (failed) {
- return "failed";
- } else {
- if (skipped === total) {
- return "skipped";
- } else if (todo === total) {
- return "todo";
- } else {
- return "passed";
- }
- }
- }
- }]);
- return SuiteReport;
- }();
-
- var focused = false;
-
- var moduleStack = [];
-
- function createModule(name, testEnvironment, modifiers) {
- var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null;
- var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name;
- var parentSuite = parentModule ? parentModule.suiteReport : globalSuite;
-
- var skip = parentModule !== null && parentModule.skip || modifiers.skip;
- var todo = parentModule !== null && parentModule.todo || modifiers.todo;
-
- var module = {
- name: moduleName,
- parentModule: parentModule,
- tests: [],
- moduleId: generateHash(moduleName),
- testsRun: 0,
- unskippedTestsRun: 0,
- childModules: [],
- suiteReport: new SuiteReport(name, parentSuite),
-
- // Pass along `skip` and `todo` properties from parent module, in case
- // there is one, to childs. And use own otherwise.
- // This property will be used to mark own tests and tests of child suites
- // as either `skipped` or `todo`.
- skip: skip,
- todo: skip ? false : todo
- };
-
- var env = {};
- if (parentModule) {
- parentModule.childModules.push(module);
- extend(env, parentModule.testEnvironment);
- }
- extend(env, testEnvironment);
- module.testEnvironment = env;
-
- config.modules.push(module);
- return module;
- }
-
- function processModule(name, options, executeNow) {
- var modifiers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
- if (objectType(options) === "function") {
- executeNow = options;
- options = undefined;
- }
-
- var module = createModule(name, options, modifiers);
-
- // Move any hooks to a 'hooks' object
- var testEnvironment = module.testEnvironment;
- var hooks = module.hooks = {};
-
- setHookFromEnvironment(hooks, testEnvironment, "before");
- setHookFromEnvironment(hooks, testEnvironment, "beforeEach");
- setHookFromEnvironment(hooks, testEnvironment, "afterEach");
- setHookFromEnvironment(hooks, testEnvironment, "after");
-
- var moduleFns = {
- before: setHookFunction(module, "before"),
- beforeEach: setHookFunction(module, "beforeEach"),
- afterEach: setHookFunction(module, "afterEach"),
- after: setHookFunction(module, "after")
- };
-
- var currentModule = config.currentModule;
- if (objectType(executeNow) === "function") {
- moduleStack.push(module);
- config.currentModule = module;
- executeNow.call(module.testEnvironment, moduleFns);
- moduleStack.pop();
- module = module.parentModule || currentModule;
- }
-
- config.currentModule = module;
-
- function setHookFromEnvironment(hooks, environment, name) {
- var potentialHook = environment[name];
- hooks[name] = typeof potentialHook === "function" ? [potentialHook] : [];
- delete environment[name];
- }
-
- function setHookFunction(module, hookName) {
- return function setHook(callback) {
- module.hooks[hookName].push(callback);
- };
- }
- }
-
- function module$1(name, options, executeNow) {
- if (focused) {
- return;
- }
-
- processModule(name, options, executeNow);
- }
-
- module$1.only = function () {
- if (focused) {
- return;
- }
-
- config.modules.length = 0;
- config.queue.length = 0;
-
- module$1.apply(undefined, arguments);
-
- focused = true;
- };
-
- module$1.skip = function (name, options, executeNow) {
- if (focused) {
- return;
- }
-
- processModule(name, options, executeNow, { skip: true });
- };
-
- module$1.todo = function (name, options, executeNow) {
- if (focused) {
- return;
- }
-
- processModule(name, options, executeNow, { todo: true });
- };
-
- var LISTENERS = Object.create(null);
- var SUPPORTED_EVENTS = ["runStart", "suiteStart", "testStart", "assertion", "testEnd", "suiteEnd", "runEnd"];
-
- /**
- * Emits an event with the specified data to all currently registered listeners.
- * Callbacks will fire in the order in which they are registered (FIFO). This
- * function is not exposed publicly; it is used by QUnit internals to emit
- * logging events.
- *
- * @private
- * @method emit
- * @param {String} eventName
- * @param {Object} data
- * @return {Void}
- */
- function emit(eventName, data) {
- if (objectType(eventName) !== "string") {
- throw new TypeError("eventName must be a string when emitting an event");
- }
-
- // Clone the callbacks in case one of them registers a new callback
- var originalCallbacks = LISTENERS[eventName];
- var callbacks = originalCallbacks ? [].concat(toConsumableArray(originalCallbacks)) : [];
-
- for (var i = 0; i < callbacks.length; i++) {
- callbacks[i](data);
- }
- }
-
- /**
- * Registers a callback as a listener to the specified event.
- *
- * @public
- * @method on
- * @param {String} eventName
- * @param {Function} callback
- * @return {Void}
- */
- function on(eventName, callback) {
- if (objectType(eventName) !== "string") {
- throw new TypeError("eventName must be a string when registering a listener");
- } else if (!inArray(eventName, SUPPORTED_EVENTS)) {
- var events = SUPPORTED_EVENTS.join(", ");
- throw new Error("\"" + eventName + "\" is not a valid event; must be one of: " + events + ".");
- } else if (objectType(callback) !== "function") {
- throw new TypeError("callback must be a function when registering a listener");
- }
-
- if (!LISTENERS[eventName]) {
- LISTENERS[eventName] = [];
- }
-
- // Don't register the same callback more than once
- if (!inArray(callback, LISTENERS[eventName])) {
- LISTENERS[eventName].push(callback);
- }
- }
-
- function objectOrFunction(x) {
- var type = typeof x === 'undefined' ? 'undefined' : _typeof(x);
- return x !== null && (type === 'object' || type === 'function');
- }
-
- function isFunction(x) {
- return typeof x === 'function';
- }
-
-
-
- var _isArray = void 0;
- if (Array.isArray) {
- _isArray = Array.isArray;
- } else {
- _isArray = function _isArray(x) {
- return Object.prototype.toString.call(x) === '[object Array]';
- };
- }
-
- var isArray = _isArray;
-
- var len = 0;
- var vertxNext = void 0;
- var customSchedulerFn = void 0;
-
- var asap = function asap(callback, arg) {
- queue[len] = callback;
- queue[len + 1] = arg;
- len += 2;
- if (len === 2) {
- // If len is 2, that means that we need to schedule an async flush.
- // If additional callbacks are queued before the queue is flushed, they
- // will be processed by this flush that we are scheduling.
- if (customSchedulerFn) {
- customSchedulerFn(flush);
- } else {
- scheduleFlush();
- }
- }
- };
-
- function setScheduler(scheduleFn) {
- customSchedulerFn = scheduleFn;
- }
-
- function setAsap(asapFn) {
- asap = asapFn;
- }
-
- var browserWindow = typeof window !== 'undefined' ? window : undefined;
- var browserGlobal = browserWindow || {};
- var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
- var isNode = typeof self === 'undefined' && typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
-
- // test for web worker but not in IE10
- var isWorker = typeof Uint8ClampedArray !== 'undefined' && typeof importScripts !== 'undefined' && typeof MessageChannel !== 'undefined';
-
- // node
- function useNextTick() {
- // node version 0.10.x displays a deprecation warning when nextTick is used recursively
- // see https://github.com/cujojs/when/issues/410 for details
- return function () {
- return process.nextTick(flush);
- };
- }
-
- // vertx
- function useVertxTimer() {
- if (typeof vertxNext !== 'undefined') {
- return function () {
- vertxNext(flush);
- };
- }
-
- return useSetTimeout();
- }
-
- function useMutationObserver() {
- var iterations = 0;
- var observer = new BrowserMutationObserver(flush);
- var node = document.createTextNode('');
- observer.observe(node, { characterData: true });
-
- return function () {
- node.data = iterations = ++iterations % 2;
- };
- }
-
- // web worker
- function useMessageChannel() {
- var channel = new MessageChannel();
- channel.port1.onmessage = flush;
- return function () {
- return channel.port2.postMessage(0);
- };
- }
-
- function useSetTimeout() {
- // Store setTimeout reference so es6-promise will be unaffected by
- // other code modifying setTimeout (like sinon.useFakeTimers())
- var globalSetTimeout = setTimeout;
- return function () {
- return globalSetTimeout(flush, 1);
- };
- }
-
- var queue = new Array(1000);
- function flush() {
- for (var i = 0; i < len; i += 2) {
- var callback = queue[i];
- var arg = queue[i + 1];
-
- callback(arg);
-
- queue[i] = undefined;
- queue[i + 1] = undefined;
- }
-
- len = 0;
- }
-
- function attemptVertx() {
- try {
- var vertx = Function('return this')().require('vertx');
- vertxNext = vertx.runOnLoop || vertx.runOnContext;
- return useVertxTimer();
- } catch (e) {
- return useSetTimeout();
- }
- }
-
- var scheduleFlush = void 0;
- // Decide what async method to use to triggering processing of queued callbacks:
- if (isNode) {
- scheduleFlush = useNextTick();
- } else if (BrowserMutationObserver) {
- scheduleFlush = useMutationObserver();
- } else if (isWorker) {
- scheduleFlush = useMessageChannel();
- } else if (browserWindow === undefined && typeof require === 'function') {
- scheduleFlush = attemptVertx();
- } else {
- scheduleFlush = useSetTimeout();
- }
-
- function then(onFulfillment, onRejection) {
- var parent = this;
-
- var child = new this.constructor(noop);
-
- if (child[PROMISE_ID] === undefined) {
- makePromise(child);
- }
-
- var _state = parent._state;
-
-
- if (_state) {
- var callback = arguments[_state - 1];
- asap(function () {
- return invokeCallback(_state, child, callback, parent._result);
- });
- } else {
- subscribe(parent, child, onFulfillment, onRejection);
- }
-
- return child;
- }
-
- /**
- `Promise.resolve` returns a promise that will become resolved with the
- passed `value`. It is shorthand for the following:
-
- ```javascript
- let promise = new Promise(function(resolve, reject){
- resolve(1);
- });
-
- promise.then(function(value){
- // value === 1
- });
- ```
-
- Instead of writing the above, your code now simply becomes the following:
-
- ```javascript
- let promise = Promise.resolve(1);
-
- promise.then(function(value){
- // value === 1
- });
- ```
-
- @method resolve
- @static
- @param {Any} value value that the returned promise will be resolved with
- Useful for tooling.
- @return {Promise} a promise that will become fulfilled with the given
- `value`
- */
- function resolve$1(object) {
- /*jshint validthis:true */
- var Constructor = this;
-
- if (object && (typeof object === 'undefined' ? 'undefined' : _typeof(object)) === 'object' && object.constructor === Constructor) {
- return object;
- }
-
- var promise = new Constructor(noop);
- resolve(promise, object);
- return promise;
- }
-
- var PROMISE_ID = Math.random().toString(36).substring(2);
-
- function noop() {}
-
- var PENDING = void 0;
- var FULFILLED = 1;
- var REJECTED = 2;
-
- var TRY_CATCH_ERROR = { error: null };
-
- function selfFulfillment() {
- return new TypeError("You cannot resolve a promise with itself");
- }
-
- function cannotReturnOwn() {
- return new TypeError('A promises callback cannot return that same promise.');
- }
-
- function getThen(promise) {
- try {
- return promise.then;
- } catch (error) {
- TRY_CATCH_ERROR.error = error;
- return TRY_CATCH_ERROR;
- }
- }
-
- function tryThen(then$$1, value, fulfillmentHandler, rejectionHandler) {
- try {
- then$$1.call(value, fulfillmentHandler, rejectionHandler);
- } catch (e) {
- return e;
- }
- }
-
- function handleForeignThenable(promise, thenable, then$$1) {
- asap(function (promise) {
- var sealed = false;
- var error = tryThen(then$$1, thenable, function (value) {
- if (sealed) {
- return;
- }
- sealed = true;
- if (thenable !== value) {
- resolve(promise, value);
- } else {
- fulfill(promise, value);
- }
- }, function (reason) {
- if (sealed) {
- return;
- }
- sealed = true;
-
- reject(promise, reason);
- }, 'Settle: ' + (promise._label || ' unknown promise'));
-
- if (!sealed && error) {
- sealed = true;
- reject(promise, error);
- }
- }, promise);
- }
-
- function handleOwnThenable(promise, thenable) {
- if (thenable._state === FULFILLED) {
- fulfill(promise, thenable._result);
- } else if (thenable._state === REJECTED) {
- reject(promise, thenable._result);
- } else {
- subscribe(thenable, undefined, function (value) {
- return resolve(promise, value);
- }, function (reason) {
- return reject(promise, reason);
- });
- }
- }
-
- function handleMaybeThenable(promise, maybeThenable, then$$1) {
- if (maybeThenable.constructor === promise.constructor && then$$1 === then && maybeThenable.constructor.resolve === resolve$1) {
- handleOwnThenable(promise, maybeThenable);
- } else {
- if (then$$1 === TRY_CATCH_ERROR) {
- reject(promise, TRY_CATCH_ERROR.error);
- TRY_CATCH_ERROR.error = null;
- } else if (then$$1 === undefined) {
- fulfill(promise, maybeThenable);
- } else if (isFunction(then$$1)) {
- handleForeignThenable(promise, maybeThenable, then$$1);
- } else {
- fulfill(promise, maybeThenable);
- }
- }
- }
-
- function resolve(promise, value) {
- if (promise === value) {
- reject(promise, selfFulfillment());
- } else if (objectOrFunction(value)) {
- handleMaybeThenable(promise, value, getThen(value));
- } else {
- fulfill(promise, value);
- }
- }
-
- function publishRejection(promise) {
- if (promise._onerror) {
- promise._onerror(promise._result);
- }
-
- publish(promise);
- }
-
- function fulfill(promise, value) {
- if (promise._state !== PENDING) {
- return;
- }
-
- promise._result = value;
- promise._state = FULFILLED;
-
- if (promise._subscribers.length !== 0) {
- asap(publish, promise);
- }
- }
-
- function reject(promise, reason) {
- if (promise._state !== PENDING) {
- return;
- }
- promise._state = REJECTED;
- promise._result = reason;
-
- asap(publishRejection, promise);
- }
-
- function subscribe(parent, child, onFulfillment, onRejection) {
- var _subscribers = parent._subscribers;
- var length = _subscribers.length;
-
-
- parent._onerror = null;
-
- _subscribers[length] = child;
- _subscribers[length + FULFILLED] = onFulfillment;
- _subscribers[length + REJECTED] = onRejection;
-
- if (length === 0 && parent._state) {
- asap(publish, parent);
- }
- }
-
- function publish(promise) {
- var subscribers = promise._subscribers;
- var settled = promise._state;
-
- if (subscribers.length === 0) {
- return;
- }
-
- var child = void 0,
- callback = void 0,
- detail = promise._result;
-
- for (var i = 0; i < subscribers.length; i += 3) {
- child = subscribers[i];
- callback = subscribers[i + settled];
-
- if (child) {
- invokeCallback(settled, child, callback, detail);
- } else {
- callback(detail);
- }
- }
-
- promise._subscribers.length = 0;
- }
-
- function tryCatch(callback, detail) {
- try {
- return callback(detail);
- } catch (e) {
- TRY_CATCH_ERROR.error = e;
- return TRY_CATCH_ERROR;
- }
- }
-
- function invokeCallback(settled, promise, callback, detail) {
- var hasCallback = isFunction(callback),
- value = void 0,
- error = void 0,
- succeeded = void 0,
- failed = void 0;
-
- if (hasCallback) {
- value = tryCatch(callback, detail);
-
- if (value === TRY_CATCH_ERROR) {
- failed = true;
- error = value.error;
- value.error = null;
- } else {
- succeeded = true;
- }
-
- if (promise === value) {
- reject(promise, cannotReturnOwn());
- return;
- }
- } else {
- value = detail;
- succeeded = true;
- }
-
- if (promise._state !== PENDING) {
- // noop
- } else if (hasCallback && succeeded) {
- resolve(promise, value);
- } else if (failed) {
- reject(promise, error);
- } else if (settled === FULFILLED) {
- fulfill(promise, value);
- } else if (settled === REJECTED) {
- reject(promise, value);
- }
- }
-
- function initializePromise(promise, resolver) {
- try {
- resolver(function resolvePromise(value) {
- resolve(promise, value);
- }, function rejectPromise(reason) {
- reject(promise, reason);
- });
- } catch (e) {
- reject(promise, e);
- }
- }
-
- var id = 0;
- function nextId() {
- return id++;
- }
-
- function makePromise(promise) {
- promise[PROMISE_ID] = id++;
- promise._state = undefined;
- promise._result = undefined;
- promise._subscribers = [];
- }
-
- function validationError() {
- return new Error('Array Methods must be provided an Array');
- }
-
- var Enumerator = function () {
- function Enumerator(Constructor, input) {
- classCallCheck(this, Enumerator);
-
- this._instanceConstructor = Constructor;
- this.promise = new Constructor(noop);
-
- if (!this.promise[PROMISE_ID]) {
- makePromise(this.promise);
- }
-
- if (isArray(input)) {
- this.length = input.length;
- this._remaining = input.length;
-
- this._result = new Array(this.length);
-
- if (this.length === 0) {
- fulfill(this.promise, this._result);
- } else {
- this.length = this.length || 0;
- this._enumerate(input);
- if (this._remaining === 0) {
- fulfill(this.promise, this._result);
- }
- }
- } else {
- reject(this.promise, validationError());
- }
- }
-
- createClass(Enumerator, [{
- key: '_enumerate',
- value: function _enumerate(input) {
- for (var i = 0; this._state === PENDING && i < input.length; i++) {
- this._eachEntry(input[i], i);
- }
- }
- }, {
- key: '_eachEntry',
- value: function _eachEntry(entry, i) {
- var c = this._instanceConstructor;
- var resolve$$1 = c.resolve;
-
-
- if (resolve$$1 === resolve$1) {
- var _then = getThen(entry);
-
- if (_then === then && entry._state !== PENDING) {
- this._settledAt(entry._state, i, entry._result);
- } else if (typeof _then !== 'function') {
- this._remaining--;
- this._result[i] = entry;
- } else if (c === Promise$2) {
- var promise = new c(noop);
- handleMaybeThenable(promise, entry, _then);
- this._willSettleAt(promise, i);
- } else {
- this._willSettleAt(new c(function (resolve$$1) {
- return resolve$$1(entry);
- }), i);
- }
- } else {
- this._willSettleAt(resolve$$1(entry), i);
- }
- }
- }, {
- key: '_settledAt',
- value: function _settledAt(state, i, value) {
- var promise = this.promise;
-
-
- if (promise._state === PENDING) {
- this._remaining--;
-
- if (state === REJECTED) {
- reject(promise, value);
- } else {
- this._result[i] = value;
- }
- }
-
- if (this._remaining === 0) {
- fulfill(promise, this._result);
- }
- }
- }, {
- key: '_willSettleAt',
- value: function _willSettleAt(promise, i) {
- var enumerator = this;
-
- subscribe(promise, undefined, function (value) {
- return enumerator._settledAt(FULFILLED, i, value);
- }, function (reason) {
- return enumerator._settledAt(REJECTED, i, reason);
- });
- }
- }]);
- return Enumerator;
- }();
-
- /**
- `Promise.all` accepts an array of promises, and returns a new promise which
- is fulfilled with an array of fulfillment values for the passed promises, or
- rejected with the reason of the first passed promise to be rejected. It casts all
- elements of the passed iterable to promises as it runs this algorithm.
-
- Example:
-
- ```javascript
- let promise1 = resolve(1);
- let promise2 = resolve(2);
- let promise3 = resolve(3);
- let promises = [ promise1, promise2, promise3 ];
-
- Promise.all(promises).then(function(array){
- // The array here would be [ 1, 2, 3 ];
- });
- ```
-
- If any of the `promises` given to `all` are rejected, the first promise
- that is rejected will be given as an argument to the returned promises's
- rejection handler. For example:
-
- Example:
-
- ```javascript
- let promise1 = resolve(1);
- let promise2 = reject(new Error("2"));
- let promise3 = reject(new Error("3"));
- let promises = [ promise1, promise2, promise3 ];
-
- Promise.all(promises).then(function(array){
- // Code here never runs because there are rejected promises!
- }, function(error) {
- // error.message === "2"
- });
- ```
-
- @method all
- @static
- @param {Array} entries array of promises
- @param {String} label optional string for labeling the promise.
- Useful for tooling.
- @return {Promise} promise that is fulfilled when all `promises` have been
- fulfilled, or rejected if any of them become rejected.
- @static
- */
- function all(entries) {
- return new Enumerator(this, entries).promise;
- }
-
- /**
- `Promise.race` returns a new promise which is settled in the same way as the
- first passed promise to settle.
-
- Example:
-
- ```javascript
- let promise1 = new Promise(function(resolve, reject){
- setTimeout(function(){
- resolve('promise 1');
- }, 200);
- });
-
- let promise2 = new Promise(function(resolve, reject){
- setTimeout(function(){
- resolve('promise 2');
- }, 100);
- });
-
- Promise.race([promise1, promise2]).then(function(result){
- // result === 'promise 2' because it was resolved before promise1
- // was resolved.
- });
- ```
-
- `Promise.race` is deterministic in that only the state of the first
- settled promise matters. For example, even if other promises given to the
- `promises` array argument are resolved, but the first settled promise has
- become rejected before the other promises became fulfilled, the returned
- promise will become rejected:
-
- ```javascript
- let promise1 = new Promise(function(resolve, reject){
- setTimeout(function(){
- resolve('promise 1');
- }, 200);
- });
-
- let promise2 = new Promise(function(resolve, reject){
- setTimeout(function(){
- reject(new Error('promise 2'));
- }, 100);
- });
-
- Promise.race([promise1, promise2]).then(function(result){
- // Code here never runs
- }, function(reason){
- // reason.message === 'promise 2' because promise 2 became rejected before
- // promise 1 became fulfilled
- });
- ```
-
- An example real-world use case is implementing timeouts:
-
- ```javascript
- Promise.race([ajax('foo.json'), timeout(5000)])
- ```
-
- @method race
- @static
- @param {Array} promises array of promises to observe
- Useful for tooling.
- @return {Promise} a promise which settles in the same way as the first passed
- promise to settle.
- */
- function race(entries) {
- /*jshint validthis:true */
- var Constructor = this;
-
- if (!isArray(entries)) {
- return new Constructor(function (_, reject) {
- return reject(new TypeError('You must pass an array to race.'));
- });
- } else {
- return new Constructor(function (resolve, reject) {
- var length = entries.length;
- for (var i = 0; i < length; i++) {
- Constructor.resolve(entries[i]).then(resolve, reject);
- }
- });
- }
- }
-
- /**
- `Promise.reject` returns a promise rejected with the passed `reason`.
- It is shorthand for the following:
-
- ```javascript
- let promise = new Promise(function(resolve, reject){
- reject(new Error('WHOOPS'));
- });
-
- promise.then(function(value){
- // Code here doesn't run because the promise is rejected!
- }, function(reason){
- // reason.message === 'WHOOPS'
- });
- ```
-
- Instead of writing the above, your code now simply becomes the following:
-
- ```javascript
- let promise = Promise.reject(new Error('WHOOPS'));
-
- promise.then(function(value){
- // Code here doesn't run because the promise is rejected!
- }, function(reason){
- // reason.message === 'WHOOPS'
- });
- ```
-
- @method reject
- @static
- @param {Any} reason value that the returned promise will be rejected with.
- Useful for tooling.
- @return {Promise} a promise rejected with the given `reason`.
- */
- function reject$1(reason) {
- /*jshint validthis:true */
- var Constructor = this;
- var promise = new Constructor(noop);
- reject(promise, reason);
- return promise;
- }
-
- function needsResolver() {
- throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
- }
-
- function needsNew() {
- throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
- }
-
- /**
- Promise objects represent the eventual result of an asynchronous operation. The
- primary way of interacting with a promise is through its `then` method, which
- registers callbacks to receive either a promise's eventual value or the reason
- why the promise cannot be fulfilled.
-
- Terminology
- -----------
-
- - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
- - `thenable` is an object or function that defines a `then` method.
- - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
- - `exception` is a value that is thrown using the throw statement.
- - `reason` is a value that indicates why a promise was rejected.
- - `settled` the final resting state of a promise, fulfilled or rejected.
-
- A promise can be in one of three states: pending, fulfilled, or rejected.
-
- Promises that are fulfilled have a fulfillment value and are in the fulfilled
- state. Promises that are rejected have a rejection reason and are in the
- rejected state. A fulfillment value is never a thenable.
-
- Promises can also be said to *resolve* a value. If this value is also a
- promise, then the original promise's settled state will match the value's
- settled state. So a promise that *resolves* a promise that rejects will
- itself reject, and a promise that *resolves* a promise that fulfills will
- itself fulfill.
-
-
- Basic Usage:
- ------------
-
- ```js
- let promise = new Promise(function(resolve, reject) {
- // on success
- resolve(value);
-
- // on failure
- reject(reason);
- });
-
- promise.then(function(value) {
- // on fulfillment
- }, function(reason) {
- // on rejection
- });
- ```
-
- Advanced Usage:
- ---------------
-
- Promises shine when abstracting away asynchronous interactions such as
- `XMLHttpRequest`s.
-
- ```js
- function getJSON(url) {
- return new Promise(function(resolve, reject){
- let xhr = new XMLHttpRequest();
-
- xhr.open('GET', url);
- xhr.onreadystatechange = handler;
- xhr.responseType = 'json';
- xhr.setRequestHeader('Accept', 'application/json');
- xhr.send();
-
- function handler() {
- if (this.readyState === this.DONE) {
- if (this.status === 200) {
- resolve(this.response);
- } else {
- reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']'));
- }
- }
- };
- });
- }
-
- getJSON('/posts.json').then(function(json) {
- // on fulfillment
- }, function(reason) {
- // on rejection
- });
- ```
-
- Unlike callbacks, promises are great composable primitives.
-
- ```js
- Promise.all([
- getJSON('/posts'),
- getJSON('/comments')
- ]).then(function(values){
- values[0] // => postsJSON
- values[1] // => commentsJSON
-
- return values;
- });
- ```
-
- @class Promise
- @param {Function} resolver
- Useful for tooling.
- @constructor
- */
-
- var Promise$2 = function () {
- function Promise(resolver) {
- classCallCheck(this, Promise);
-
- this[PROMISE_ID] = nextId();
- this._result = this._state = undefined;
- this._subscribers = [];
-
- if (noop !== resolver) {
- typeof resolver !== 'function' && needsResolver();
- this instanceof Promise ? initializePromise(this, resolver) : needsNew();
- }
- }
-
- /**
- The primary way of interacting with a promise is through its `then` method,
- which registers callbacks to receive either a promise's eventual value or the
- reason why the promise cannot be fulfilled.
- ```js
- findUser().then(function(user){
- // user is available
- }, function(reason){
- // user is unavailable, and you are given the reason why
- });
- ```
- Chaining
- --------
- The return value of `then` is itself a promise. This second, 'downstream'
- promise is resolved with the return value of the first promise's fulfillment
- or rejection handler, or rejected if the handler throws an exception.
- ```js
- findUser().then(function (user) {
- return user.name;
- }, function (reason) {
- return 'default name';
- }).then(function (userName) {
- // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
- // will be `'default name'`
- });
- findUser().then(function (user) {
- throw new Error('Found user, but still unhappy');
- }, function (reason) {
- throw new Error('`findUser` rejected and we're unhappy');
- }).then(function (value) {
- // never reached
- }, function (reason) {
- // if `findUser` fulfilled, `reason` will be 'Found user, but still unhappy'.
- // If `findUser` rejected, `reason` will be '`findUser` rejected and we're unhappy'.
- });
- ```
- If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
- ```js
- findUser().then(function (user) {
- throw new PedagogicalException('Upstream error');
- }).then(function (value) {
- // never reached
- }).then(function (value) {
- // never reached
- }, function (reason) {
- // The `PedgagocialException` is propagated all the way down to here
- });
- ```
- Assimilation
- ------------
- Sometimes the value you want to propagate to a downstream promise can only be
- retrieved asynchronously. This can be achieved by returning a promise in the
- fulfillment or rejection handler. The downstream promise will then be pending
- until the returned promise is settled. This is called *assimilation*.
- ```js
- findUser().then(function (user) {
- return findCommentsByAuthor(user);
- }).then(function (comments) {
- // The user's comments are now available
- });
- ```
- If the assimliated promise rejects, then the downstream promise will also reject.
- ```js
- findUser().then(function (user) {
- return findCommentsByAuthor(user);
- }).then(function (comments) {
- // If `findCommentsByAuthor` fulfills, we'll have the value here
- }, function (reason) {
- // If `findCommentsByAuthor` rejects, we'll have the reason here
- });
- ```
- Simple Example
- --------------
- Synchronous Example
- ```javascript
- let result;
- try {
- result = findResult();
- // success
- } catch(reason) {
- // failure
- }
- ```
- Errback Example
- ```js
- findResult(function(result, err){
- if (err) {
- // failure
- } else {
- // success
- }
- });
- ```
- Promise Example;
- ```javascript
- findResult().then(function(result){
- // success
- }, function(reason){
- // failure
- });
- ```
- Advanced Example
- --------------
- Synchronous Example
- ```javascript
- let author, books;
- try {
- author = findAuthor();
- books = findBooksByAuthor(author);
- // success
- } catch(reason) {
- // failure
- }
- ```
- Errback Example
- ```js
- function foundBooks(books) {
- }
- function failure(reason) {
- }
- findAuthor(function(author, err){
- if (err) {
- failure(err);
- // failure
- } else {
- try {
- findBoooksByAuthor(author, function(books, err) {
- if (err) {
- failure(err);
- } else {
- try {
- foundBooks(books);
- } catch(reason) {
- failure(reason);
- }
- }
- });
- } catch(error) {
- failure(err);
- }
- // success
- }
- });
- ```
- Promise Example;
- ```javascript
- findAuthor().
- then(findBooksByAuthor).
- then(function(books){
- // found books
- }).catch(function(reason){
- // something went wrong
- });
- ```
- @method then
- @param {Function} onFulfilled
- @param {Function} onRejected
- Useful for tooling.
- @return {Promise}
- */
-
- /**
- `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
- as the catch block of a try/catch statement.
- ```js
- function findAuthor(){
- throw new Error('couldn't find that author');
- }
- // synchronous
- try {
- findAuthor();
- } catch(reason) {
- // something went wrong
- }
- // async with promises
- findAuthor().catch(function(reason){
- // something went wrong
- });
- ```
- @method catch
- @param {Function} onRejection
- Useful for tooling.
- @return {Promise}
- */
-
-
- createClass(Promise, [{
- key: 'catch',
- value: function _catch(onRejection) {
- return this.then(null, onRejection);
- }
-
- /**
- `finally` will be invoked regardless of the promise's fate just as native
- try/catch/finally behaves
-
- Synchronous example:
-
- ```js
- findAuthor() {
- if (Math.random() > 0.5) {
- throw new Error();
- }
- return new Author();
- }
-
- try {
- return findAuthor(); // succeed or fail
- } catch(error) {
- return findOtherAuther();
- } finally {
- // always runs
- // doesn't affect the return value
- }
- ```
-
- Asynchronous example:
-
- ```js
- findAuthor().catch(function(reason){
- return findOtherAuther();
- }).finally(function(){
- // author was either found, or not
- });
- ```
-
- @method finally
- @param {Function} callback
- @return {Promise}
- */
-
- }, {
- key: 'finally',
- value: function _finally(callback) {
- var promise = this;
- var constructor = promise.constructor;
-
- if (isFunction(callback)) {
- return promise.then(function (value) {
- return constructor.resolve(callback()).then(function () {
- return value;
- });
- }, function (reason) {
- return constructor.resolve(callback()).then(function () {
- throw reason;
- });
- });
- }
-
- return promise.then(callback, callback);
- }
- }]);
- return Promise;
- }();
-
- Promise$2.prototype.then = then;
- Promise$2.all = all;
- Promise$2.race = race;
- Promise$2.resolve = resolve$1;
- Promise$2.reject = reject$1;
- Promise$2._setScheduler = setScheduler;
- Promise$2._setAsap = setAsap;
- Promise$2._asap = asap;
-
- /*global self*/
- function polyfill() {
- var local = void 0;
-
- if (typeof global !== 'undefined') {
- local = global;
- } else if (typeof self !== 'undefined') {
- local = self;
- } else {
- try {
- local = Function('return this')();
- } catch (e) {
- throw new Error('polyfill failed because global object is unavailable in this environment');
- }
- }
-
- var P = local.Promise;
-
- if (P) {
- var promiseToString = null;
- try {
- promiseToString = Object.prototype.toString.call(P.resolve());
- } catch (e) {
- // silently ignored
- }
-
- if (promiseToString === '[object Promise]' && !P.cast) {
- return;
- }
- }
-
- local.Promise = Promise$2;
- }
-
- // Strange compat..
- Promise$2.polyfill = polyfill;
- Promise$2.Promise = Promise$2;
-
- var Promise$1 = typeof Promise !== "undefined" ? Promise : Promise$2;
-
- // Register logging callbacks
- function registerLoggingCallbacks(obj) {
- var i,
- l,
- key,
- callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"];
-
- function registerLoggingCallback(key) {
- var loggingCallback = function loggingCallback(callback) {
- if (objectType(callback) !== "function") {
- throw new Error("QUnit logging methods require a callback function as their first parameters.");
- }
-
- config.callbacks[key].push(callback);
- };
-
- return loggingCallback;
- }
-
- for (i = 0, l = callbackNames.length; i < l; i++) {
- key = callbackNames[i];
-
- // Initialize key collection of logging callback
- if (objectType(config.callbacks[key]) === "undefined") {
- config.callbacks[key] = [];
- }
-
- obj[key] = registerLoggingCallback(key);
- }
- }
-
- function runLoggingCallbacks(key, args) {
- var callbacks = config.callbacks[key];
-
- // Handling 'log' callbacks separately. Unlike the other callbacks,
- // the log callback is not controlled by the processing queue,
- // but rather used by asserts. Hence to promisfy the 'log' callback
- // would mean promisfying each step of a test
- if (key === "log") {
- callbacks.map(function (callback) {
- return callback(args);
- });
- return;
- }
-
- // ensure that each callback is executed serially
- return callbacks.reduce(function (promiseChain, callback) {
- return promiseChain.then(function () {
- return Promise$1.resolve(callback(args));
- });
- }, Promise$1.resolve([]));
- }
-
- // Doesn't support IE9, it will return undefined on these browsers
- // See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
- var fileName = (sourceFromStacktrace(0) || "").replace(/(:\d+)+\)?/, "").replace(/.+\//, "");
-
- function extractStacktrace(e, offset) {
- offset = offset === undefined ? 4 : offset;
-
- var stack, include, i;
-
- if (e && e.stack) {
- stack = e.stack.split("\n");
- if (/^error$/i.test(stack[0])) {
- stack.shift();
- }
- if (fileName) {
- include = [];
- for (i = offset; i < stack.length; i++) {
- if (stack[i].indexOf(fileName) !== -1) {
- break;
- }
- include.push(stack[i]);
- }
- if (include.length) {
- return include.join("\n");
- }
- }
- return stack[offset];
- }
- }
-
- function sourceFromStacktrace(offset) {
- var error = new Error();
-
- // Support: Safari <=7 only, IE <=10 - 11 only
- // Not all browsers generate the `stack` property for `new Error()`, see also #636
- if (!error.stack) {
- try {
- throw error;
- } catch (err) {
- error = err;
- }
- }
-
- return extractStacktrace(error, offset);
- }
-
- var priorityCount = 0;
- var unitSampler = void 0;
-
- // This is a queue of functions that are tasks within a single test.
- // After tests are dequeued from config.queue they are expanded into
- // a set of tasks in this queue.
- var taskQueue = [];
-
- /**
- * Advances the taskQueue to the next task. If the taskQueue is empty,
- * process the testQueue
- */
- function advance() {
- advanceTaskQueue();
-
- if (!taskQueue.length && !config.blocking && !config.current) {
- advanceTestQueue();
- }
- }
-
- /**
- * Advances the taskQueue with an increased depth
- */
- function advanceTaskQueue() {
- var start = now();
- config.depth = (config.depth || 0) + 1;
-
- processTaskQueue(start);
-
- config.depth--;
- }
-
- /**
- * Process the first task on the taskQueue as a promise.
- * Each task is a function returned by https://github.com/qunitjs/qunit/blob/master/src/test.js#L381
- */
- function processTaskQueue(start) {
- if (taskQueue.length && !config.blocking) {
- var elapsedTime = now() - start;
-
- if (!defined.setTimeout || config.updateRate <= 0 || elapsedTime < config.updateRate) {
- var task = taskQueue.shift();
- Promise$1.resolve(task()).then(function () {
- if (!taskQueue.length) {
- advance();
- } else {
- processTaskQueue(start);
- }
- });
- } else {
- setTimeout$1(advance);
- }
- }
- }
-
- /**
- * Advance the testQueue to the next test to process. Call done() if testQueue completes.
- */
- function advanceTestQueue() {
- if (!config.blocking && !config.queue.length && config.depth === 0) {
- done();
- return;
- }
-
- var testTasks = config.queue.shift();
- addToTaskQueue(testTasks());
-
- if (priorityCount > 0) {
- priorityCount--;
- }
-
- advance();
- }
-
- /**
- * Enqueue the tasks for a test into the task queue.
- * @param {Array} tasksArray
- */
- function addToTaskQueue(tasksArray) {
- taskQueue.push.apply(taskQueue, toConsumableArray(tasksArray));
- }
-
- /**
- * Return the number of tasks remaining in the task queue to be processed.
- * @return {Number}
- */
- function taskQueueLength() {
- return taskQueue.length;
- }
-
- /**
- * Adds a test to the TestQueue for execution.
- * @param {Function} testTasksFunc
- * @param {Boolean} prioritize
- * @param {String} seed
- */
- function addToTestQueue(testTasksFunc, prioritize, seed) {
- if (prioritize) {
- config.queue.splice(priorityCount++, 0, testTasksFunc);
- } else if (seed) {
- if (!unitSampler) {
- unitSampler = unitSamplerGenerator(seed);
- }
-
- // Insert into a random position after all prioritized items
- var index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1));
- config.queue.splice(priorityCount + index, 0, testTasksFunc);
- } else {
- config.queue.push(testTasksFunc);
- }
- }
-
- /**
- * Creates a seeded "sample" generator which is used for randomizing tests.
- */
- function unitSamplerGenerator(seed) {
-
- // 32-bit xorshift, requires only a nonzero seed
- // http://excamera.com/sphinx/article-xorshift.html
- var sample = parseInt(generateHash(seed), 16) || -1;
- return function () {
- sample ^= sample << 13;
- sample ^= sample >>> 17;
- sample ^= sample << 5;
-
- // ECMAScript has no unsigned number type
- if (sample < 0) {
- sample += 0x100000000;
- }
-
- return sample / 0x100000000;
- };
- }
-
- /**
- * This function is called when the ProcessingQueue is done processing all
- * items. It handles emitting the final run events.
- */
- function done() {
- var storage = config.storage;
-
- ProcessingQueue.finished = true;
-
- var runtime = now() - config.started;
- var passed = config.stats.all - config.stats.bad;
-
- if (config.stats.all === 0) {
-
- if (config.filter && config.filter.length) {
- throw new Error("No tests matched the filter \"" + config.filter + "\".");
- }
-
- if (config.module && config.module.length) {
- throw new Error("No tests matched the module \"" + config.module + "\".");
- }
-
- if (config.moduleId && config.moduleId.length) {
- throw new Error("No tests matched the moduleId \"" + config.moduleId + "\".");
- }
-
- if (config.testId && config.testId.length) {
- throw new Error("No tests matched the testId \"" + config.testId + "\".");
- }
-
- throw new Error("No tests were run.");
- }
-
- emit("runEnd", globalSuite.end(true));
- runLoggingCallbacks("done", {
- passed: passed,
- failed: config.stats.bad,
- total: config.stats.all,
- runtime: runtime
- }).then(function () {
-
- // Clear own storage items if all tests passed
- if (storage && config.stats.bad === 0) {
- for (var i = storage.length - 1; i >= 0; i--) {
- var key = storage.key(i);
-
- if (key.indexOf("qunit-test-") === 0) {
- storage.removeItem(key);
- }
- }
- }
- });
- }
-
- var ProcessingQueue = {
- finished: false,
- add: addToTestQueue,
- advance: advance,
- taskCount: taskQueueLength
- };
-
- var TestReport = function () {
- function TestReport(name, suite, options) {
- classCallCheck(this, TestReport);
-
- this.name = name;
- this.suiteName = suite.name;
- this.fullName = suite.fullName.concat(name);
- this.runtime = 0;
- this.assertions = [];
-
- this.skipped = !!options.skip;
- this.todo = !!options.todo;
-
- this.valid = options.valid;
-
- this._startTime = 0;
- this._endTime = 0;
-
- suite.pushTest(this);
- }
-
- createClass(TestReport, [{
- key: "start",
- value: function start(recordTime) {
- if (recordTime) {
- this._startTime = performanceNow();
- if (performance) {
- performance.mark("qunit_test_start");
- }
- }
-
- return {
- name: this.name,
- suiteName: this.suiteName,
- fullName: this.fullName.slice()
- };
- }
- }, {
- key: "end",
- value: function end(recordTime) {
- if (recordTime) {
- this._endTime = performanceNow();
- if (performance) {
- performance.mark("qunit_test_end");
-
- var testName = this.fullName.join(" – ");
-
- measure("QUnit Test: " + testName, "qunit_test_start", "qunit_test_end");
- }
- }
-
- return extend(this.start(), {
- runtime: this.getRuntime(),
- status: this.getStatus(),
- errors: this.getFailedAssertions(),
- assertions: this.getAssertions()
- });
- }
- }, {
- key: "pushAssertion",
- value: function pushAssertion(assertion) {
- this.assertions.push(assertion);
- }
- }, {
- key: "getRuntime",
- value: function getRuntime() {
- return this._endTime - this._startTime;
- }
- }, {
- key: "getStatus",
- value: function getStatus() {
- if (this.skipped) {
- return "skipped";
- }
-
- var testPassed = this.getFailedAssertions().length > 0 ? this.todo : !this.todo;
-
- if (!testPassed) {
- return "failed";
- } else if (this.todo) {
- return "todo";
- } else {
- return "passed";
- }
- }
- }, {
- key: "getFailedAssertions",
- value: function getFailedAssertions() {
- return this.assertions.filter(function (assertion) {
- return !assertion.passed;
- });
- }
- }, {
- key: "getAssertions",
- value: function getAssertions() {
- return this.assertions.slice();
- }
-
- // Remove actual and expected values from assertions. This is to prevent
- // leaking memory throughout a test suite.
-
- }, {
- key: "slimAssertions",
- value: function slimAssertions() {
- this.assertions = this.assertions.map(function (assertion) {
- delete assertion.actual;
- delete assertion.expected;
- return assertion;
- });
- }
- }]);
- return TestReport;
- }();
-
- var focused$1 = false;
-
- function Test(settings) {
- var i, l;
-
- ++Test.count;
-
- this.expected = null;
- this.assertions = [];
- this.semaphore = 0;
- this.module = config.currentModule;
- this.stack = sourceFromStacktrace(3);
- this.steps = [];
- this.timeout = undefined;
-
- // If a module is skipped, all its tests and the tests of the child suites
- // should be treated as skipped even if they are defined as `only` or `todo`.
- // As for `todo` module, all its tests will be treated as `todo` except for
- // tests defined as `skip` which will be left intact.
- //
- // So, if a test is defined as `todo` and is inside a skipped module, we should
- // then treat that test as if was defined as `skip`.
- if (this.module.skip) {
- settings.skip = true;
- settings.todo = false;
-
- // Skipped tests should be left intact
- } else if (this.module.todo && !settings.skip) {
- settings.todo = true;
- }
-
- extend(this, settings);
-
- this.testReport = new TestReport(settings.testName, this.module.suiteReport, {
- todo: settings.todo,
- skip: settings.skip,
- valid: this.valid()
- });
-
- // Register unique strings
- for (i = 0, l = this.module.tests; i < l.length; i++) {
- if (this.module.tests[i].name === this.testName) {
- this.testName += " ";
- }
- }
-
- this.testId = generateHash(this.module.name, this.testName);
-
- this.module.tests.push({
- name: this.testName,
- testId: this.testId,
- skip: !!settings.skip
- });
-
- if (settings.skip) {
-
- // Skipped tests will fully ignore any sent callback
- this.callback = function () {};
- this.async = false;
- this.expected = 0;
- } else {
- if (typeof this.callback !== "function") {
- var method = this.todo ? "todo" : "test";
-
- // eslint-disable-next-line max-len
- throw new TypeError("You must provide a function as a test callback to QUnit." + method + "(\"" + settings.testName + "\")");
- }
-
- this.assert = new Assert(this);
- }
- }
-
- Test.count = 0;
-
- function getNotStartedModules(startModule) {
- var module = startModule,
- modules = [];
-
- while (module && module.testsRun === 0) {
- modules.push(module);
- module = module.parentModule;
- }
-
- // The above push modules from the child to the parent
- // return a reversed order with the top being the top most parent module
- return modules.reverse();
- }
-
- Test.prototype = {
- before: function before() {
- var _this = this;
-
- var module = this.module,
- notStartedModules = getNotStartedModules(module);
-
- // ensure the callbacks are executed serially for each module
- var callbackPromises = notStartedModules.reduce(function (promiseChain, startModule) {
- return promiseChain.then(function () {
- startModule.stats = { all: 0, bad: 0, started: now() };
- emit("suiteStart", startModule.suiteReport.start(true));
- return runLoggingCallbacks("moduleStart", {
- name: startModule.name,
- tests: startModule.tests
- });
- });
- }, Promise$1.resolve([]));
-
- return callbackPromises.then(function () {
- config.current = _this;
-
- _this.testEnvironment = extend({}, module.testEnvironment);
-
- _this.started = now();
- emit("testStart", _this.testReport.start(true));
- return runLoggingCallbacks("testStart", {
- name: _this.testName,
- module: module.name,
- testId: _this.testId,
- previousFailure: _this.previousFailure
- }).then(function () {
- if (!config.pollution) {
- saveGlobal();
- }
- });
- });
- },
-
- run: function run() {
- var promise;
-
- config.current = this;
-
- this.callbackStarted = now();
-
- if (config.notrycatch) {
- runTest(this);
- return;
- }
-
- try {
- runTest(this);
- } catch (e) {
- this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0));
-
- // Else next test will carry the responsibility
- saveGlobal();
-
- // Restart the tests if they're blocking
- if (config.blocking) {
- internalRecover(this);
- }
- }
-
- function runTest(test) {
- promise = test.callback.call(test.testEnvironment, test.assert);
- test.resolvePromise(promise);
-
- // If the test has a "lock" on it, but the timeout is 0, then we push a
- // failure as the test should be synchronous.
- if (test.timeout === 0 && test.semaphore !== 0) {
- pushFailure("Test did not finish synchronously even though assert.timeout( 0 ) was used.", sourceFromStacktrace(2));
- }
- }
- },
-
- after: function after() {
- checkPollution();
- },
-
- queueHook: function queueHook(hook, hookName, hookOwner) {
- var _this2 = this;
-
- var callHook = function callHook() {
- var promise = hook.call(_this2.testEnvironment, _this2.assert);
- _this2.resolvePromise(promise, hookName);
- };
-
- var runHook = function runHook() {
- if (hookName === "before") {
- if (hookOwner.unskippedTestsRun !== 0) {
- return;
- }
-
- _this2.preserveEnvironment = true;
- }
-
- // The 'after' hook should only execute when there are not tests left and
- // when the 'after' and 'finish' tasks are the only tasks left to process
- if (hookName === "after" && hookOwner.unskippedTestsRun !== numberOfUnskippedTests(hookOwner) - 1 && (config.queue.length > 0 || ProcessingQueue.taskCount() > 2)) {
- return;
- }
-
- config.current = _this2;
- if (config.notrycatch) {
- callHook();
- return;
- }
- try {
- callHook();
- } catch (error) {
- _this2.pushFailure(hookName + " failed on " + _this2.testName + ": " + (error.message || error), extractStacktrace(error, 0));
- }
- };
-
- return runHook;
- },
-
-
- // Currently only used for module level hooks, can be used to add global level ones
- hooks: function hooks(handler) {
- var hooks = [];
-
- function processHooks(test, module) {
- if (module.parentModule) {
- processHooks(test, module.parentModule);
- }
-
- if (module.hooks[handler].length) {
- for (var i = 0; i < module.hooks[handler].length; i++) {
- hooks.push(test.queueHook(module.hooks[handler][i], handler, module));
- }
- }
- }
-
- // Hooks are ignored on skipped tests
- if (!this.skip) {
- processHooks(this, this.module);
- }
-
- return hooks;
- },
-
-
- finish: function finish() {
- config.current = this;
-
- // Release the test callback to ensure that anything referenced has been
- // released to be garbage collected.
- this.callback = undefined;
-
- if (this.steps.length) {
- var stepsList = this.steps.join(", ");
- this.pushFailure("Expected assert.verifySteps() to be called before end of test " + ("after using assert.step(). Unverified steps: " + stepsList), this.stack);
- }
-
- if (config.requireExpects && this.expected === null) {
- this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack);
- } else if (this.expected !== null && this.expected !== this.assertions.length) {
- this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack);
- } else if (this.expected === null && !this.assertions.length) {
- this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack);
- }
-
- var i,
- module = this.module,
- moduleName = module.name,
- testName = this.testName,
- skipped = !!this.skip,
- todo = !!this.todo,
- bad = 0,
- storage = config.storage;
-
- this.runtime = now() - this.started;
-
- config.stats.all += this.assertions.length;
- module.stats.all += this.assertions.length;
-
- for (i = 0; i < this.assertions.length; i++) {
- if (!this.assertions[i].result) {
- bad++;
- config.stats.bad++;
- module.stats.bad++;
- }
- }
-
- notifyTestsRan(module, skipped);
-
- // Store result when possible
- if (storage) {
- if (bad) {
- storage.setItem("qunit-test-" + moduleName + "-" + testName, bad);
- } else {
- storage.removeItem("qunit-test-" + moduleName + "-" + testName);
- }
- }
-
- // After emitting the js-reporters event we cleanup the assertion data to
- // avoid leaking it. It is not used by the legacy testDone callbacks.
- emit("testEnd", this.testReport.end(true));
- this.testReport.slimAssertions();
-
- return runLoggingCallbacks("testDone", {
- name: testName,
- module: moduleName,
- skipped: skipped,
- todo: todo,
- failed: bad,
- passed: this.assertions.length - bad,
- total: this.assertions.length,
- runtime: skipped ? 0 : this.runtime,
-
- // HTML Reporter use
- assertions: this.assertions,
- testId: this.testId,
-
- // Source of Test
- source: this.stack
- }).then(function () {
- if (module.testsRun === numberOfTests(module)) {
- var completedModules = [module];
-
- // Check if the parent modules, iteratively, are done. If that the case,
- // we emit the `suiteEnd` event and trigger `moduleDone` callback.
- var parent = module.parentModule;
- while (parent && parent.testsRun === numberOfTests(parent)) {
- completedModules.push(parent);
- parent = parent.parentModule;
- }
-
- return completedModules.reduce(function (promiseChain, completedModule) {
- return promiseChain.then(function () {
- return logSuiteEnd(completedModule);
- });
- }, Promise$1.resolve([]));
- }
- }).then(function () {
- config.current = undefined;
- });
-
- function logSuiteEnd(module) {
-
- // Reset `module.hooks` to ensure that anything referenced in these hooks
- // has been released to be garbage collected.
- module.hooks = {};
-
- emit("suiteEnd", module.suiteReport.end(true));
- return runLoggingCallbacks("moduleDone", {
- name: module.name,
- tests: module.tests,
- failed: module.stats.bad,
- passed: module.stats.all - module.stats.bad,
- total: module.stats.all,
- runtime: now() - module.stats.started
- });
- }
- },
-
- preserveTestEnvironment: function preserveTestEnvironment() {
- if (this.preserveEnvironment) {
- this.module.testEnvironment = this.testEnvironment;
- this.testEnvironment = extend({}, this.module.testEnvironment);
- }
- },
-
- queue: function queue() {
- var test = this;
-
- if (!this.valid()) {
- return;
- }
-
- function runTest() {
- return [function () {
- return test.before();
- }].concat(toConsumableArray(test.hooks("before")), [function () {
- test.preserveTestEnvironment();
- }], toConsumableArray(test.hooks("beforeEach")), [function () {
- test.run();
- }], toConsumableArray(test.hooks("afterEach").reverse()), toConsumableArray(test.hooks("after").reverse()), [function () {
- test.after();
- }, function () {
- return test.finish();
- }]);
- }
-
- var previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName);
-
- // Prioritize previously failed tests, detected from storage
- var prioritize = config.reorder && !!previousFailCount;
-
- this.previousFailure = !!previousFailCount;
-
- ProcessingQueue.add(runTest, prioritize, config.seed);
-
- // If the queue has already finished, we manually process the new test
- if (ProcessingQueue.finished) {
- ProcessingQueue.advance();
- }
- },
-
-
- pushResult: function pushResult(resultInfo) {
- if (this !== config.current) {
- throw new Error("Assertion occurred after test had finished.");
- }
-
- // Destructure of resultInfo = { result, actual, expected, message, negative }
- var source,
- details = {
- module: this.module.name,
- name: this.testName,
- result: resultInfo.result,
- message: resultInfo.message,
- actual: resultInfo.actual,
- testId: this.testId,
- negative: resultInfo.negative || false,
- runtime: now() - this.started,
- todo: !!this.todo
- };
-
- if (hasOwn.call(resultInfo, "expected")) {
- details.expected = resultInfo.expected;
- }
-
- if (!resultInfo.result) {
- source = resultInfo.source || sourceFromStacktrace();
-
- if (source) {
- details.source = source;
- }
- }
-
- this.logAssertion(details);
-
- this.assertions.push({
- result: !!resultInfo.result,
- message: resultInfo.message
- });
- },
-
- pushFailure: function pushFailure(message, source, actual) {
- if (!(this instanceof Test)) {
- throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2));
- }
-
- this.pushResult({
- result: false,
- message: message || "error",
- actual: actual || null,
- source: source
- });
- },
-
- /**
- * Log assertion details using both the old QUnit.log interface and
- * QUnit.on( "assertion" ) interface.
- *
- * @private
- */
- logAssertion: function logAssertion(details) {
- runLoggingCallbacks("log", details);
-
- var assertion = {
- passed: details.result,
- actual: details.actual,
- expected: details.expected,
- message: details.message,
- stack: details.source,
- todo: details.todo
- };
- this.testReport.pushAssertion(assertion);
- emit("assertion", assertion);
- },
-
-
- resolvePromise: function resolvePromise(promise, phase) {
- var then,
- resume,
- message,
- test = this;
- if (promise != null) {
- then = promise.then;
- if (objectType(then) === "function") {
- resume = internalStop(test);
- if (config.notrycatch) {
- then.call(promise, function () {
- resume();
- });
- } else {
- then.call(promise, function () {
- resume();
- }, function (error) {
- message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error);
- test.pushFailure(message, extractStacktrace(error, 0));
-
- // Else next test will carry the responsibility
- saveGlobal();
-
- // Unblock
- internalRecover(test);
- });
- }
- }
- }
- },
-
- valid: function valid() {
- var filter = config.filter,
- regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter),
- module = config.module && config.module.toLowerCase(),
- fullName = this.module.name + ": " + this.testName;
-
- function moduleChainNameMatch(testModule) {
- var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
- if (testModuleName === module) {
- return true;
- } else if (testModule.parentModule) {
- return moduleChainNameMatch(testModule.parentModule);
- } else {
- return false;
- }
- }
-
- function moduleChainIdMatch(testModule) {
- return inArray(testModule.moduleId, config.moduleId) || testModule.parentModule && moduleChainIdMatch(testModule.parentModule);
- }
-
- // Internally-generated tests are always valid
- if (this.callback && this.callback.validTest) {
- return true;
- }
-
- if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) {
-
- return false;
- }
-
- if (config.testId && config.testId.length > 0 && !inArray(this.testId, config.testId)) {
-
- return false;
- }
-
- if (module && !moduleChainNameMatch(this.module)) {
- return false;
- }
-
- if (!filter) {
- return true;
- }
-
- return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName);
- },
-
- regexFilter: function regexFilter(exclude, pattern, flags, fullName) {
- var regex = new RegExp(pattern, flags);
- var match = regex.test(fullName);
-
- return match !== exclude;
- },
-
- stringFilter: function stringFilter(filter, fullName) {
- filter = filter.toLowerCase();
- fullName = fullName.toLowerCase();
-
- var include = filter.charAt(0) !== "!";
- if (!include) {
- filter = filter.slice(1);
- }
-
- // If the filter matches, we need to honour include
- if (fullName.indexOf(filter) !== -1) {
- return include;
- }
-
- // Otherwise, do the opposite
- return !include;
- }
- };
-
- function pushFailure() {
- if (!config.current) {
- throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2));
- }
-
- // Gets current test obj
- var currentTest = config.current;
-
- return currentTest.pushFailure.apply(currentTest, arguments);
- }
-
- function saveGlobal() {
- config.pollution = [];
-
- if (config.noglobals) {
- for (var key in global$1) {
- if (hasOwn.call(global$1, key)) {
-
- // In Opera sometimes DOM element ids show up here, ignore them
- if (/^qunit-test-output/.test(key)) {
- continue;
- }
- config.pollution.push(key);
- }
- }
- }
- }
-
- function checkPollution() {
- var newGlobals,
- deletedGlobals,
- old = config.pollution;
-
- saveGlobal();
-
- newGlobals = diff(config.pollution, old);
- if (newGlobals.length > 0) {
- pushFailure("Introduced global variable(s): " + newGlobals.join(", "));
- }
-
- deletedGlobals = diff(old, config.pollution);
- if (deletedGlobals.length > 0) {
- pushFailure("Deleted global variable(s): " + deletedGlobals.join(", "));
- }
- }
-
- // Will be exposed as QUnit.test
- function test(testName, callback) {
- if (focused$1) {
- return;
- }
-
- var newTest = new Test({
- testName: testName,
- callback: callback
- });
-
- newTest.queue();
- }
-
- function todo(testName, callback) {
- if (focused$1) {
- return;
- }
-
- var newTest = new Test({
- testName: testName,
- callback: callback,
- todo: true
- });
-
- newTest.queue();
- }
-
- // Will be exposed as QUnit.skip
- function skip(testName) {
- if (focused$1) {
- return;
- }
-
- var test = new Test({
- testName: testName,
- skip: true
- });
-
- test.queue();
- }
-
- // Will be exposed as QUnit.only
- function only(testName, callback) {
- if (focused$1) {
- return;
- }
-
- config.queue.length = 0;
- focused$1 = true;
-
- var newTest = new Test({
- testName: testName,
- callback: callback
- });
-
- newTest.queue();
- }
-
- // Put a hold on processing and return a function that will release it.
- function internalStop(test) {
- var released = false;
- test.semaphore += 1;
- config.blocking = true;
-
- // Set a recovery timeout, if so configured.
- if (defined.setTimeout) {
- var timeoutDuration = void 0;
-
- if (typeof test.timeout === "number") {
- timeoutDuration = test.timeout;
- } else if (typeof config.testTimeout === "number") {
- timeoutDuration = config.testTimeout;
- }
-
- if (typeof timeoutDuration === "number" && timeoutDuration > 0) {
- clearTimeout(config.timeout);
- config.timeout = setTimeout$1(function () {
- pushFailure("Test took longer than " + timeoutDuration + "ms; test timed out.", sourceFromStacktrace(2));
- released = true;
- internalRecover(test);
- }, timeoutDuration);
- }
- }
-
- return function resume() {
- if (released) {
- return;
- }
-
- released = true;
- test.semaphore -= 1;
- internalStart(test);
- };
- }
-
- // Forcefully release all processing holds.
- function internalRecover(test) {
- test.semaphore = 0;
- internalStart(test);
- }
-
- // Release a processing hold, scheduling a resumption attempt if no holds remain.
- function internalStart(test) {
-
- // If semaphore is non-numeric, throw error
- if (isNaN(test.semaphore)) {
- test.semaphore = 0;
-
- pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2));
- return;
- }
-
- // Don't start until equal number of stop-calls
- if (test.semaphore > 0) {
- return;
- }
-
- // Throw an Error if start is called more often than stop
- if (test.semaphore < 0) {
- test.semaphore = 0;
-
- pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2));
- return;
- }
-
- // Add a slight delay to allow more assertions etc.
- if (defined.setTimeout) {
- if (config.timeout) {
- clearTimeout(config.timeout);
- }
- config.timeout = setTimeout$1(function () {
- if (test.semaphore > 0) {
- return;
- }
-
- if (config.timeout) {
- clearTimeout(config.timeout);
- }
-
- begin();
- });
- } else {
- begin();
- }
- }
-
- function collectTests(module) {
- var tests = [].concat(module.tests);
- var modules = [].concat(toConsumableArray(module.childModules));
-
- // Do a breadth-first traversal of the child modules
- while (modules.length) {
- var nextModule = modules.shift();
- tests.push.apply(tests, nextModule.tests);
- modules.push.apply(modules, toConsumableArray(nextModule.childModules));
- }
-
- return tests;
- }
-
- function numberOfTests(module) {
- return collectTests(module).length;
- }
-
- function numberOfUnskippedTests(module) {
- return collectTests(module).filter(function (test) {
- return !test.skip;
- }).length;
- }
-
- function notifyTestsRan(module, skipped) {
- module.testsRun++;
- if (!skipped) {
- module.unskippedTestsRun++;
- }
- while (module = module.parentModule) {
- module.testsRun++;
- if (!skipped) {
- module.unskippedTestsRun++;
- }
- }
- }
-
- var Assert = function () {
- function Assert(testContext) {
- classCallCheck(this, Assert);
-
- this.test = testContext;
- }
-
- // Assert helpers
-
- createClass(Assert, [{
- key: "timeout",
- value: function timeout(duration) {
- if (typeof duration !== "number") {
- throw new Error("You must pass a number as the duration to assert.timeout");
- }
-
- this.test.timeout = duration;
- }
-
- // Documents a "step", which is a string value, in a test as a passing assertion
-
- }, {
- key: "step",
- value: function step(message) {
- var assertionMessage = message;
- var result = !!message;
-
- this.test.steps.push(message);
-
- if (objectType(message) === "undefined" || message === "") {
- assertionMessage = "You must provide a message to assert.step";
- } else if (objectType(message) !== "string") {
- assertionMessage = "You must provide a string value to assert.step";
- result = false;
- }
-
- this.pushResult({
- result: result,
- message: assertionMessage
- });
- }
-
- // Verifies the steps in a test match a given array of string values
-
- }, {
- key: "verifySteps",
- value: function verifySteps(steps, message) {
-
- // Since the steps array is just string values, we can clone with slice
- var actualStepsClone = this.test.steps.slice();
- this.deepEqual(actualStepsClone, steps, message);
- this.test.steps.length = 0;
- }
-
- // Specify the number of expected assertions to guarantee that failed test
- // (no assertions are run at all) don't slip through.
-
- }, {
- key: "expect",
- value: function expect(asserts) {
- if (arguments.length === 1) {
- this.test.expected = asserts;
- } else {
- return this.test.expected;
- }
- }
-
- // Put a hold on processing and return a function that will release it a maximum of once.
-
- }, {
- key: "async",
- value: function async(count) {
- var test$$1 = this.test;
-
- var popped = false,
- acceptCallCount = count;
-
- if (typeof acceptCallCount === "undefined") {
- acceptCallCount = 1;
- }
-
- var resume = internalStop(test$$1);
-
- return function done() {
- if (config.current !== test$$1) {
- throw Error("assert.async callback called after test finished.");
- }
-
- if (popped) {
- test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2));
- return;
- }
-
- acceptCallCount -= 1;
- if (acceptCallCount > 0) {
- return;
- }
-
- popped = true;
- resume();
- };
- }
-
- // Exports test.push() to the user API
- // Alias of pushResult.
-
- }, {
- key: "push",
- value: function push(result, actual, expected, message, negative) {
- Logger.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (https://api.qunitjs.com/assert/pushResult).");
-
- var currentAssert = this instanceof Assert ? this : config.current.assert;
- return currentAssert.pushResult({
- result: result,
- actual: actual,
- expected: expected,
- message: message,
- negative: negative
- });
- }
- }, {
- key: "pushResult",
- value: function pushResult(resultInfo) {
-
- // Destructure of resultInfo = { result, actual, expected, message, negative }
- var assert = this;
- var currentTest = assert instanceof Assert && assert.test || config.current;
-
- // Backwards compatibility fix.
- // Allows the direct use of global exported assertions and QUnit.assert.*
- // Although, it's use is not recommended as it can leak assertions
- // to other tests from async tests, because we only get a reference to the current test,
- // not exactly the test where assertion were intended to be called.
- if (!currentTest) {
- throw new Error("assertion outside test context, in " + sourceFromStacktrace(2));
- }
-
- if (!(assert instanceof Assert)) {
- assert = currentTest.assert;
- }
-
- return assert.test.pushResult(resultInfo);
- }
- }, {
- key: "ok",
- value: function ok(result, message) {
- if (!message) {
- message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result);
- }
-
- this.pushResult({
- result: !!result,
- actual: result,
- expected: true,
- message: message
- });
- }
- }, {
- key: "notOk",
- value: function notOk(result, message) {
- if (!message) {
- message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result);
- }
-
- this.pushResult({
- result: !result,
- actual: result,
- expected: false,
- message: message
- });
- }
- }, {
- key: "equal",
- value: function equal(actual, expected, message) {
-
- // eslint-disable-next-line eqeqeq
- var result = expected == actual;
-
- this.pushResult({
- result: result,
- actual: actual,
- expected: expected,
- message: message
- });
- }
- }, {
- key: "notEqual",
- value: function notEqual(actual, expected, message) {
-
- // eslint-disable-next-line eqeqeq
- var result = expected != actual;
-
- this.pushResult({
- result: result,
- actual: actual,
- expected: expected,
- message: message,
- negative: true
- });
- }
- }, {
- key: "propEqual",
- value: function propEqual(actual, expected, message) {
- actual = objectValues(actual);
- expected = objectValues(expected);
-
- this.pushResult({
- result: equiv(actual, expected),
- actual: actual,
- expected: expected,
- message: message
- });
- }
- }, {
- key: "notPropEqual",
- value: function notPropEqual(actual, expected, message) {
- actual = objectValues(actual);
- expected = objectValues(expected);
-
- this.pushResult({
- result: !equiv(actual, expected),
- actual: actual,
- expected: expected,
- message: message,
- negative: true
- });
- }
- }, {
- key: "deepEqual",
- value: function deepEqual(actual, expected, message) {
- this.pushResult({
- result: equiv(actual, expected),
- actual: actual,
- expected: expected,
- message: message
- });
- }
- }, {
- key: "notDeepEqual",
- value: function notDeepEqual(actual, expected, message) {
- this.pushResult({
- result: !equiv(actual, expected),
- actual: actual,
- expected: expected,
- message: message,
- negative: true
- });
- }
- }, {
- key: "strictEqual",
- value: function strictEqual(actual, expected, message) {
- this.pushResult({
- result: expected === actual,
- actual: actual,
- expected: expected,
- message: message
- });
- }
- }, {
- key: "notStrictEqual",
- value: function notStrictEqual(actual, expected, message) {
- this.pushResult({
- result: expected !== actual,
- actual: actual,
- expected: expected,
- message: message,
- negative: true
- });
- }
- }, {
- key: "throws",
- value: function throws(block, expected, message) {
- var actual = void 0,
- result = false;
-
- var currentTest = this instanceof Assert && this.test || config.current;
-
- // 'expected' is optional unless doing string comparison
- if (objectType(expected) === "string") {
- if (message == null) {
- message = expected;
- expected = null;
- } else {
- throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary.");
- }
- }
-
- currentTest.ignoreGlobalErrors = true;
- try {
- block.call(currentTest.testEnvironment);
- } catch (e) {
- actual = e;
- }
- currentTest.ignoreGlobalErrors = false;
-
- if (actual) {
- var expectedType = objectType(expected);
-
- // We don't want to validate thrown error
- if (!expected) {
- result = true;
-
- // Expected is a regexp
- } else if (expectedType === "regexp") {
- result = expected.test(errorString(actual));
-
- // Log the string form of the regexp
- expected = String(expected);
-
- // Expected is a constructor, maybe an Error constructor
- } else if (expectedType === "function" && actual instanceof expected) {
- result = true;
-
- // Expected is an Error object
- } else if (expectedType === "object") {
- result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
-
- // Log the string form of the Error object
- expected = errorString(expected);
-
- // Expected is a validation function which returns true if validation passed
- } else if (expectedType === "function" && expected.call({}, actual) === true) {
- expected = null;
- result = true;
- }
- }
-
- currentTest.assert.pushResult({
- result: result,
-
- // undefined if it didn't throw
- actual: actual && errorString(actual),
- expected: expected,
- message: message
- });
- }
- }, {
- key: "rejects",
- value: function rejects(promise, expected, message) {
- var result = false;
-
- var currentTest = this instanceof Assert && this.test || config.current;
-
- // 'expected' is optional unless doing string comparison
- if (objectType(expected) === "string") {
- if (message === undefined) {
- message = expected;
- expected = undefined;
- } else {
- message = "assert.rejects does not accept a string value for the expected " + "argument.\nUse a non-string object value (e.g. validator function) instead " + "if necessary.";
-
- currentTest.assert.pushResult({
- result: false,
- message: message
- });
-
- return;
- }
- }
-
- var then = promise && promise.then;
- if (objectType(then) !== "function") {
- var _message = "The value provided to `assert.rejects` in " + "\"" + currentTest.testName + "\" was not a promise.";
-
- currentTest.assert.pushResult({
- result: false,
- message: _message,
- actual: promise
- });
-
- return;
- }
-
- var done = this.async();
-
- return then.call(promise, function handleFulfillment() {
- var message = "The promise returned by the `assert.rejects` callback in " + "\"" + currentTest.testName + "\" did not reject.";
-
- currentTest.assert.pushResult({
- result: false,
- message: message,
- actual: promise
- });
-
- done();
- }, function handleRejection(actual) {
- var expectedType = objectType(expected);
-
- // We don't want to validate
- if (expected === undefined) {
- result = true;
-
- // Expected is a regexp
- } else if (expectedType === "regexp") {
- result = expected.test(errorString(actual));
-
- // Log the string form of the regexp
- expected = String(expected);
-
- // Expected is a constructor, maybe an Error constructor
- } else if (expectedType === "function" && actual instanceof expected) {
- result = true;
-
- // Expected is an Error object
- } else if (expectedType === "object") {
- result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
-
- // Log the string form of the Error object
- expected = errorString(expected);
-
- // Expected is a validation function which returns true if validation passed
- } else {
- if (expectedType === "function") {
- result = expected.call({}, actual) === true;
- expected = null;
-
- // Expected is some other invalid type
- } else {
- result = false;
- message = "invalid expected value provided to `assert.rejects` " + "callback in \"" + currentTest.testName + "\": " + expectedType + ".";
- }
- }
-
- currentTest.assert.pushResult({
- result: result,
-
- // leave rejection value of undefined as-is
- actual: actual && errorString(actual),
- expected: expected,
- message: message
- });
-
- done();
- });
- }
- }]);
- return Assert;
- }();
-
- // Provide an alternative to assert.throws(), for environments that consider throws a reserved word
- // Known to us are: Closure Compiler, Narwhal
- // eslint-disable-next-line dot-notation
-
-
- Assert.prototype.raises = Assert.prototype["throws"];
-
- /**
- * Converts an error into a simple string for comparisons.
- *
- * @param {Error|Object} error
- * @return {String}
- */
- function errorString(error) {
- var resultErrorString = error.toString();
-
- // If the error wasn't a subclass of Error but something like
- // an object literal with name and message properties...
- if (resultErrorString.substring(0, 7) === "[object") {
- var name = error.name ? error.name.toString() : "Error";
- var message = error.message ? error.message.toString() : "";
-
- if (name && message) {
- return name + ": " + message;
- } else if (name) {
- return name;
- } else if (message) {
- return message;
- } else {
- return "Error";
- }
- } else {
- return resultErrorString;
- }
- }
-
- /* global module, exports, define */
- function exportQUnit(QUnit) {
-
- if (defined.document) {
-
- // QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined.
- if (window$1.QUnit && window$1.QUnit.version) {
- throw new Error("QUnit has already been defined.");
- }
-
- window$1.QUnit = QUnit;
- }
-
- // For nodejs
- if (typeof module !== "undefined" && module && module.exports) {
- module.exports = QUnit;
-
- // For consistency with CommonJS environments' exports
- module.exports.QUnit = QUnit;
- }
-
- // For CommonJS with exports, but without module.exports, like Rhino
- if (typeof exports !== "undefined" && exports) {
- exports.QUnit = QUnit;
- }
-
- if (typeof define === "function" && define.amd) {
- define(function () {
- return QUnit;
- });
- QUnit.config.autostart = false;
- }
-
- // For Web/Service Workers
- if (self$1 && self$1.WorkerGlobalScope && self$1 instanceof self$1.WorkerGlobalScope) {
- self$1.QUnit = QUnit;
- }
- }
-
- // Handle an unhandled exception. By convention, returns true if further
- // error handling should be suppressed and false otherwise.
- // In this case, we will only suppress further error handling if the
- // "ignoreGlobalErrors" configuration option is enabled.
- function onError(error) {
- for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
- args[_key - 1] = arguments[_key];
- }
-
- if (config.current) {
- if (config.current.ignoreGlobalErrors) {
- return true;
- }
- pushFailure.apply(undefined, [error.message, error.stacktrace || error.fileName + ":" + error.lineNumber].concat(args));
- } else {
- test("global failure", extend(function () {
- pushFailure.apply(undefined, [error.message, error.stacktrace || error.fileName + ":" + error.lineNumber].concat(args));
- }, { validTest: true }));
- }
-
- return false;
- }
-
- // Handle an unhandled rejection
- function onUnhandledRejection(reason) {
- var resultInfo = {
- result: false,
- message: reason.message || "error",
- actual: reason,
- source: reason.stack || sourceFromStacktrace(3)
- };
-
- var currentTest = config.current;
- if (currentTest) {
- currentTest.assert.pushResult(resultInfo);
- } else {
- test("global failure", extend(function (assert) {
- assert.pushResult(resultInfo);
- }, { validTest: true }));
- }
- }
-
- var QUnit = {};
- var globalSuite = new SuiteReport();
-
- // The initial "currentModule" represents the global (or top-level) module that
- // is not explicitly defined by the user, therefore we add the "globalSuite" to
- // it since each module has a suiteReport associated with it.
- config.currentModule.suiteReport = globalSuite;
-
- var globalStartCalled = false;
- var runStarted = false;
-
- // Figure out if we're running the tests from a server or not
- QUnit.isLocal = !(defined.document && window$1.location.protocol !== "file:");
-
- // Expose the current QUnit version
- QUnit.version = "2.9.2";
-
- extend(QUnit, {
- on: on,
-
- module: module$1,
-
- test: test,
-
- todo: todo,
-
- skip: skip,
-
- only: only,
-
- start: function start(count) {
- var globalStartAlreadyCalled = globalStartCalled;
-
- if (!config.current) {
- globalStartCalled = true;
-
- if (runStarted) {
- throw new Error("Called start() while test already started running");
- } else if (globalStartAlreadyCalled || count > 1) {
- throw new Error("Called start() outside of a test context too many times");
- } else if (config.autostart) {
- throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true");
- } else if (!config.pageLoaded) {
-
- // The page isn't completely loaded yet, so we set autostart and then
- // load if we're in Node or wait for the browser's load event.
- config.autostart = true;
-
- // Starts from Node even if .load was not previously called. We still return
- // early otherwise we'll wind up "beginning" twice.
- if (!defined.document) {
- QUnit.load();
- }
-
- return;
- }
- } else {
- throw new Error("QUnit.start cannot be called inside a test context.");
- }
-
- scheduleBegin();
- },
-
- config: config,
-
- is: is,
-
- objectType: objectType,
-
- extend: extend,
-
- load: function load() {
- config.pageLoaded = true;
-
- // Initialize the configuration options
- extend(config, {
- stats: { all: 0, bad: 0 },
- started: 0,
- updateRate: 1000,
- autostart: true,
- filter: ""
- }, true);
-
- if (!runStarted) {
- config.blocking = false;
-
- if (config.autostart) {
- scheduleBegin();
- }
- }
- },
-
- stack: function stack(offset) {
- offset = (offset || 0) + 2;
- return sourceFromStacktrace(offset);
- },
-
- onError: onError,
-
- onUnhandledRejection: onUnhandledRejection
- });
-
- QUnit.pushFailure = pushFailure;
- QUnit.assert = Assert.prototype;
- QUnit.equiv = equiv;
- QUnit.dump = dump;
-
- registerLoggingCallbacks(QUnit);
-
- function scheduleBegin() {
-
- runStarted = true;
-
- // Add a slight delay to allow definition of more modules and tests.
- if (defined.setTimeout) {
- setTimeout$1(function () {
- begin();
- });
- } else {
- begin();
- }
- }
-
- function unblockAndAdvanceQueue() {
- config.blocking = false;
- ProcessingQueue.advance();
- }
-
- function begin() {
- var i,
- l,
- modulesLog = [];
-
- // If the test run hasn't officially begun yet
- if (!config.started) {
-
- // Record the time of the test run's beginning
- config.started = now();
-
- // Delete the loose unnamed module if unused.
- if (config.modules[0].name === "" && config.modules[0].tests.length === 0) {
- config.modules.shift();
- }
-
- // Avoid unnecessary information by not logging modules' test environments
- for (i = 0, l = config.modules.length; i < l; i++) {
- modulesLog.push({
- name: config.modules[i].name,
- tests: config.modules[i].tests
- });
- }
-
- // The test run is officially beginning now
- emit("runStart", globalSuite.start(true));
- runLoggingCallbacks("begin", {
- totalTests: Test.count,
- modules: modulesLog
- }).then(unblockAndAdvanceQueue);
- } else {
- unblockAndAdvanceQueue();
- }
- }
-
- exportQUnit(QUnit);
-
- (function () {
-
- if (typeof window$1 === "undefined" || typeof document$1 === "undefined") {
- return;
- }
-
- var config = QUnit.config,
- hasOwn = Object.prototype.hasOwnProperty;
-
- // Stores fixture HTML for resetting later
- function storeFixture() {
-
- // Avoid overwriting user-defined values
- if (hasOwn.call(config, "fixture")) {
- return;
- }
-
- var fixture = document$1.getElementById("qunit-fixture");
- if (fixture) {
- config.fixture = fixture.cloneNode(true);
- }
- }
-
- QUnit.begin(storeFixture);
-
- // Resets the fixture DOM element if available.
- function resetFixture() {
- if (config.fixture == null) {
- return;
- }
-
- var fixture = document$1.getElementById("qunit-fixture");
- var resetFixtureType = _typeof(config.fixture);
- if (resetFixtureType === "string") {
-
- // support user defined values for `config.fixture`
- var newFixture = document$1.createElement("div");
- newFixture.setAttribute("id", "qunit-fixture");
- newFixture.innerHTML = config.fixture;
- fixture.parentNode.replaceChild(newFixture, fixture);
- } else {
- var clonedFixture = config.fixture.cloneNode(true);
- fixture.parentNode.replaceChild(clonedFixture, fixture);
- }
- }
-
- QUnit.testStart(resetFixture);
- })();
-
- (function () {
-
- // Only interact with URLs via window.location
- var location = typeof window$1 !== "undefined" && window$1.location;
- if (!location) {
- return;
- }
-
- var urlParams = getUrlParams();
-
- QUnit.urlParams = urlParams;
-
- // Match module/test by inclusion in an array
- QUnit.config.moduleId = [].concat(urlParams.moduleId || []);
- QUnit.config.testId = [].concat(urlParams.testId || []);
-
- // Exact case-insensitive match of the module name
- QUnit.config.module = urlParams.module;
-
- // Regular expression or case-insenstive substring match against "moduleName: testName"
- QUnit.config.filter = urlParams.filter;
-
- // Test order randomization
- if (urlParams.seed === true) {
-
- // Generate a random seed if the option is specified without a value
- QUnit.config.seed = Math.random().toString(36).slice(2);
- } else if (urlParams.seed) {
- QUnit.config.seed = urlParams.seed;
- }
-
- // Add URL-parameter-mapped config values with UI form rendering data
- QUnit.config.urlConfig.push({
- id: "hidepassed",
- label: "Hide passed tests",
- tooltip: "Only show tests and assertions that fail. Stored as query-strings."
- }, {
- id: "noglobals",
- label: "Check for Globals",
- tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings."
- }, {
- id: "notrycatch",
- label: "No try-catch",
- tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings."
- });
-
- QUnit.begin(function () {
- var i,
- option,
- urlConfig = QUnit.config.urlConfig;
-
- for (i = 0; i < urlConfig.length; i++) {
-
- // Options can be either strings or objects with nonempty "id" properties
- option = QUnit.config.urlConfig[i];
- if (typeof option !== "string") {
- option = option.id;
- }
-
- if (QUnit.config[option] === undefined) {
- QUnit.config[option] = urlParams[option];
- }
- }
- });
-
- function getUrlParams() {
- var i, param, name, value;
- var urlParams = Object.create(null);
- var params = location.search.slice(1).split("&");
- var length = params.length;
-
- for (i = 0; i < length; i++) {
- if (params[i]) {
- param = params[i].split("=");
- name = decodeQueryParam(param[0]);
-
- // Allow just a key to turn on a flag, e.g., test.html?noglobals
- value = param.length === 1 || decodeQueryParam(param.slice(1).join("="));
- if (name in urlParams) {
- urlParams[name] = [].concat(urlParams[name], value);
- } else {
- urlParams[name] = value;
- }
- }
- }
-
- return urlParams;
- }
-
- function decodeQueryParam(param) {
- return decodeURIComponent(param.replace(/\+/g, "%20"));
- }
- })();
-
- var stats = {
- passedTests: 0,
- failedTests: 0,
- skippedTests: 0,
- todoTests: 0
- };
-
- // Escape text for attribute or text content.
- function escapeText(s) {
- if (!s) {
- return "";
- }
- s = s + "";
-
- // Both single quotes and double quotes (for attributes)
- return s.replace(/['"<>&]/g, function (s) {
- switch (s) {
- case "'":
- return "'";
- case "\"":
- return """;
- case "<":
- return "<";
- case ">":
- return ">";
- case "&":
- return "&";
- }
- });
- }
-
- (function () {
-
- // Don't load the HTML Reporter on non-browser environments
- if (typeof window$1 === "undefined" || !window$1.document) {
- return;
- }
-
- var config = QUnit.config,
- hiddenTests = [],
- document = window$1.document,
- collapseNext = false,
- hasOwn = Object.prototype.hasOwnProperty,
- unfilteredUrl = setUrl({ filter: undefined, module: undefined,
- moduleId: undefined, testId: undefined }),
- modulesList = [];
-
- function addEvent(elem, type, fn) {
- elem.addEventListener(type, fn, false);
- }
-
- function removeEvent(elem, type, fn) {
- elem.removeEventListener(type, fn, false);
- }
-
- function addEvents(elems, type, fn) {
- var i = elems.length;
- while (i--) {
- addEvent(elems[i], type, fn);
- }
- }
-
- function hasClass(elem, name) {
- return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0;
- }
-
- function addClass(elem, name) {
- if (!hasClass(elem, name)) {
- elem.className += (elem.className ? " " : "") + name;
- }
- }
-
- function toggleClass(elem, name, force) {
- if (force || typeof force === "undefined" && !hasClass(elem, name)) {
- addClass(elem, name);
- } else {
- removeClass(elem, name);
- }
- }
-
- function removeClass(elem, name) {
- var set = " " + elem.className + " ";
-
- // Class name may appear multiple times
- while (set.indexOf(" " + name + " ") >= 0) {
- set = set.replace(" " + name + " ", " ");
- }
-
- // Trim for prettiness
- elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
- }
-
- function id(name) {
- return document.getElementById && document.getElementById(name);
- }
-
- function abortTests() {
- var abortButton = id("qunit-abort-tests-button");
- if (abortButton) {
- abortButton.disabled = true;
- abortButton.innerHTML = "Aborting...";
- }
- QUnit.config.queue.length = 0;
- return false;
- }
-
- function interceptNavigation(ev) {
- applyUrlParams();
-
- if (ev && ev.preventDefault) {
- ev.preventDefault();
- }
-
- return false;
- }
-
- function getUrlConfigHtml() {
- var i,
- j,
- val,
- escaped,
- escapedTooltip,
- selection = false,
- urlConfig = config.urlConfig,
- urlConfigHtml = "";
-
- for (i = 0; i < urlConfig.length; i++) {
-
- // Options can be either strings or objects with nonempty "id" properties
- val = config.urlConfig[i];
- if (typeof val === "string") {
- val = {
- id: val,
- label: val
- };
- }
-
- escaped = escapeText(val.id);
- escapedTooltip = escapeText(val.tooltip);
-
- if (!val.value || typeof val.value === "string") {
- urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>";
- } else {
- urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
-
- if (QUnit.is("array", val.value)) {
- for (j = 0; j < val.value.length; j++) {
- escaped = escapeText(val.value[j]);
- urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>";
- }
- } else {
- for (j in val.value) {
- if (hasOwn.call(val.value, j)) {
- urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>";
- }
- }
- }
- if (config[val.id] && !selection) {
- escaped = escapeText(config[val.id]);
- urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>";
- }
- urlConfigHtml += "</select>";
- }
- }
-
- return urlConfigHtml;
- }
-
- // Handle "click" events on toolbar checkboxes and "change" for select menus.
- // Updates the URL with the new state of `config.urlConfig` values.
- function toolbarChanged() {
- var updatedUrl,
- value,
- tests,
- field = this,
- params = {};
-
- // Detect if field is a select menu or a checkbox
- if ("selectedIndex" in field) {
- value = field.options[field.selectedIndex].value || undefined;
- } else {
- value = field.checked ? field.defaultValue || true : undefined;
- }
-
- params[field.name] = value;
- updatedUrl = setUrl(params);
-
- // Check if we can apply the change without a page refresh
- if ("hidepassed" === field.name && "replaceState" in window$1.history) {
- QUnit.urlParams[field.name] = value;
- config[field.name] = value || false;
- tests = id("qunit-tests");
- if (tests) {
- var length = tests.children.length;
- var children = tests.children;
-
- if (field.checked) {
- for (var i = 0; i < length; i++) {
- var test = children[i];
-
- if (test && test.className.indexOf("pass") > -1) {
- hiddenTests.push(test);
- }
- }
-
- var _iteratorNormalCompletion = true;
- var _didIteratorError = false;
- var _iteratorError = undefined;
-
- try {
- for (var _iterator = hiddenTests[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
- var hiddenTest = _step.value;
-
- tests.removeChild(hiddenTest);
- }
- } catch (err) {
- _didIteratorError = true;
- _iteratorError = err;
- } finally {
- try {
- if (!_iteratorNormalCompletion && _iterator.return) {
- _iterator.return();
- }
- } finally {
- if (_didIteratorError) {
- throw _iteratorError;
- }
- }
- }
- } else {
- while ((test = hiddenTests.pop()) != null) {
- tests.appendChild(test);
- }
- }
- }
- window$1.history.replaceState(null, "", updatedUrl);
- } else {
- window$1.location = updatedUrl;
- }
- }
-
- function setUrl(params) {
- var key,
- arrValue,
- i,
- querystring = "?",
- location = window$1.location;
-
- params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params);
-
- for (key in params) {
-
- // Skip inherited or undefined properties
- if (hasOwn.call(params, key) && params[key] !== undefined) {
-
- // Output a parameter for each value of this key
- // (but usually just one)
- arrValue = [].concat(params[key]);
- for (i = 0; i < arrValue.length; i++) {
- querystring += encodeURIComponent(key);
- if (arrValue[i] !== true) {
- querystring += "=" + encodeURIComponent(arrValue[i]);
- }
- querystring += "&";
- }
- }
- }
- return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1);
- }
-
- function applyUrlParams() {
- var i,
- selectedModules = [],
- modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"),
- filter = id("qunit-filter-input").value;
-
- for (i = 0; i < modulesList.length; i++) {
- if (modulesList[i].checked) {
- selectedModules.push(modulesList[i].value);
- }
- }
-
- window$1.location = setUrl({
- filter: filter === "" ? undefined : filter,
- moduleId: selectedModules.length === 0 ? undefined : selectedModules,
-
- // Remove module and testId filter
- module: undefined,
- testId: undefined
- });
- }
-
- function toolbarUrlConfigContainer() {
- var urlConfigContainer = document.createElement("span");
-
- urlConfigContainer.innerHTML = getUrlConfigHtml();
- addClass(urlConfigContainer, "qunit-url-config");
-
- addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged);
- addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged);
-
- return urlConfigContainer;
- }
-
- function abortTestsButton() {
- var button = document.createElement("button");
- button.id = "qunit-abort-tests-button";
- button.innerHTML = "Abort";
- addEvent(button, "click", abortTests);
- return button;
- }
-
- function toolbarLooseFilter() {
- var filter = document.createElement("form"),
- label = document.createElement("label"),
- input = document.createElement("input"),
- button = document.createElement("button");
-
- addClass(filter, "qunit-filter");
-
- label.innerHTML = "Filter: ";
-
- input.type = "text";
- input.value = config.filter || "";
- input.name = "filter";
- input.id = "qunit-filter-input";
-
- button.innerHTML = "Go";
-
- label.appendChild(input);
-
- filter.appendChild(label);
- filter.appendChild(document.createTextNode(" "));
- filter.appendChild(button);
- addEvent(filter, "submit", interceptNavigation);
-
- return filter;
- }
-
- function moduleListHtml() {
- var i,
- checked,
- html = "";
-
- for (i = 0; i < config.modules.length; i++) {
- if (config.modules[i].name !== "") {
- checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1;
- html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>";
- }
- }
-
- return html;
- }
-
- function toolbarModuleFilter() {
- var commit,
- reset,
- moduleFilter = document.createElement("form"),
- label = document.createElement("label"),
- moduleSearch = document.createElement("input"),
- dropDown = document.createElement("div"),
- actions = document.createElement("span"),
- applyButton = document.createElement("button"),
- resetButton = document.createElement("button"),
- allModulesLabel = document.createElement("label"),
- allCheckbox = document.createElement("input"),
- dropDownList = document.createElement("ul"),
- dirty = false;
-
- moduleSearch.id = "qunit-modulefilter-search";
- moduleSearch.autocomplete = "off";
- addEvent(moduleSearch, "input", searchInput);
- addEvent(moduleSearch, "input", searchFocus);
- addEvent(moduleSearch, "focus", searchFocus);
- addEvent(moduleSearch, "click", searchFocus);
-
- label.id = "qunit-modulefilter-search-container";
- label.innerHTML = "Module: ";
- label.appendChild(moduleSearch);
-
- applyButton.textContent = "Apply";
- applyButton.style.display = "none";
-
- resetButton.textContent = "Reset";
- resetButton.type = "reset";
- resetButton.style.display = "none";
-
- allCheckbox.type = "checkbox";
- allCheckbox.checked = config.moduleId.length === 0;
-
- allModulesLabel.className = "clickable";
- if (config.moduleId.length) {
- allModulesLabel.className = "checked";
- }
- allModulesLabel.appendChild(allCheckbox);
- allModulesLabel.appendChild(document.createTextNode("All modules"));
-
- actions.id = "qunit-modulefilter-actions";
- actions.appendChild(applyButton);
- actions.appendChild(resetButton);
- actions.appendChild(allModulesLabel);
- commit = actions.firstChild;
- reset = commit.nextSibling;
- addEvent(commit, "click", applyUrlParams);
-
- dropDownList.id = "qunit-modulefilter-dropdown-list";
- dropDownList.innerHTML = moduleListHtml();
-
- dropDown.id = "qunit-modulefilter-dropdown";
- dropDown.style.display = "none";
- dropDown.appendChild(actions);
- dropDown.appendChild(dropDownList);
- addEvent(dropDown, "change", selectionChange);
- selectionChange();
-
- moduleFilter.id = "qunit-modulefilter";
- moduleFilter.appendChild(label);
- moduleFilter.appendChild(dropDown);
- addEvent(moduleFilter, "submit", interceptNavigation);
- addEvent(moduleFilter, "reset", function () {
-
- // Let the reset happen, then update styles
- window$1.setTimeout(selectionChange);
- });
-
- // Enables show/hide for the dropdown
- function searchFocus() {
- if (dropDown.style.display !== "none") {
- return;
- }
-
- dropDown.style.display = "block";
- addEvent(document, "click", hideHandler);
- addEvent(document, "keydown", hideHandler);
-
- // Hide on Escape keydown or outside-container click
- function hideHandler(e) {
- var inContainer = moduleFilter.contains(e.target);
-
- if (e.keyCode === 27 || !inContainer) {
- if (e.keyCode === 27 && inContainer) {
- moduleSearch.focus();
- }
- dropDown.style.display = "none";
- removeEvent(document, "click", hideHandler);
- removeEvent(document, "keydown", hideHandler);
- moduleSearch.value = "";
- searchInput();
- }
- }
- }
-
- // Processes module search box input
- function searchInput() {
- var i,
- item,
- searchText = moduleSearch.value.toLowerCase(),
- listItems = dropDownList.children;
-
- for (i = 0; i < listItems.length; i++) {
- item = listItems[i];
- if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) {
- item.style.display = "";
- } else {
- item.style.display = "none";
- }
- }
- }
-
- // Processes selection changes
- function selectionChange(evt) {
- var i,
- item,
- checkbox = evt && evt.target || allCheckbox,
- modulesList = dropDownList.getElementsByTagName("input"),
- selectedNames = [];
-
- toggleClass(checkbox.parentNode, "checked", checkbox.checked);
-
- dirty = false;
- if (checkbox.checked && checkbox !== allCheckbox) {
- allCheckbox.checked = false;
- removeClass(allCheckbox.parentNode, "checked");
- }
- for (i = 0; i < modulesList.length; i++) {
- item = modulesList[i];
- if (!evt) {
- toggleClass(item.parentNode, "checked", item.checked);
- } else if (checkbox === allCheckbox && checkbox.checked) {
- item.checked = false;
- removeClass(item.parentNode, "checked");
- }
- dirty = dirty || item.checked !== item.defaultChecked;
- if (item.checked) {
- selectedNames.push(item.parentNode.textContent);
- }
- }
-
- commit.style.display = reset.style.display = dirty ? "" : "none";
- moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent;
- moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent);
- }
-
- return moduleFilter;
- }
-
- function appendToolbar() {
- var toolbar = id("qunit-testrunner-toolbar");
-
- if (toolbar) {
- toolbar.appendChild(toolbarUrlConfigContainer());
- toolbar.appendChild(toolbarModuleFilter());
- toolbar.appendChild(toolbarLooseFilter());
- toolbar.appendChild(document.createElement("div")).className = "clearfix";
- }
- }
-
- function appendHeader() {
- var header = id("qunit-header");
-
- if (header) {
- header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> ";
- }
- }
-
- function appendBanner() {
- var banner = id("qunit-banner");
-
- if (banner) {
- banner.className = "";
- }
- }
-
- function appendTestResults() {
- var tests = id("qunit-tests"),
- result = id("qunit-testresult"),
- controls;
-
- if (result) {
- result.parentNode.removeChild(result);
- }
-
- if (tests) {
- tests.innerHTML = "";
- result = document.createElement("p");
- result.id = "qunit-testresult";
- result.className = "result";
- tests.parentNode.insertBefore(result, tests);
- result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br /> </div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>";
- controls = id("qunit-testresult-controls");
- }
-
- if (controls) {
- controls.appendChild(abortTestsButton());
- }
- }
-
- function appendFilteredTest() {
- var testId = QUnit.config.testId;
- if (!testId || testId.length <= 0) {
- return "";
- }
- return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>";
- }
-
- function appendUserAgent() {
- var userAgent = id("qunit-userAgent");
-
- if (userAgent) {
- userAgent.innerHTML = "";
- userAgent.appendChild(document.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent));
- }
- }
-
- function appendInterface() {
- var qunit = id("qunit");
-
- if (qunit) {
- qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>";
- }
-
- appendHeader();
- appendBanner();
- appendTestResults();
- appendUserAgent();
- appendToolbar();
- }
-
- function appendTest(name, testId, moduleName) {
- var title,
- rerunTrigger,
- testBlock,
- assertList,
- tests = id("qunit-tests");
-
- if (!tests) {
- return;
- }
-
- title = document.createElement("strong");
- title.innerHTML = getNameHtml(name, moduleName);
-
- rerunTrigger = document.createElement("a");
- rerunTrigger.innerHTML = "Rerun";
- rerunTrigger.href = setUrl({ testId: testId });
-
- testBlock = document.createElement("li");
- testBlock.appendChild(title);
- testBlock.appendChild(rerunTrigger);
- testBlock.id = "qunit-test-output-" + testId;
-
- assertList = document.createElement("ol");
- assertList.className = "qunit-assert-list";
-
- testBlock.appendChild(assertList);
-
- tests.appendChild(testBlock);
- }
-
- // HTML Reporter initialization and load
- QUnit.begin(function (details) {
- var i, moduleObj;
-
- // Sort modules by name for the picker
- for (i = 0; i < details.modules.length; i++) {
- moduleObj = details.modules[i];
- if (moduleObj.name) {
- modulesList.push(moduleObj.name);
- }
- }
- modulesList.sort(function (a, b) {
- return a.localeCompare(b);
- });
-
- // Initialize QUnit elements
- appendInterface();
- });
-
- QUnit.done(function (details) {
- var banner = id("qunit-banner"),
- tests = id("qunit-tests"),
- abortButton = id("qunit-abort-tests-button"),
- totalTests = stats.passedTests + stats.skippedTests + stats.todoTests + stats.failedTests,
- html = [totalTests, " tests completed in ", details.runtime, " milliseconds, with ", stats.failedTests, " failed, ", stats.skippedTests, " skipped, and ", stats.todoTests, " todo.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""),
- test,
- assertLi,
- assertList;
-
- // Update remaing tests to aborted
- if (abortButton && abortButton.disabled) {
- html = "Tests aborted after " + details.runtime + " milliseconds.";
-
- for (var i = 0; i < tests.children.length; i++) {
- test = tests.children[i];
- if (test.className === "" || test.className === "running") {
- test.className = "aborted";
- assertList = test.getElementsByTagName("ol")[0];
- assertLi = document.createElement("li");
- assertLi.className = "fail";
- assertLi.innerHTML = "Test aborted.";
- assertList.appendChild(assertLi);
- }
- }
- }
-
- if (banner && (!abortButton || abortButton.disabled === false)) {
- banner.className = stats.failedTests ? "qunit-fail" : "qunit-pass";
- }
-
- if (abortButton) {
- abortButton.parentNode.removeChild(abortButton);
- }
-
- if (tests) {
- id("qunit-testresult-display").innerHTML = html;
- }
-
- if (config.altertitle && document.title) {
-
- // Show ✖ for good, ✔ for bad suite result in title
- // use escape sequences in case file gets loaded with non-utf-8
- // charset
- document.title = [stats.failedTests ? "\u2716" : "\u2714", document.title.replace(/^[\u2714\u2716] /i, "")].join(" ");
- }
-
- // Scroll back to top to show results
- if (config.scrolltop && window$1.scrollTo) {
- window$1.scrollTo(0, 0);
- }
- });
-
- function getNameHtml(name, module) {
- var nameHtml = "";
-
- if (module) {
- nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: ";
- }
-
- nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>";
-
- return nameHtml;
- }
-
- QUnit.testStart(function (details) {
- var running, bad;
-
- appendTest(details.name, details.testId, details.module);
-
- running = id("qunit-testresult-display");
-
- if (running) {
- addClass(running, "running");
-
- bad = QUnit.config.reorder && details.previousFailure;
-
- running.innerHTML = [bad ? "Rerunning previously failed test: <br />" : "Running: <br />", getNameHtml(details.name, details.module)].join("");
- }
- });
-
- function stripHtml(string) {
-
- // Strip tags, html entity and whitespaces
- return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/"/g, "").replace(/\s+/g, "");
- }
-
- QUnit.log(function (details) {
- var assertList,
- assertLi,
- message,
- expected,
- actual,
- diff,
- showDiff = false,
- testItem = id("qunit-test-output-" + details.testId);
-
- if (!testItem) {
- return;
- }
-
- message = escapeText(details.message) || (details.result ? "okay" : "failed");
- message = "<span class='test-message'>" + message + "</span>";
- message += "<span class='runtime'>@ " + details.runtime + " ms</span>";
-
- // The pushFailure doesn't provide details.expected
- // when it calls, it's implicit to also not show expected and diff stuff
- // Also, we need to check details.expected existence, as it can exist and be undefined
- if (!details.result && hasOwn.call(details, "expected")) {
- if (details.negative) {
- expected = "NOT " + QUnit.dump.parse(details.expected);
- } else {
- expected = QUnit.dump.parse(details.expected);
- }
-
- actual = QUnit.dump.parse(details.actual);
- message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>";
-
- if (actual !== expected) {
-
- message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>";
-
- if (typeof details.actual === "number" && typeof details.expected === "number") {
- if (!isNaN(details.actual) && !isNaN(details.expected)) {
- showDiff = true;
- diff = details.actual - details.expected;
- diff = (diff > 0 ? "+" : "") + diff;
- }
- } else if (typeof details.actual !== "boolean" && typeof details.expected !== "boolean") {
- diff = QUnit.diff(expected, actual);
-
- // don't show diff if there is zero overlap
- showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length;
- }
-
- if (showDiff) {
- message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>";
- }
- } else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) {
- message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({ maxDepth: -1 })) + "'>" + "Rerun</a> without max depth.</p></td></tr>";
- } else {
- message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>";
- }
-
- if (details.source) {
- message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>";
- }
-
- message += "</table>";
-
- // This occurs when pushFailure is set and we have an extracted stack trace
- } else if (!details.result && details.source) {
- message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>";
- }
-
- assertList = testItem.getElementsByTagName("ol")[0];
-
- assertLi = document.createElement("li");
- assertLi.className = details.result ? "pass" : "fail";
- assertLi.innerHTML = message;
- assertList.appendChild(assertLi);
- });
-
- QUnit.testDone(function (details) {
- var testTitle,
- time,
- testItem,
- assertList,
- status,
- good,
- bad,
- testCounts,
- skipped,
- sourceName,
- tests = id("qunit-tests");
-
- if (!tests) {
- return;
- }
-
- testItem = id("qunit-test-output-" + details.testId);
-
- removeClass(testItem, "running");
-
- if (details.failed > 0) {
- status = "failed";
- } else if (details.todo) {
- status = "todo";
- } else {
- status = details.skipped ? "skipped" : "passed";
- }
-
- assertList = testItem.getElementsByTagName("ol")[0];
-
- good = details.passed;
- bad = details.failed;
-
- // This test passed if it has no unexpected failed assertions
- var testPassed = details.failed > 0 ? details.todo : !details.todo;
-
- if (testPassed) {
-
- // Collapse the passing tests
- addClass(assertList, "qunit-collapsed");
- } else if (config.collapse) {
- if (!collapseNext) {
-
- // Skip collapsing the first failing test
- collapseNext = true;
- } else {
-
- // Collapse remaining tests
- addClass(assertList, "qunit-collapsed");
- }
- }
-
- // The testItem.firstChild is the test name
- testTitle = testItem.firstChild;
-
- testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : "";
-
- testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>";
-
- if (details.skipped) {
- stats.skippedTests++;
-
- testItem.className = "skipped";
- skipped = document.createElement("em");
- skipped.className = "qunit-skipped-label";
- skipped.innerHTML = "skipped";
- testItem.insertBefore(skipped, testTitle);
- } else {
- addEvent(testTitle, "click", function () {
- toggleClass(assertList, "qunit-collapsed");
- });
-
- testItem.className = testPassed ? "pass" : "fail";
-
- if (details.todo) {
- var todoLabel = document.createElement("em");
- todoLabel.className = "qunit-todo-label";
- todoLabel.innerHTML = "todo";
- testItem.className += " todo";
- testItem.insertBefore(todoLabel, testTitle);
- }
-
- time = document.createElement("span");
- time.className = "runtime";
- time.innerHTML = details.runtime + " ms";
- testItem.insertBefore(time, assertList);
-
- if (!testPassed) {
- stats.failedTests++;
- } else if (details.todo) {
- stats.todoTests++;
- } else {
- stats.passedTests++;
- }
- }
-
- // Show the source of the test when showing assertions
- if (details.source) {
- sourceName = document.createElement("p");
- sourceName.innerHTML = "<strong>Source: </strong>" + escapeText(details.source);
- addClass(sourceName, "qunit-source");
- if (testPassed) {
- addClass(sourceName, "qunit-collapsed");
- }
- addEvent(testTitle, "click", function () {
- toggleClass(sourceName, "qunit-collapsed");
- });
- testItem.appendChild(sourceName);
- }
-
- if (config.hidepassed && status === "passed") {
-
- // use removeChild instead of remove because of support
- hiddenTests.push(testItem);
-
- tests.removeChild(testItem);
- }
- });
-
- // Avoid readyState issue with phantomjs
- // Ref: #818
- var notPhantom = function (p) {
- return !(p && p.version && p.version.major > 0);
- }(window$1.phantom);
-
- if (notPhantom && document.readyState === "complete") {
- QUnit.load();
- } else {
- addEvent(window$1, "load", QUnit.load);
- }
-
- // Wrap window.onerror. We will call the original window.onerror to see if
- // the existing handler fully handles the error; if not, we will call the
- // QUnit.onError function.
- var originalWindowOnError = window$1.onerror;
-
- // Cover uncaught exceptions
- // Returning true will suppress the default browser handler,
- // returning false will let it run.
- window$1.onerror = function (message, fileName, lineNumber, columnNumber, errorObj) {
- var ret = false;
- if (originalWindowOnError) {
- for (var _len = arguments.length, args = Array(_len > 5 ? _len - 5 : 0), _key = 5; _key < _len; _key++) {
- args[_key - 5] = arguments[_key];
- }
-
- ret = originalWindowOnError.call.apply(originalWindowOnError, [this, message, fileName, lineNumber, columnNumber, errorObj].concat(args));
- }
-
- // Treat return value as window.onerror itself does,
- // Only do our handling if not suppressed.
- if (ret !== true) {
- var error = {
- message: message,
- fileName: fileName,
- lineNumber: lineNumber
- };
-
- // According to
- // https://blog.sentry.io/2016/01/04/client-javascript-reporting-window-onerror,
- // most modern browsers support an errorObj argument; use that to
- // get a full stack trace if it's available.
- if (errorObj && errorObj.stack) {
- error.stacktrace = extractStacktrace(errorObj, 0);
- }
-
- ret = QUnit.onError(error);
- }
-
- return ret;
- };
-
- // Listen for unhandled rejections, and call QUnit.onUnhandledRejection
- window$1.addEventListener("unhandledrejection", function (event) {
- QUnit.onUnhandledRejection(event.reason);
- });
- })();
-
- /*
- * This file is a modified version of google-diff-match-patch's JavaScript implementation
- * (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
- * modifications are licensed as more fully set forth in LICENSE.txt.
- *
- * The original source of google-diff-match-patch is attributable and licensed as follows:
- *
- * Copyright 2006 Google Inc.
- * https://code.google.com/p/google-diff-match-patch/
- *
- * Licensed 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
- *
- * https://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.
- *
- * More Info:
- * https://code.google.com/p/google-diff-match-patch/
- *
- * Usage: QUnit.diff(expected, actual)
- *
- */
- QUnit.diff = function () {
- function DiffMatchPatch() {}
-
- // DIFF FUNCTIONS
-
- /**
- * The data structure representing a diff is an array of tuples:
- * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
- * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
- */
- var DIFF_DELETE = -1,
- DIFF_INSERT = 1,
- DIFF_EQUAL = 0;
-
- /**
- * Find the differences between two texts. Simplifies the problem by stripping
- * any common prefix or suffix off the texts before diffing.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {boolean=} optChecklines Optional speedup flag. If present and false,
- * then don't run a line-level diff first to identify the changed areas.
- * Defaults to true, which does a faster, slightly less optimal diff.
- * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
- */
- DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) {
- var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs;
-
- // The diff must be complete in up to 1 second.
- deadline = new Date().getTime() + 1000;
-
- // Check for null inputs.
- if (text1 === null || text2 === null) {
- throw new Error("Null input. (DiffMain)");
- }
-
- // Check for equality (speedup).
- if (text1 === text2) {
- if (text1) {
- return [[DIFF_EQUAL, text1]];
- }
- return [];
- }
-
- if (typeof optChecklines === "undefined") {
- optChecklines = true;
- }
-
- checklines = optChecklines;
-
- // Trim off common prefix (speedup).
- commonlength = this.diffCommonPrefix(text1, text2);
- commonprefix = text1.substring(0, commonlength);
- text1 = text1.substring(commonlength);
- text2 = text2.substring(commonlength);
-
- // Trim off common suffix (speedup).
- commonlength = this.diffCommonSuffix(text1, text2);
- commonsuffix = text1.substring(text1.length - commonlength);
- text1 = text1.substring(0, text1.length - commonlength);
- text2 = text2.substring(0, text2.length - commonlength);
-
- // Compute the diff on the middle block.
- diffs = this.diffCompute(text1, text2, checklines, deadline);
-
- // Restore the prefix and suffix.
- if (commonprefix) {
- diffs.unshift([DIFF_EQUAL, commonprefix]);
- }
- if (commonsuffix) {
- diffs.push([DIFF_EQUAL, commonsuffix]);
- }
- this.diffCleanupMerge(diffs);
- return diffs;
- };
-
- /**
- * Reduce the number of edits by eliminating operationally trivial equalities.
- * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
- */
- DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) {
- var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, postDel;
- changes = false;
- equalities = []; // Stack of indices where equalities are found.
- equalitiesLength = 0; // Keeping our own length var is faster in JS.
- /** @type {?string} */
- lastequality = null;
-
- // Always equal to diffs[equalities[equalitiesLength - 1]][1]
- pointer = 0; // Index of current position.
-
- // Is there an insertion operation before the last equality.
- preIns = false;
-
- // Is there a deletion operation before the last equality.
- preDel = false;
-
- // Is there an insertion operation after the last equality.
- postIns = false;
-
- // Is there a deletion operation after the last equality.
- postDel = false;
- while (pointer < diffs.length) {
-
- // Equality found.
- if (diffs[pointer][0] === DIFF_EQUAL) {
- if (diffs[pointer][1].length < 4 && (postIns || postDel)) {
-
- // Candidate found.
- equalities[equalitiesLength++] = pointer;
- preIns = postIns;
- preDel = postDel;
- lastequality = diffs[pointer][1];
- } else {
-
- // Not a candidate, and can never become one.
- equalitiesLength = 0;
- lastequality = null;
- }
- postIns = postDel = false;
-
- // An insertion or deletion.
- } else {
-
- if (diffs[pointer][0] === DIFF_DELETE) {
- postDel = true;
- } else {
- postIns = true;
- }
-
- /*
- * Five types to be split:
- * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
- * <ins>A</ins>X<ins>C</ins><del>D</del>
- * <ins>A</ins><del>B</del>X<ins>C</ins>
- * <ins>A</del>X<ins>C</ins><del>D</del>
- * <ins>A</ins><del>B</del>X<del>C</del>
- */
- if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) {
-
- // Duplicate record.
- diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
-
- // Change second copy to insert.
- diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
- equalitiesLength--; // Throw away the equality we just deleted;
- lastequality = null;
- if (preIns && preDel) {
-
- // No changes made which could affect previous entry, keep going.
- postIns = postDel = true;
- equalitiesLength = 0;
- } else {
- equalitiesLength--; // Throw away the previous equality.
- pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
- postIns = postDel = false;
- }
- changes = true;
- }
- }
- pointer++;
- }
-
- if (changes) {
- this.diffCleanupMerge(diffs);
- }
- };
-
- /**
- * Convert a diff array into a pretty HTML report.
- * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
- * @param {integer} string to be beautified.
- * @return {string} HTML representation.
- */
- DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) {
- var op,
- data,
- x,
- html = [];
- for (x = 0; x < diffs.length; x++) {
- op = diffs[x][0]; // Operation (insert, delete, equal)
- data = diffs[x][1]; // Text of change.
- switch (op) {
- case DIFF_INSERT:
- html[x] = "<ins>" + escapeText(data) + "</ins>";
- break;
- case DIFF_DELETE:
- html[x] = "<del>" + escapeText(data) + "</del>";
- break;
- case DIFF_EQUAL:
- html[x] = "<span>" + escapeText(data) + "</span>";
- break;
- }
- }
- return html.join("");
- };
-
- /**
- * Determine the common prefix of two strings.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the start of each
- * string.
- */
- DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) {
- var pointermid, pointermax, pointermin, pointerstart;
-
- // Quick check for common null cases.
- if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) {
- return 0;
- }
-
- // Binary search.
- // Performance analysis: https://neil.fraser.name/news/2007/10/09/
- pointermin = 0;
- pointermax = Math.min(text1.length, text2.length);
- pointermid = pointermax;
- pointerstart = 0;
- while (pointermin < pointermid) {
- if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) {
- pointermin = pointermid;
- pointerstart = pointermin;
- } else {
- pointermax = pointermid;
- }
- pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
- }
- return pointermid;
- };
-
- /**
- * Determine the common suffix of two strings.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the end of each string.
- */
- DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) {
- var pointermid, pointermax, pointermin, pointerend;
-
- // Quick check for common null cases.
- if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) {
- return 0;
- }
-
- // Binary search.
- // Performance analysis: https://neil.fraser.name/news/2007/10/09/
- pointermin = 0;
- pointermax = Math.min(text1.length, text2.length);
- pointermid = pointermax;
- pointerend = 0;
- while (pointermin < pointermid) {
- if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) {
- pointermin = pointermid;
- pointerend = pointermin;
- } else {
- pointermax = pointermid;
- }
- pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
- }
- return pointermid;
- };
-
- /**
- * Find the differences between two texts. Assumes that the texts do not
- * have any common prefix or suffix.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {boolean} checklines Speedup flag. If false, then don't run a
- * line-level diff first to identify the changed areas.
- * If true, then run a faster, slightly less optimal diff.
- * @param {number} deadline Time when the diff should be complete by.
- * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
- * @private
- */
- DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) {
- var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, diffsB;
-
- if (!text1) {
-
- // Just add some text (speedup).
- return [[DIFF_INSERT, text2]];
- }
-
- if (!text2) {
-
- // Just delete some text (speedup).
- return [[DIFF_DELETE, text1]];
- }
-
- longtext = text1.length > text2.length ? text1 : text2;
- shorttext = text1.length > text2.length ? text2 : text1;
- i = longtext.indexOf(shorttext);
- if (i !== -1) {
-
- // Shorter text is inside the longer text (speedup).
- diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]];
-
- // Swap insertions for deletions if diff is reversed.
- if (text1.length > text2.length) {
- diffs[0][0] = diffs[2][0] = DIFF_DELETE;
- }
- return diffs;
- }
-
- if (shorttext.length === 1) {
-
- // Single character string.
- // After the previous speedup, the character can't be an equality.
- return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
- }
-
- // Check to see if the problem can be split in two.
- hm = this.diffHalfMatch(text1, text2);
- if (hm) {
-
- // A half-match was found, sort out the return data.
- text1A = hm[0];
- text1B = hm[1];
- text2A = hm[2];
- text2B = hm[3];
- midCommon = hm[4];
-
- // Send both pairs off for separate processing.
- diffsA = this.DiffMain(text1A, text2A, checklines, deadline);
- diffsB = this.DiffMain(text1B, text2B, checklines, deadline);
-
- // Merge the results.
- return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB);
- }
-
- if (checklines && text1.length > 100 && text2.length > 100) {
- return this.diffLineMode(text1, text2, deadline);
- }
-
- return this.diffBisect(text1, text2, deadline);
- };
-
- /**
- * Do the two texts share a substring which is at least half the length of the
- * longer text?
- * This speedup can produce non-minimal diffs.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {Array.<string>} Five element Array, containing the prefix of
- * text1, the suffix of text1, the prefix of text2, the suffix of
- * text2 and the common middle. Or null if there was no match.
- * @private
- */
- DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) {
- var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm;
-
- longtext = text1.length > text2.length ? text1 : text2;
- shorttext = text1.length > text2.length ? text2 : text1;
- if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
- return null; // Pointless.
- }
- dmp = this; // 'this' becomes 'window' in a closure.
-
- /**
- * Does a substring of shorttext exist within longtext such that the substring
- * is at least half the length of longtext?
- * Closure, but does not reference any external variables.
- * @param {string} longtext Longer string.
- * @param {string} shorttext Shorter string.
- * @param {number} i Start index of quarter length substring within longtext.
- * @return {Array.<string>} Five element Array, containing the prefix of
- * longtext, the suffix of longtext, the prefix of shorttext, the suffix
- * of shorttext and the common middle. Or null if there was no match.
- * @private
- */
- function diffHalfMatchI(longtext, shorttext, i) {
- var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
-
- // Start with a 1/4 length substring at position i as a seed.
- seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
- j = -1;
- bestCommon = "";
- while ((j = shorttext.indexOf(seed, j + 1)) !== -1) {
- prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j));
- suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j));
- if (bestCommon.length < suffixLength + prefixLength) {
- bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength);
- bestLongtextA = longtext.substring(0, i - suffixLength);
- bestLongtextB = longtext.substring(i + prefixLength);
- bestShorttextA = shorttext.substring(0, j - suffixLength);
- bestShorttextB = shorttext.substring(j + prefixLength);
- }
- }
- if (bestCommon.length * 2 >= longtext.length) {
- return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon];
- } else {
- return null;
- }
- }
-
- // First check if the second quarter is the seed for a half-match.
- hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4));
-
- // Check again based on the third quarter.
- hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2));
- if (!hm1 && !hm2) {
- return null;
- } else if (!hm2) {
- hm = hm1;
- } else if (!hm1) {
- hm = hm2;
- } else {
-
- // Both matched. Select the longest.
- hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
- }
-
- // A half-match was found, sort out the return data.
- if (text1.length > text2.length) {
- text1A = hm[0];
- text1B = hm[1];
- text2A = hm[2];
- text2B = hm[3];
- } else {
- text2A = hm[0];
- text2B = hm[1];
- text1A = hm[2];
- text1B = hm[3];
- }
- midCommon = hm[4];
- return [text1A, text1B, text2A, text2B, midCommon];
- };
-
- /**
- * Do a quick line-level diff on both strings, then rediff the parts for
- * greater accuracy.
- * This speedup can produce non-minimal diffs.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} deadline Time when the diff should be complete by.
- * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
- * @private
- */
- DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) {
- var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j;
-
- // Scan the text on a line-by-line basis first.
- a = this.diffLinesToChars(text1, text2);
- text1 = a.chars1;
- text2 = a.chars2;
- linearray = a.lineArray;
-
- diffs = this.DiffMain(text1, text2, false, deadline);
-
- // Convert the diff back to original text.
- this.diffCharsToLines(diffs, linearray);
-
- // Eliminate freak matches (e.g. blank lines)
- this.diffCleanupSemantic(diffs);
-
- // Rediff any replacement blocks, this time character-by-character.
- // Add a dummy entry at the end.
- diffs.push([DIFF_EQUAL, ""]);
- pointer = 0;
- countDelete = 0;
- countInsert = 0;
- textDelete = "";
- textInsert = "";
- while (pointer < diffs.length) {
- switch (diffs[pointer][0]) {
- case DIFF_INSERT:
- countInsert++;
- textInsert += diffs[pointer][1];
- break;
- case DIFF_DELETE:
- countDelete++;
- textDelete += diffs[pointer][1];
- break;
- case DIFF_EQUAL:
-
- // Upon reaching an equality, check for prior redundancies.
- if (countDelete >= 1 && countInsert >= 1) {
-
- // Delete the offending records and add the merged ones.
- diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert);
- pointer = pointer - countDelete - countInsert;
- a = this.DiffMain(textDelete, textInsert, false, deadline);
- for (j = a.length - 1; j >= 0; j--) {
- diffs.splice(pointer, 0, a[j]);
- }
- pointer = pointer + a.length;
- }
- countInsert = 0;
- countDelete = 0;
- textDelete = "";
- textInsert = "";
- break;
- }
- pointer++;
- }
- diffs.pop(); // Remove the dummy entry at the end.
-
- return diffs;
- };
-
- /**
- * Find the 'middle snake' of a diff, split the problem in two
- * and return the recursively constructed diff.
- * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} deadline Time at which to bail if not yet complete.
- * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
- * @private
- */
- DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) {
- var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
-
- // Cache the text lengths to prevent multiple calls.
- text1Length = text1.length;
- text2Length = text2.length;
- maxD = Math.ceil((text1Length + text2Length) / 2);
- vOffset = maxD;
- vLength = 2 * maxD;
- v1 = new Array(vLength);
- v2 = new Array(vLength);
-
- // Setting all elements to -1 is faster in Chrome & Firefox than mixing
- // integers and undefined.
- for (x = 0; x < vLength; x++) {
- v1[x] = -1;
- v2[x] = -1;
- }
- v1[vOffset + 1] = 0;
- v2[vOffset + 1] = 0;
- delta = text1Length - text2Length;
-
- // If the total number of characters is odd, then the front path will collide
- // with the reverse path.
- front = delta % 2 !== 0;
-
- // Offsets for start and end of k loop.
- // Prevents mapping of space beyond the grid.
- k1start = 0;
- k1end = 0;
- k2start = 0;
- k2end = 0;
- for (d = 0; d < maxD; d++) {
-
- // Bail out if deadline is reached.
- if (new Date().getTime() > deadline) {
- break;
- }
-
- // Walk the front path one step.
- for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
- k1Offset = vOffset + k1;
- if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) {
- x1 = v1[k1Offset + 1];
- } else {
- x1 = v1[k1Offset - 1] + 1;
- }
- y1 = x1 - k1;
- while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) {
- x1++;
- y1++;
- }
- v1[k1Offset] = x1;
- if (x1 > text1Length) {
-
- // Ran off the right of the graph.
- k1end += 2;
- } else if (y1 > text2Length) {
-
- // Ran off the bottom of the graph.
- k1start += 2;
- } else if (front) {
- k2Offset = vOffset + delta - k1;
- if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) {
-
- // Mirror x2 onto top-left coordinate system.
- x2 = text1Length - v2[k2Offset];
- if (x1 >= x2) {
-
- // Overlap detected.
- return this.diffBisectSplit(text1, text2, x1, y1, deadline);
- }
- }
- }
- }
-
- // Walk the reverse path one step.
- for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
- k2Offset = vOffset + k2;
- if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) {
- x2 = v2[k2Offset + 1];
- } else {
- x2 = v2[k2Offset - 1] + 1;
- }
- y2 = x2 - k2;
- while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) {
- x2++;
- y2++;
- }
- v2[k2Offset] = x2;
- if (x2 > text1Length) {
-
- // Ran off the left of the graph.
- k2end += 2;
- } else if (y2 > text2Length) {
-
- // Ran off the top of the graph.
- k2start += 2;
- } else if (!front) {
- k1Offset = vOffset + delta - k2;
- if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) {
- x1 = v1[k1Offset];
- y1 = vOffset + x1 - k1Offset;
-
- // Mirror x2 onto top-left coordinate system.
- x2 = text1Length - x2;
- if (x1 >= x2) {
-
- // Overlap detected.
- return this.diffBisectSplit(text1, text2, x1, y1, deadline);
- }
- }
- }
- }
- }
-
- // Diff took too long and hit the deadline or
- // number of diffs equals number of characters, no commonality at all.
- return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
- };
-
- /**
- * Given the location of the 'middle snake', split the diff in two parts
- * and recurse.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} x Index of split point in text1.
- * @param {number} y Index of split point in text2.
- * @param {number} deadline Time at which to bail if not yet complete.
- * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
- * @private
- */
- DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) {
- var text1a, text1b, text2a, text2b, diffs, diffsb;
- text1a = text1.substring(0, x);
- text2a = text2.substring(0, y);
- text1b = text1.substring(x);
- text2b = text2.substring(y);
-
- // Compute both diffs serially.
- diffs = this.DiffMain(text1a, text2a, false, deadline);
- diffsb = this.DiffMain(text1b, text2b, false, deadline);
-
- return diffs.concat(diffsb);
- };
-
- /**
- * Reduce the number of edits by eliminating semantically trivial equalities.
- * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
- */
- DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) {
- var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
- changes = false;
- equalities = []; // Stack of indices where equalities are found.
- equalitiesLength = 0; // Keeping our own length var is faster in JS.
- /** @type {?string} */
- lastequality = null;
-
- // Always equal to diffs[equalities[equalitiesLength - 1]][1]
- pointer = 0; // Index of current position.
-
- // Number of characters that changed prior to the equality.
- lengthInsertions1 = 0;
- lengthDeletions1 = 0;
-
- // Number of characters that changed after the equality.
- lengthInsertions2 = 0;
- lengthDeletions2 = 0;
- while (pointer < diffs.length) {
- if (diffs[pointer][0] === DIFF_EQUAL) {
- // Equality found.
- equalities[equalitiesLength++] = pointer;
- lengthInsertions1 = lengthInsertions2;
- lengthDeletions1 = lengthDeletions2;
- lengthInsertions2 = 0;
- lengthDeletions2 = 0;
- lastequality = diffs[pointer][1];
- } else {
- // An insertion or deletion.
- if (diffs[pointer][0] === DIFF_INSERT) {
- lengthInsertions2 += diffs[pointer][1].length;
- } else {
- lengthDeletions2 += diffs[pointer][1].length;
- }
-
- // Eliminate an equality that is smaller or equal to the edits on both
- // sides of it.
- if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) {
-
- // Duplicate record.
- diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
-
- // Change second copy to insert.
- diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
-
- // Throw away the equality we just deleted.
- equalitiesLength--;
-
- // Throw away the previous equality (it needs to be reevaluated).
- equalitiesLength--;
- pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
-
- // Reset the counters.
- lengthInsertions1 = 0;
- lengthDeletions1 = 0;
- lengthInsertions2 = 0;
- lengthDeletions2 = 0;
- lastequality = null;
- changes = true;
- }
- }
- pointer++;
- }
-
- // Normalize the diff.
- if (changes) {
- this.diffCleanupMerge(diffs);
- }
-
- // Find any overlaps between deletions and insertions.
- // e.g: <del>abcxxx</del><ins>xxxdef</ins>
- // -> <del>abc</del>xxx<ins>def</ins>
- // e.g: <del>xxxabc</del><ins>defxxx</ins>
- // -> <ins>def</ins>xxx<del>abc</del>
- // Only extract an overlap if it is as big as the edit ahead or behind it.
- pointer = 1;
- while (pointer < diffs.length) {
- if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) {
- deletion = diffs[pointer - 1][1];
- insertion = diffs[pointer][1];
- overlapLength1 = this.diffCommonOverlap(deletion, insertion);
- overlapLength2 = this.diffCommonOverlap(insertion, deletion);
- if (overlapLength1 >= overlapLength2) {
- if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) {
-
- // Overlap found. Insert an equality and trim the surrounding edits.
- diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]);
- diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1);
- diffs[pointer + 1][1] = insertion.substring(overlapLength1);
- pointer++;
- }
- } else {
- if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) {
-
- // Reverse overlap found.
- // Insert an equality and swap and trim the surrounding edits.
- diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]);
-
- diffs[pointer - 1][0] = DIFF_INSERT;
- diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2);
- diffs[pointer + 1][0] = DIFF_DELETE;
- diffs[pointer + 1][1] = deletion.substring(overlapLength2);
- pointer++;
- }
- }
- pointer++;
- }
- pointer++;
- }
- };
-
- /**
- * Determine if the suffix of one string is the prefix of another.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the end of the first
- * string and the start of the second string.
- * @private
- */
- DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) {
- var text1Length, text2Length, textLength, best, length, pattern, found;
-
- // Cache the text lengths to prevent multiple calls.
- text1Length = text1.length;
- text2Length = text2.length;
-
- // Eliminate the null case.
- if (text1Length === 0 || text2Length === 0) {
- return 0;
- }
-
- // Truncate the longer string.
- if (text1Length > text2Length) {
- text1 = text1.substring(text1Length - text2Length);
- } else if (text1Length < text2Length) {
- text2 = text2.substring(0, text1Length);
- }
- textLength = Math.min(text1Length, text2Length);
-
- // Quick check for the worst case.
- if (text1 === text2) {
- return textLength;
- }
-
- // Start by looking for a single character match
- // and increase length until no match is found.
- // Performance analysis: https://neil.fraser.name/news/2010/11/04/
- best = 0;
- length = 1;
- while (true) {
- pattern = text1.substring(textLength - length);
- found = text2.indexOf(pattern);
- if (found === -1) {
- return best;
- }
- length += found;
- if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) {
- best = length;
- length++;
- }
- }
- };
-
- /**
- * Split two texts into an array of strings. Reduce the texts to a string of
- * hashes where each Unicode character represents one line.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
- * An object containing the encoded text1, the encoded text2 and
- * the array of unique strings.
- * The zeroth element of the array of unique strings is intentionally blank.
- * @private
- */
- DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) {
- var lineArray, lineHash, chars1, chars2;
- lineArray = []; // E.g. lineArray[4] === 'Hello\n'
- lineHash = {}; // E.g. lineHash['Hello\n'] === 4
-
- // '\x00' is a valid character, but various debuggers don't like it.
- // So we'll insert a junk entry to avoid generating a null character.
- lineArray[0] = "";
-
- /**
- * Split a text into an array of strings. Reduce the texts to a string of
- * hashes where each Unicode character represents one line.
- * Modifies linearray and linehash through being a closure.
- * @param {string} text String to encode.
- * @return {string} Encoded string.
- * @private
- */
- function diffLinesToCharsMunge(text) {
- var chars, lineStart, lineEnd, lineArrayLength, line;
- chars = "";
-
- // Walk the text, pulling out a substring for each line.
- // text.split('\n') would would temporarily double our memory footprint.
- // Modifying text would create many large strings to garbage collect.
- lineStart = 0;
- lineEnd = -1;
-
- // Keeping our own length variable is faster than looking it up.
- lineArrayLength = lineArray.length;
- while (lineEnd < text.length - 1) {
- lineEnd = text.indexOf("\n", lineStart);
- if (lineEnd === -1) {
- lineEnd = text.length - 1;
- }
- line = text.substring(lineStart, lineEnd + 1);
- lineStart = lineEnd + 1;
-
- var lineHashExists = lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined;
-
- if (lineHashExists) {
- chars += String.fromCharCode(lineHash[line]);
- } else {
- chars += String.fromCharCode(lineArrayLength);
- lineHash[line] = lineArrayLength;
- lineArray[lineArrayLength++] = line;
- }
- }
- return chars;
- }
-
- chars1 = diffLinesToCharsMunge(text1);
- chars2 = diffLinesToCharsMunge(text2);
- return {
- chars1: chars1,
- chars2: chars2,
- lineArray: lineArray
- };
- };
-
- /**
- * Rehydrate the text in a diff from a string of line hashes to real lines of
- * text.
- * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
- * @param {!Array.<string>} lineArray Array of unique strings.
- * @private
- */
- DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) {
- var x, chars, text, y;
- for (x = 0; x < diffs.length; x++) {
- chars = diffs[x][1];
- text = [];
- for (y = 0; y < chars.length; y++) {
- text[y] = lineArray[chars.charCodeAt(y)];
- }
- diffs[x][1] = text.join("");
- }
- };
-
- /**
- * Reorder and merge like edit sections. Merge equalities.
- * Any edit section can move as long as it doesn't cross an equality.
- * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
- */
- DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) {
- var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, diffPointer, position;
- diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end.
- pointer = 0;
- countDelete = 0;
- countInsert = 0;
- textDelete = "";
- textInsert = "";
-
- while (pointer < diffs.length) {
- switch (diffs[pointer][0]) {
- case DIFF_INSERT:
- countInsert++;
- textInsert += diffs[pointer][1];
- pointer++;
- break;
- case DIFF_DELETE:
- countDelete++;
- textDelete += diffs[pointer][1];
- pointer++;
- break;
- case DIFF_EQUAL:
-
- // Upon reaching an equality, check for prior redundancies.
- if (countDelete + countInsert > 1) {
- if (countDelete !== 0 && countInsert !== 0) {
-
- // Factor out any common prefixes.
- commonlength = this.diffCommonPrefix(textInsert, textDelete);
- if (commonlength !== 0) {
- if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) {
- diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength);
- } else {
- diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]);
- pointer++;
- }
- textInsert = textInsert.substring(commonlength);
- textDelete = textDelete.substring(commonlength);
- }
-
- // Factor out any common suffixies.
- commonlength = this.diffCommonSuffix(textInsert, textDelete);
- if (commonlength !== 0) {
- diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1];
- textInsert = textInsert.substring(0, textInsert.length - commonlength);
- textDelete = textDelete.substring(0, textDelete.length - commonlength);
- }
- }
-
- // Delete the offending records and add the merged ones.
- if (countDelete === 0) {
- diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]);
- } else if (countInsert === 0) {
- diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]);
- } else {
- diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]);
- }
- pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1;
- } else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) {
-
- // Merge this equality with the previous one.
- diffs[pointer - 1][1] += diffs[pointer][1];
- diffs.splice(pointer, 1);
- } else {
- pointer++;
- }
- countInsert = 0;
- countDelete = 0;
- textDelete = "";
- textInsert = "";
- break;
- }
- }
- if (diffs[diffs.length - 1][1] === "") {
- diffs.pop(); // Remove the dummy entry at the end.
- }
-
- // Second pass: look for single edits surrounded on both sides by equalities
- // which can be shifted sideways to eliminate an equality.
- // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
- changes = false;
- pointer = 1;
-
- // Intentionally ignore the first and last element (don't need checking).
- while (pointer < diffs.length - 1) {
- if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) {
-
- diffPointer = diffs[pointer][1];
- position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length);
-
- // This is a single edit surrounded by equalities.
- if (position === diffs[pointer - 1][1]) {
-
- // Shift the edit over the previous equality.
- diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length);
- diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
- diffs.splice(pointer - 1, 1);
- changes = true;
- } else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) {
-
- // Shift the edit over the next equality.
- diffs[pointer - 1][1] += diffs[pointer + 1][1];
- diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1];
- diffs.splice(pointer + 1, 1);
- changes = true;
- }
- }
- pointer++;
- }
-
- // If shifts were made, the diff needs reordering and another shift sweep.
- if (changes) {
- this.diffCleanupMerge(diffs);
- }
- };
-
- return function (o, n) {
- var diff, output, text;
- diff = new DiffMatchPatch();
- output = diff.DiffMain(o, n);
- diff.diffCleanupEfficiency(output);
- text = diff.diffPrettyHtml(output);
-
- return text;
- };
- }();
-
-}((function() { return this; }())));
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
index a5cb2b2..e95e02b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/tobago-test.js
@@ -39,46 +39,6 @@ function querySelectorAllFn(expression) {
export {elementByIdFn, querySelectorFn, querySelectorAllFn};
-QUnit.test("wait for test", function (assert) {
- let done = assert.async();
-
- let startTime = new Date().getTime();
- let contentWindowReadyState = "";
- let waitingDone = false;
- let interval = setInterval(function () {
- contentWindowReadyState = document.getElementById("page:testframe").contentWindow.document.readyState;
- waitingDone = contentWindowReadyState === "complete"
- if (new Date().getTime() - startTime >= 20000 || waitingDone) {
- clearInterval(interval);
- assert.ok(waitingDone);
- done();
- }
- }, 50);
-});
-
-QUnit.test("duplicated IDs", function (assert) {
- function getDuplicatedIDs() {
- let duplicatedIDs = [];
- let iFrame = document.getElementById("page:testframe").contentWindow.document.querySelectorAll("[id]");
- iFrame.forEach(element => {
- let sameIdElements = document.getElementById("page:testframe").contentWindow.document
- .querySelectorAll("[id='" + element.id + "']");
- if (sameIdElements.length > 1) {
- duplicatedIDs.push(element.id);
- }
- });
- return duplicatedIDs;
- }
-
- let duplicatedIDs = getDuplicatedIDs();
- assert.equal(duplicatedIDs.length, 0, "duplicated IDs are: " + duplicatedIDs);
-});
-
-QUnit.test("test '???'", function (assert) {
- assert.ok(querySelectorFn("html")().textContent.indexOf("???") <= -1,
- "There must no '???' on the site.");
-});
-
beforeEach(function (done) {
const test = new JasmineTestTool(done);
test.wait(() => document.getElementById("page:testframe").contentWindow.document.readyState === "complete");
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
index e50ea57..d06d97b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
@@ -22,19 +22,15 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml">
<tc:script file="#{request.contextPath}/script/demo.js" type="module"/>
- <tc:script file="#{request.contextPath}/script/qunit-2.9.2.js"/>
<tc:script file="#{request.contextPath}/script/jasmine-3.5.0/jasmine.js"/>
<tc:script file="#{request.contextPath}/script/jasmine-3.5.0/jasmine-html.js"/>
<tc:script file="#{request.contextPath}/script/jasmine-3.5.0/boot.js"/>
<tc:script file="#{request.contextPath}/tobago/test/tobago-test-tool.js" type="module"/>
<tc:script file="#{request.contextPath}/script/tobago-test.js" type="module"/>
- <tc:style file="#{request.contextPath}/style/qunit-2.9.2.css"/>
<tc:style file="#{request.contextPath}/style/jasmine-3.5.0.css"/>
<tc:script file="#{request.contextPath}/#{param['accessTest'] ? 'error/error' : param['base']}.test.js"
type="module"/>
- <div id="qunit"></div>
- <div id="qunit-fixture"></div>
<div id="jasmine-container"></div>
<tc:button label="Close Test" link="#{param['base']}.xhtml"/>