[Pkg-javascript-commits] [dojo] 41/149: Various test cleanup:
David Prévot
taffit at moszumanska.debian.org
Sat Feb 27 03:13:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository dojo.
commit 116efa6303e2ce90bba7da872021cbcfd0f5ed0c
Author: Bill Keese <bill at dojotoolkit.org>
Date: Wed Feb 18 17:58:08 2015 +0900
Various test cleanup:
* Don't assert() just because tests haven't been converted from DOH.
* Remove trailing whitespace.
* Remove unneeded listing of dijit and dojox packages.
Refs #18427.
---
tests/changes.diff | 22 +++++++++++-----------
.../functional/_base/loader/hostenv_webworkers.js | 2 +-
tests/functional/dnd.js | 2 +-
.../functional/parser/parseOnLoadAutoRequire.html | 2 --
.../parser/parseOnLoadDeclarativeRequire.html | 2 --
tests/functional/parser/parser-args.html | 4 +---
tests/functional/parser/parserAsync.html | 2 --
.../window/iframe_content/scrollTemplate.html | 20 ++++++++++----------
tests/functional/window/viewport.html | 2 +-
tests/support/prerun.bat | 2 +-
10 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/tests/changes.diff b/tests/changes.diff
index 3728d9c..d71c67f 100644
--- a/tests/changes.diff
+++ b/tests/changes.diff
@@ -5,7 +5,7 @@ index 4f66fa8..30ef027 100644
@@ -1,10 +1,6 @@
This file lists tests that need to be implemented or expanded. See ticket #3121
for changes related to things listed here.
-
+
-Tests to add:
--------------
- * add tests for dojo.place()
@@ -18,7 +18,7 @@ index 02ce9ad..d774bc3 100644
--- a/tests/_base/html.html
+++ b/tests/_base/html.html
@@ -43,7 +43,7 @@
-
+
doh.register("t",
[
- "doh.is(null, dojo.byId('nonExistantId'));",
@@ -45,11 +45,11 @@ index 02ce9ad..d774bc3 100644
+*/
]
);
-
+
@@ -915,6 +928,13 @@
><param name="background" value="transparent"
/></object>
-
+
+ <!-- Test that empty doesn't disconnect grandchildren from children -->
+ <div id="emptyParent">
+ <div id="emptyChild">
@@ -1312,7 +1312,7 @@ index 86849e4..e36aa4c 100644
+ doh.t(rowWidth > 0, "width: " + rowWidth);
}
]);
-
+
@@ -39,5 +44,6 @@
</head>
<body>
@@ -1326,14 +1326,14 @@ index 592f1ad..f65a9b2 100644
+++ b/tests/query/query.html
@@ -12,8 +12,8 @@
var selector = specified ? specified[0].split("=")[1] : "acme";
-
+
require(["doh", "dojo/_base/array", "dojo/dom", "dojo/request/iframe",
- "dojo/query!"+selector, "dojo/NodeList", "dojo/sniff", "dojo/domReady!"],
- function(doh, array, dom, iframe, dq, NodeList, has){
+ "dojo/query!"+selector, "dojo/NodeList", "dojo/sniff", "dojo/dom-construct", "dojo/domReady!"],
+ function(doh, array, dom, iframe, dq, NodeList, has, domConstruct){
query = dq; // make a global
-
+
function createDocument(xml){
@@ -236,6 +236,21 @@
var i = query("div");
@@ -1356,7 +1356,7 @@ index 592f1ad..f65a9b2 100644
+ doh.is(0, query("#b", documentFragment2).length);
}
]);
-
+
diff --git a/tests/query/queryQuirks.html b/tests/query/queryQuirks.html
index 8612e35..749249d 100644
--- a/tests/query/queryQuirks.html
@@ -1364,13 +1364,13 @@ index 8612e35..749249d 100644
@@ -10,8 +10,8 @@
var specified = window.location.search.substr(1).match(/selector=(.*)/);
var selector = specified ? specified[0].split("=")[1] : "acme";
-
+
- require(["dojo", "doh", "dojo/query!"+selector, "dojo/sniff", "dojo/io/iframe", "dojo/domReady!"],
- function(dojo, doh, dq, has){
+ require(["dojo", "doh", "dojo/query!"+selector, "dojo/sniff", "dojo/dom-construct", "dojo/io/iframe", "dojo/domReady!"],
+ function(dojo, doh, dq, has, domConstruct){
query = dq; // make a global
-
+
function createDocument(xml){
@@ -219,6 +219,27 @@
var i = query("div");
@@ -1399,4 +1399,4 @@ index 8612e35..749249d 100644
+ doh.is(0, query("#b", documentFragment2).length);
}
]);
-
+
diff --git a/tests/functional/_base/loader/hostenv_webworkers.js b/tests/functional/_base/loader/hostenv_webworkers.js
index 7c1a5ad..0cbb3ce 100644
--- a/tests/functional/_base/loader/hostenv_webworkers.js
+++ b/tests/functional/_base/loader/hostenv_webworkers.js
@@ -6,7 +6,7 @@ define([
name: 'dojo/_base/loader/hostenv_webworkers',
'TODO: convert tests': function () {
- assert.fail();
+ return this.skip("test not converted from DOH yet");
}
});
});
diff --git a/tests/functional/dnd.js b/tests/functional/dnd.js
index 6d9f2ba..82e8071 100644
--- a/tests/functional/dnd.js
+++ b/tests/functional/dnd.js
@@ -6,7 +6,7 @@ define([
name: 'dojo/dnd',
'TODO: convert tests': function () {
- assert.fail();
+ return this.skip("test not converted from DOH yet");
}
});
});
diff --git a/tests/functional/parser/parseOnLoadAutoRequire.html b/tests/functional/parser/parseOnLoadAutoRequire.html
index 34ee377..a876932 100644
--- a/tests/functional/parser/parseOnLoadAutoRequire.html
+++ b/tests/functional/parser/parseOnLoadAutoRequire.html
@@ -12,8 +12,6 @@
isDebug: true,
baseUrl: '.',
packages: [
- { name: 'dijit', location: 'dijit' },
- { name: 'dojox', location: 'dojox' },
{ name: 'dojo', location: '../../../node_modules/dojo' },
{ name: 'testing', location: '../../../' }
],
diff --git a/tests/functional/parser/parseOnLoadDeclarativeRequire.html b/tests/functional/parser/parseOnLoadDeclarativeRequire.html
index 40590ef..02d8540 100644
--- a/tests/functional/parser/parseOnLoadDeclarativeRequire.html
+++ b/tests/functional/parser/parseOnLoadDeclarativeRequire.html
@@ -15,8 +15,6 @@
stripStrict: true,
baseUrl: '.',
packages: [
- { name: 'dijit', location: 'dijit' },
- { name: 'dojox', location: 'dojox' },
{ name: 'dojo', location: '../../../' }
],
callback: function () {
diff --git a/tests/functional/parser/parser-args.html b/tests/functional/parser/parser-args.html
index 5add1f0..9b1a6a1 100644
--- a/tests/functional/parser/parser-args.html
+++ b/tests/functional/parser/parser-args.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Parser args Unit Test</title>
- <style type="text/css">
+ <style type="text/css">
@import "../../../resources/dojo.css";
</style>
<script>
@@ -12,8 +12,6 @@
isDebug: true,
baseUrl: '.',
packages: [
- { name: 'dijit', location: 'dijit' },
- { name: 'dojox', location: 'dojox' },
{ name: 'dojo', location: '../../../node_modules/dojo' },
{ name: 'testing', location: '../../../' }
],
diff --git a/tests/functional/parser/parserAsync.html b/tests/functional/parser/parserAsync.html
index 511b35b..1ce1187 100644
--- a/tests/functional/parser/parserAsync.html
+++ b/tests/functional/parser/parserAsync.html
@@ -12,8 +12,6 @@
isDebug: true,
baseUrl: '.',
packages: [
- { name: 'dijit', location: 'dijit' },
- { name: 'dojox', location: 'dojox' },
{ name: 'dojo', location: '../../../' }
]
};
diff --git a/tests/functional/window/iframe_content/scrollTemplate.html b/tests/functional/window/iframe_content/scrollTemplate.html
index a224fa4..ff0e5ab 100644
--- a/tests/functional/window/iframe_content/scrollTemplate.html
+++ b/tests/functional/window/iframe_content/scrollTemplate.html
@@ -3,34 +3,34 @@ ${docType}
<!-- Each layout scenario will generate a document using this template. -->
<head>
<style>
- * {
+ * {
border:0px solid white;
padding:0px;
margin:0px;
font-style:normal;
font-family:monospace;
font-size:0px;
- line-height:normal;
+ line-height:normal;
}
- input {
+ input {
display:block;
background-color:red;
font-size:0px;
line-height:0px;
overflow:hidden;
width:20px;
- height:20px;
+ height:20px;
}
- ul {
+ ul {
list-style-type: none;
line-height:0px;
width:45px;
- overflow:auto;
+ overflow:auto;
}
- li {
+ li {
list-style-type: none;
line-height:20px;
overflow:visible;
@@ -38,14 +38,14 @@ ${docType}
max-height:20px;
height:20px;
width:20px;
- float:left;
+ float:left;
}
- hr {
+ hr {
width:120px;
height:1px;
visibility:hidden;
- display:block;
+ display:block;
}
${styles}
diff --git a/tests/functional/window/viewport.html b/tests/functional/window/viewport.html
index 836f1ce..629a77e 100644
--- a/tests/functional/window/viewport.html
+++ b/tests/functional/window/viewport.html
@@ -25,7 +25,7 @@
dom.byId('documentHeight').value = d.h;
dom.byId('documentWidth').value = d.w;
}
-
+
window.addText = function () {
dom.byId('results').innerHTML += 'Adding text...<br><br>';
var text = [];
diff --git a/tests/support/prerun.bat b/tests/support/prerun.bat
index b0c9729..faec27f 100644
--- a/tests/support/prerun.bat
+++ b/tests/support/prerun.bat
@@ -1,5 +1,5 @@
@ECHO OFF
-REM The following command updates the local intranet, trusted sites, and
+REM The following command updates the local intranet, trusted sites, and
REM internet zones to disable cross-domain requests. By default, SauceLabs
REM enables the option for these zones.
reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1" /v 1406 /t REG_DWORD /d 3 /f
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git
More information about the Pkg-javascript-commits
mailing list