projects / test / tct / web / uifw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0524d58)
Revert change in QUnit.js and test fix 32/187932/2
authorTomasz Lukawski <t.lukawski@samsung.com>
Wed, 29 Aug 2018 13:09:59 +0000 (15:09 +0200)
committerTomasz Lukawski <t.lukawski@samsung.com>
Wed, 29 Aug 2018 17:21:28 +0000 (19:21 +0200)
- Event DOMContentLoaded is triggering too early. Default listener has been reverted to "load" event.
- modify nondeterministic jqm test

Change-Id: I7e029bc92255ead76ba301d7669da56995ae23ed
Signed-off-by: Tomasz Lukawski <t.lukawski@samsung.com>
mobile/tct-webuifw-tests01/tests/js/core/core/jqm/core.html [changed mode: 0755->0644] patch | blob | history
mobile/tct-webuifw-tests01/tests/js/core/core/jqm/init_core.js [changed mode: 0755->0644] patch | blob | history
mobile/tct-webuifw-tests01/tests/libs/qunit-1.11.0.js [changed mode: 0755->0644] patch | blob | history

diff --git a/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/core.html b/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/core.html
old mode 100755 (executable)
new mode 100644 (file)
index e6eaa67..db5518c
--- a/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/core.html
+++ b/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/core.html
@@ -10,6 +10,11 @@
     <script src="../../../../libs/support.js"></script>
     <script src="../../../../libs/jquery.testHelper.js"></script>
     <script src="init_core.js"></script>
+    <script type="text/javascript">
+        var tauConfig = tauConfig || {};
+            tauConfig.autorun = false;
+            tauConfig.pageTransition = "none";
+    </script>
     <script src="../../../../libs/dist/js/tau.js"></script>
 </head>
 <body>
diff --git a/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/init_core.js b/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/init_core.js
old mode 100755 (executable)
new mode 100644 (file)
index a6707ed..6dca36c
--- a/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/init_core.js
+++ b/mobile/tct-webuifw-tests01/tests/js/core/core/jqm/init_core.js
@@ -40,6 +40,7 @@
 
        // NOTE for the following two tests see index html for the binding
        test("mobile.page is available when mobile init is fired", function () {
+               reloadCoreNSandInit();
                ok(mobilePage !== undefined, "$.mobile.page is defined");
        });
 
@@ -99,10 +100,12 @@
                });
 
                test("pages without a data-url attribute have it set to their id", function () {
+                       reloadCoreNSandInit();
                        deepEqual($("#foo").jqmData("url"), "#foo", "");
                });
 
                test("pages with a data-url attribute are left with the original value", function () {
+                       reloadCoreNSandInit();
                        deepEqual($("#bar").jqmData("url"), "bak", "");
                });
 
@@ -113,19 +116,25 @@
 
                        $("<div />", { "data-role": "page", "id": "autoinit-on" }).prependTo("body");
 
+                       var timeout = setTimeout(function () {
+                               false("Test timeout");
+                               start();
+                       }, 4000);
+
                        $(document).one("mobileinit", function () {
                                $.mobile.autoInitializePage = true;
+
+                               setTimeout(function () {
+                                       clearTimeout(timeout);
+                                       deepEqual($("#autoinit-on.ui-page").length, 1, "");
+
+                                       start();
+                               }, 2000);
                        });
 
                        location.hash = "";
 
                        reloadCoreNSandInit();
-
-                       setTimeout(function () {
-                               deepEqual($("#autoinit-on.ui-page").length, 1, "");
-
-                               start();
-                       }, 2000);
                });
 
 
diff --git a/mobile/tct-webuifw-tests01/tests/libs/qunit-1.11.0.js b/mobile/tct-webuifw-tests01/tests/libs/qunit-1.11.0.js
old mode 100755 (executable)
new mode 100644 (file)
index b5bc892..819558a
--- a/mobile/tct-webuifw-tests01/tests/libs/qunit-1.11.0.js
+++ b/mobile/tct-webuifw-tests01/tests/libs/qunit-1.11.0.js
@@ -1181,7 +1181,7 @@ QUnit.load = function() {
        }
 };
 
-addEvent( window, "DOMContentLoaded", QUnit.load );
+addEvent( window, "load", QUnit.load );
 
 // `onErrorFnPrev` initialized at top of scope
 // Preserve other handlers
Domain: Testing;