From 514de41fa3a9c34b40f70d73e178dc9c20ce66b3 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 18 Nov 2011 17:47:47 +0100
Subject: [PATCH] Fix several functional tests due to problems with accept
 button in resource allocation pop-up

FEA: ItEr75S04BugFixing
---
 scripts/functional-tests/resources/machines_test.sah          | 2 +-
 scripts/functional-tests/resources/subcontracting_test.sah    | 2 +-
 scripts/functional-tests/resources/virtual_worker_test.sah    | 2 +-
 scripts/functional-tests/resources/worker_test.sah            | 2 +-
 .../functional-tests/scheduling/planning_criteria_test.sah    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/functional-tests/resources/machines_test.sah b/scripts/functional-tests/resources/machines_test.sah
index 4a675c77d..449897691 100644
--- a/scripts/functional-tests/resources/machines_test.sah
+++ b/scripts/functional-tests/resources/machines_test.sah
@@ -133,7 +133,7 @@ function machineAssignProjectForm($machine){
     _click(_cell($machine));
     _click(_cell("Add"));
     _setValue(_textbox(0, _near(_span("Sum of all rows"))), "1");
-    _click(_cell("z-button-cm[40]"));
+    _click(_row("Accept[2]"));
     _assertExists(_div("box standard-task assigned"));
     _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
diff --git a/scripts/functional-tests/resources/subcontracting_test.sah b/scripts/functional-tests/resources/subcontracting_test.sah
index 6efa33e09..88855df62 100644
--- a/scripts/functional-tests/resources/subcontracting_test.sah
+++ b/scripts/functional-tests/resources/subcontracting_test.sah
@@ -52,7 +52,7 @@ function subcontractingTaskForSubcontractForm($company, $subProjectName){
     _setValue(_textbox(0, _near(_span("Subcontract price"))), "6000");
     _setValue(_textbox(0, _near(_span("Subcontracted code"))), $companyId);
     _click(_checkbox(0, _near(_span("Hours groups"))));
-    _click(_cell("z-button-cm[39]"));
+    _click(_row("Accept[2]"));
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
 }
diff --git a/scripts/functional-tests/resources/virtual_worker_test.sah b/scripts/functional-tests/resources/virtual_worker_test.sah
index 7c0aa67e8..769d9e630 100644
--- a/scripts/functional-tests/resources/virtual_worker_test.sah
+++ b/scripts/functional-tests/resources/virtual_worker_test.sah
@@ -137,7 +137,7 @@ function virtualWorkerAssignProjectForm($workerName){
     _click(_div($workerName));
     _click(_cell($workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[40]"));
+    _click(_row("Accept[2]"));
     _assertExists(_div("box standard-task assigned"));
     _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
diff --git a/scripts/functional-tests/resources/worker_test.sah b/scripts/functional-tests/resources/worker_test.sah
index 9fa5ffc7b..41ad9dcc0 100644
--- a/scripts/functional-tests/resources/worker_test.sah
+++ b/scripts/functional-tests/resources/worker_test.sah
@@ -149,7 +149,7 @@ function workerAssignProjectForm($workerName, $workerSurName){
     _click(_div($workerSurName+", "+$workerName));
     _click(_cell($workerSurName+", "+$workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[40]"));
+    _click(_row("Accept[2]"));
     _assertExists(_div("box standard-task assigned"));
     _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
diff --git a/scripts/functional-tests/scheduling/planning_criteria_test.sah b/scripts/functional-tests/scheduling/planning_criteria_test.sah
index 81ec6b6e1..2c4d5b446 100644
--- a/scripts/functional-tests/scheduling/planning_criteria_test.sah
+++ b/scripts/functional-tests/scheduling/planning_criteria_test.sah
@@ -73,7 +73,7 @@ function planningAssignWorker($workerName){
     _click(_div($workerName+", "+$workerName));
     _click(_cell($workerName+", "+$workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[40]"));
+    _click(_row("Accept[2]"));
     planningCheckIncorrectWorkerValidation()
     _log("try to assign calendar", "custom1");
 }
@@ -86,7 +86,7 @@ function planningAssignCriterion($criterion){
     _click(_div($criterion+" ( "+$criterion+" )[1]"));
     _click(_cell($criterion+" ( "+$criterion+" )[1]"));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[40]"));
+    _click(_row("Accept[2]"));
     planningCheckIncorrectCriterionValidation()
     _log("Try to assign criterion", "custom1");
 }