Commit 0a49a181 authored by Jérome Perrin's avatar Jérome Perrin

assertFloat was working when number had only one space (1 234 but not 1 234 567).



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13326 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 18f7958b
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts70003122.2</string> </value> <value> <string>ts73479596.95</string> </value>
</item> </item>
<item> <item>
<key> <string>__ac_local_roles__</string> </key> <key> <string>__ac_local_roles__</string> </key>
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
Selenium.prototype.assertFloat = function(locator, text) {\n Selenium.prototype.assertFloat = function(locator, text) {\n
var actualValueText = getText(this.page().findElement(locator));\n var actualValueText = getText(this.page().findElement(locator));\n
var actualValue = parseFloat(actualValueText\n var actualValue = parseFloat(actualValueText\n
.replace(/ /, "").replace(/&nbsp;/, ""));\n .replace(/ /g, "").replace(/&nbsp;/g, ""));\n
var expectedValue = parseFloat(text.replace(/ /, "").replace(/&nbsp;/, ""));\n var expectedValue = parseFloat(text.replace(/ /g, "").replace(/&nbsp;/g, ""));\n
\n \n
if (isNaN(actualValue)) {\n if (isNaN(actualValue)) {\n
Assert.fail("Actual value "+ actualValueText +\n Assert.fail("Actual value "+ actualValueText +\n
...@@ -69,8 +69,8 @@ Selenium.prototype.assertFloat = function(locator, text) {\n ...@@ -69,8 +69,8 @@ Selenium.prototype.assertFloat = function(locator, text) {\n
Selenium.prototype.assertFloatValue = function(locator, text) {\n Selenium.prototype.assertFloatValue = function(locator, text) {\n
var actualValueText = getInputValue(this.page().findElement(locator));\n var actualValueText = getInputValue(this.page().findElement(locator));\n
var actualValue = parseFloat(actualValueText\n var actualValue = parseFloat(actualValueText\n
.replace(/ /, "").replace(/&nbsp;/, ""));\n .replace(/ /g, "").replace(/&nbsp;/g, ""));\n
var expectedValue = parseFloat(text.replace(/ /, "").replace(/&nbsp;/, ""));\n var expectedValue = parseFloat(text.replace(/ /g, "").replace(/&nbsp;/g, ""));\n
\n \n
if (isNaN(actualValue)) {\n if (isNaN(actualValue)) {\n
Assert.fail("Actual value "+ actualValueText +\n Assert.fail("Actual value "+ actualValueText +\n
...@@ -99,7 +99,7 @@ Selenium.prototype.assertPortalStatusMessage = function(text) {\n ...@@ -99,7 +99,7 @@ Selenium.prototype.assertPortalStatusMessage = function(text) {\n
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <long>1671</long> </value> <value> <int>1679</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
177 179
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment