RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix several functional tests due to problems with accept button in resource allocation pop-up

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-11-18 17:47:47 +01:00
parent 866a52e1e9
commit 514de41fa3
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/functional-tests/resources/machines_test.sah
View file

@ -133,7 +133,7 @@ function machineAssignProjectForm($machine){
_click(_cell($machine)); _click(_cell($machine));
_click(_cell("Add")); _click(_cell("Add"));
_setValue(_textbox(0, _near(_span("Sum of all rows"))), "1"); _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")); _assertExists(_div("box standard-task assigned"));
_log("Task assigned", "custom1"); _log("Task assigned", "custom1");
_click(_image("ico_save.png")); _click(_image("ico_save.png"));

2
scripts/functional-tests/resources/subcontracting_test.sah
View file

@ -52,7 +52,7 @@ function subcontractingTaskForSubcontractForm($company, $subProjectName){
_setValue(_textbox(0, _near(_span("Subcontract price"))), "6000"); _setValue(_textbox(0, _near(_span("Subcontract price"))), "6000");
_setValue(_textbox(0, _near(_span("Subcontracted code"))), $companyId); _setValue(_textbox(0, _near(_span("Subcontracted code"))), $companyId);
_click(_checkbox(0, _near(_span("Hours groups")))); _click(_checkbox(0, _near(_span("Hours groups"))));
_click(_cell("z-button-cm[39]")); _click(_row("Accept[2]"));
_click(_image("ico_save.png")); _click(_image("ico_save.png"));
_click(_cell("OK")); _click(_cell("OK"));
} }

2
scripts/functional-tests/resources/virtual_worker_test.sah
View file

@ -137,7 +137,7 @@ function virtualWorkerAssignProjectForm($workerName){
_click(_div($workerName)); _click(_div($workerName));
_click(_cell($workerName)); _click(_cell($workerName));
_click(_cell("Add")); _click(_cell("Add"));
_click(_cell("z-button-cm[40]")); _click(_row("Accept[2]"));
_assertExists(_div("box standard-task assigned")); _assertExists(_div("box standard-task assigned"));
_log("Task assigned", "custom1"); _log("Task assigned", "custom1");
_click(_image("ico_save.png")); _click(_image("ico_save.png"));

2
scripts/functional-tests/resources/worker_test.sah
View file

@ -149,7 +149,7 @@ function workerAssignProjectForm($workerName, $workerSurName){
_click(_div($workerSurName+", "+$workerName)); _click(_div($workerSurName+", "+$workerName));
_click(_cell($workerSurName+", "+$workerName)); _click(_cell($workerSurName+", "+$workerName));
_click(_cell("Add")); _click(_cell("Add"));
_click(_cell("z-button-cm[40]")); _click(_row("Accept[2]"));
_assertExists(_div("box standard-task assigned")); _assertExists(_div("box standard-task assigned"));
_log("Task assigned", "custom1"); _log("Task assigned", "custom1");
_click(_image("ico_save.png")); _click(_image("ico_save.png"));

4
scripts/functional-tests/scheduling/planning_criteria_test.sah
View file

@ -73,7 +73,7 @@ function planningAssignWorker($workerName){
_click(_div($workerName+", "+$workerName)); _click(_div($workerName+", "+$workerName));
_click(_cell($workerName+", "+$workerName)); _click(_cell($workerName+", "+$workerName));
_click(_cell("Add")); _click(_cell("Add"));
_click(_cell("z-button-cm[40]")); _click(_row("Accept[2]"));
planningCheckIncorrectWorkerValidation() planningCheckIncorrectWorkerValidation()
_log("try to assign calendar", "custom1"); _log("try to assign calendar", "custom1");
} }
@ -86,7 +86,7 @@ function planningAssignCriterion($criterion){
_click(_div($criterion+" ( "+$criterion+" )[1]")); _click(_div($criterion+" ( "+$criterion+" )[1]"));
_click(_cell($criterion+" ( "+$criterion+" )[1]")); _click(_cell($criterion+" ( "+$criterion+" )[1]"));
_click(_cell("Add")); _click(_cell("Add"));
_click(_cell("z-button-cm[40]")); _click(_row("Accept[2]"));
planningCheckIncorrectCriterionValidation() planningCheckIncorrectCriterionValidation()
_log("Try to assign criterion", "custom1"); _log("Try to assign criterion", "custom1");
} }