From 988dc6f9746bb65a11911e45fe0c2eaa1a327958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20de=20la=20Cigo=C3=B1a=20N=C3=B3vo?=
 =?UTF-8?q?a?= <pcigonha@igalia.com>
Date: Tue, 6 Sep 2011 13:31:30 +0200
Subject: [PATCH] Do some changes in files which include materials tests
 because they didn't work correctly after a bug fixing

FEA: ItEr75S21AdministrationTests
---
 .../administration-management/all_administration_test.suite   | 2 +-
 .../administration-management/configuration_test.sah          | 4 ++--
 .../administration-management/material_test.sah               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/functional-tests/administration-management/all_administration_test.suite b/scripts/functional-tests/administration-management/all_administration_test.suite
index 3cde12678..0366d700f 100644
--- a/scripts/functional-tests/administration-management/all_administration_test.suite
+++ b/scripts/functional-tests/administration-management/all_administration_test.suite
@@ -1,5 +1,5 @@
-configuration_test.sah
 calendar_test.sah
 material_test.sah
 quality_forms_test.sah
 cost_categories_test.sah
+configuration_test.sah
diff --git a/scripts/functional-tests/administration-management/configuration_test.sah b/scripts/functional-tests/administration-management/configuration_test.sah
index 6b8cc4cd3..55ed18137 100644
--- a/scripts/functional-tests/administration-management/configuration_test.sah
+++ b/scripts/functional-tests/administration-management/configuration_test.sah
@@ -116,8 +116,8 @@ function configCheckMaterial(){
     var $label;
     _click(_link("Materials"));
     _click(_span("z-dottree-ico z-dottree-firstspacer"));
-    _click(_cell("z-button-cm", _near(_div("List of materials for category: Imported materials without category"))));
-    _set($label, _textbox(0, _near(_div("List of materials for category: Imported materials without category"))).id);
+    _click(_cell("z-button-cm", _near(_span("List of materials for category: Imported materials without category"))));
+    _set($label, _textbox(0, _near(_span("List of materials for category: Imported materials without category"))).id);
     _set($code, _textbox(0, _in(_cell(_parentTable(_textbox($label)),1,0))).value);
     if ($code == ""){
     _log("Material code is empty", "custom1");
diff --git a/scripts/functional-tests/administration-management/material_test.sah b/scripts/functional-tests/administration-management/material_test.sah
index 76ee62368..1c4942668 100644
--- a/scripts/functional-tests/administration-management/material_test.sah
+++ b/scripts/functional-tests/administration-management/material_test.sah
@@ -51,7 +51,7 @@ function materialEdit($oldDescription, $newDescription, $cell) {
     var $table;
     var $label;
     _click(_link("Materials"));
-    _set($label, _textbox(0, _near(_div("List of materials for all categories (select one to filter)"))).id);
+    _set($label, _textbox(0, _near(_span("List of materials for all categories (select one to filter)"))).id);
     _set($nrows, _parentTable(_textbox($label)).rows.length);
     for (var $i=1; $i<$nrows; $i++){
     if (_condition(_textbox(0, _in(_cell(_parentTable(_textbox($label)),$i,1))).value == $oldDescription)){
@@ -69,7 +69,7 @@ function materialDelete($materialNewName, $numer){
     var $table;
     var $label;
     _click(_link("Materials"));
-    _set($label,_textbox(0, _near(_div("List of materials for all categories (select one to filter)"))).id);
+    _set($label,_textbox(0, _near(_span("List of materials for all categories (select one to filter)"))).id);
     _set($nrows,_parentTable(_textbox($label)).rows.length);
     for (var $i=1; $i<$nrows; $i++){
     if (_condition(_textbox(0, _in(_cell(_parentTable(_textbox($label)),$i,1))).value == $materialNewName)){