You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/02/22 13:06:44 UTC
git commit: Fix the tests to run on all major browsers.
Updated Branches:
refs/heads/master bbb33b0c5 -> 9c42e1338
Fix the tests to run on all major browsers.
Opera expects '#' prefix for <input type="color"> values.
IE cannot start the tests at all with XML prolog and Apache licence header.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9c42e133
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9c42e133
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9c42e133
Branch: refs/heads/master
Commit: 9c42e1338e3df24e555273501f39a0640014bac0
Parents: bbb33b0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 22 13:05:32 2012 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 22 13:05:32 2012 +0100
----------------------------------------------------------------------
.../util/license/ApacheLicenceHeaderTest.java | 5 ++++
wicket-core/src/test/js/all.html | 19 +--------------
wicket-core/src/test/js/form.js | 8 +++---
3 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c42e133/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
index 5d98b41..d2328ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
@@ -39,10 +39,15 @@ public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
htmlIgnore.add("src/main/java/org/apache/wicket/markup/html/pages");
htmlIgnore.add("src/main/java/org/apache/wicket/ajax/res/js/jquery");
+ // the licence header breaks the tests in IE
+ htmlIgnore.add("src/test/js/all.html");
+
/*
* See NOTICE.txt
*/
xmlPrologIgnore.add("src/main/java/org/apache/wicket/util/diff");
+ // the xml prolog breaks the tests in IE
+ xmlPrologIgnore.add("src/test/js/all.html");
/*
* .css in test is very test specific and a license header would confuse and make it unclear
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c42e133/wicket-core/src/test/js/all.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/all.html b/wicket-core/src/test/js/all.html
index 15a5a80..2c437e2 100644
--- a/wicket-core/src/test/js/all.html
+++ b/wicket-core/src/test/js/all.html
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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
-
- http://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.
--->
<!DOCTYPE html>
<html>
<head>
@@ -139,7 +122,7 @@
<input type="number" id="numberInputId" name="numberInput" min="0" max="100" value="16"/>
- <input type="color" id="colorInputId" name="colorInput" value="123456"/>
+ <input type="color" id="colorInputId" name="colorInput" value="#123456"/>
<select id="multipleSelectId" name="multipleSelect" multiple="multiple">
<option value="0" selected="selected">zero</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9c42e133/wicket-core/src/test/js/form.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/form.js b/wicket-core/src/test/js/form.js
index 1700120..b5c9620 100644
--- a/wicket-core/src/test/js/form.js
+++ b/wicket-core/src/test/js/form.js
@@ -70,7 +70,7 @@ jQuery(document).ready(function() {
{ name: "searchInput", value: "wicket" },
{ name: "rangeInput", value: "67" },
{ name: "numberInput", value: "16" },
- { name: "colorInput", value: "123456" }
+ { name: "colorInput", value: "#123456" }
];
deepEqual(actual, expected);
});
@@ -119,7 +119,7 @@ jQuery(document).ready(function() {
{ name: "searchInput", value: "wicket" },
{ name: "rangeInput", value: "67" },
{ name: "numberInput", value: "16" },
- { name: "colorInput", value: "123456" },
+ { name: "colorInput", value: "#123456" },
{ name: "multipleSelect", value: "0" },
{ name: "multipleSelect", value: "2" },
{ name: "select", value: "0" },
@@ -155,7 +155,7 @@ jQuery(document).ready(function() {
});
queryString = jQuery.param(queryString, true);
- equal(queryString, 'textInput=textValue&textUTFInput=%D0%BD%D0%B5%D1%89%D0%BE+%D0%BD%D0%B0+%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8&checkBoxInput1=cbValue1&checkBoxInput3=cbValue3&radioInput=radioValue1&emailInput=m%40g.com&urlInput=http%3A%2F%2Fexample.com&searchInput=wicket&rangeInput=67&numberInput=16&colorInput=123456&multipleSelect=0&multipleSelect=2&select=0&textArea=some+text', 'Wicket.Form.serialize should serialize the whole form when an element is passed and the parent form should be searched');
+ equal(queryString, 'textInput=textValue&textUTFInput=%D0%BD%D0%B5%D1%89%D0%BE+%D0%BD%D0%B0+%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8&checkBoxInput1=cbValue1&checkBoxInput3=cbValue3&radioInput=radioValue1&emailInput=m%40g.com&urlInput=http%3A%2F%2Fexample.com&searchInput=wicket&rangeInput=67&numberInput=16&colorInput=%23123456&multipleSelect=0&multipleSelect=2&select=0&textArea=some+text', 'Wicket.Form.serialize should serialize the whole form when an element is passed and the parent form should be searched');
});
@@ -169,7 +169,7 @@ jQuery(document).ready(function() {
});
queryString = jQuery.param(queryString, true);
- equal(queryString, 'textInput=textValue&textUTFInput=%D0%BD%D0%B5%D1%89%D0%BE+%D0%BD%D0%B0+%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8&checkBoxInput1=cbValue1&checkBoxInput3=cbValue3&radioInput=radioValue1&emailInput=m%40g.com&urlInput=http%3A%2F%2Fexample.com&searchInput=wicket&rangeInput=67&numberInput=16&colorInput=123456&multipleSelect=0&multipleSelect=2&select=0&textArea=some+text', 'Wicket.Form.serialize should serialize the whole form when a the form itself is passed');
+ equal(queryString, 'textInput=textValue&textUTFInput=%D0%BD%D0%B5%D1%89%D0%BE+%D0%BD%D0%B0+%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8&checkBoxInput1=cbValue1&checkBoxInput3=cbValue3&radioInput=radioValue1&emailInput=m%40g.com&urlInput=http%3A%2F%2Fexample.com&searchInput=wicket&rangeInput=67&numberInput=16&colorInput=%23123456&multipleSelect=0&multipleSelect=2&select=0&textArea=some+text', 'Wicket.Form.serialize should serialize the whole form when a the form itself is passed');
});
});