From: Thomas Kasulke <t.kasulke@linet-services.de>
Date: Tue, 31 Jul 2007 10:09:35 +0000 (+0000)
Subject: An v2.4.3 angepasst
X-Git-Tag: release-2.6.0beta1~543
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0205f9f4755b0604fff7af2187b90e95d675fa98;p=kivitendo-erp.git

An v2.4.3 angepasst
---

diff --git a/t/selenium/AllTests.t b/t/selenium/AllTests.t
index 6c161f6c1..f309231e2 100644
--- a/t/selenium/AllTests.t
+++ b/t/selenium/AllTests.t
@@ -77,8 +77,9 @@
   ok(defined $lxtest->{dbuser}, "found dbuser in config");
   ok(defined $lxtest->{dbpasswd}, "found dbpasswd in config");
 
-  $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter";
-
+  $lxtest->{lxadmin_url} = $lxtest->{lxbaseurl} . "admin.pl";
+  $lxtest->{lxadmin_with_get} = $lxtest->{lxadmin_url} . "?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter";
+  $lxtest->{lxadmin} = $lxtest->{lxadmin_url} . "?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter";
 
 
 
diff --git a/t/selenium/testscripts/001CreateTestDatabase.t b/t/selenium/testscripts/001CreateTestDatabase.t
index cf0c2f6de..4e9decba4 100644
--- a/t/selenium/testscripts/001CreateTestDatabase.t
+++ b/t/selenium/testscripts/001CreateTestDatabase.t
@@ -1,7 +1,15 @@
 ### Create Database
 
 $sel->open_ok($lxtest->{lxadmin});
-$sel->title_is("Lx-Office ERP Administration -");
+#$sel->title_is("Lx-Office ERP Administration -");
+#
+if($sel->get_title() eq "") {
+  $sel->open_ok($lxtest->{lxadmin_url});
+  $sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Anmeldung\")]");
+  $sel->wait_for_page_to_load_ok($lxtest->{timeout});
+}
+
+$sel->title_is("Lx-Office ERP ".$lxtest->{version}." Administration -");
 
 diag('Lock the system');
 $sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
@@ -14,7 +22,6 @@ $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->title_is("Lx-Office ERP / Datenbankadministration -");
 $sel->type_ok("dbuser", $lxtest->{dbuser});
 $sel->type_ok("dbpasswd", $lxtest->{dbpasswd});
-$sel->type_ok("dbuser", $lxtest->{dbuser});
 $sel->type_ok("dbhost", $lxtest->{dbhost});
 $sel->type_ok("dbport", $lxtest->{dbport});
 $sel->type_ok("dbdefault", $lxtest->{dbdefault});
diff --git a/t/selenium/testscripts/002CreateTestUser.t b/t/selenium/testscripts/002CreateTestUser.t
index aaf51d439..9ea21bb10 100644
--- a/t/selenium/testscripts/002CreateTestUser.t
+++ b/t/selenium/testscripts/002CreateTestUser.t
@@ -16,17 +16,17 @@ $sel->type_ok("fax", "1111");
 $sel->type_ok("company", "Sel-enium");
 $sel->type_ok("signature", "Selenium Testuser\nTestfirma");
 $sel->type_ok("address", "Testfirma");
-$sel->type_ok("steuernummer", "111-222-333-444");
+$sel->type_ok("taxnumber", "111-222-333-444");
 $sel->type_ok("co_ustid", "1234567");
 $sel->type_ok("duns", "0987654321");
-$sel->click_ok("dbdriver");
+#$sel->click_ok("dbdriver");
 $sel->type_ok("newtemplates", "seleniumtestuser");
 $sel->click_ok("menustyle");
-$sel->type_ok("Pg_dbhost", $lxtest->{dbhost});
-$sel->type_ok("Pg_dbname", $lxtest->{db});
-$sel->type_ok("Pg_dbport", $lxtest->{dbport});
-$sel->type_ok("Pg_dbuser", $lxtest->{dbuser});
-$sel->type_ok("Pg_dbpasswd", $lxtest->{dbpasswd});
+$sel->type_ok("dbhost", $lxtest->{dbhost});
+$sel->type_ok("dbname", $lxtest->{db});
+$sel->type_ok("dbport", $lxtest->{dbport});
+$sel->type_ok("dbuser", $lxtest->{dbuser});
+$sel->type_ok("dbpasswd", $lxtest->{dbpasswd});
 $sel->click_ok("action");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->title_is("Lx-Office ERP Administration -");
diff --git a/t/selenium/testscripts/005UpdateDatabase.t b/t/selenium/testscripts/005UpdateDatabase.t
index 53a2e792a..49aeac404 100644
--- a/t/selenium/testscripts/005UpdateDatabase.t
+++ b/t/selenium/testscripts/005UpdateDatabase.t
@@ -51,7 +51,7 @@ for (my $i=0; $i <= $count; $i++){
 }
 
 #$sel->click_ok("//input[\@value=\"$lxtest->{db}\"]");
-$sel->check_ok("//input[\@name=\"db$lxtest->{db}\"]");
+#$sel->check_ok("//input[\@name=\"db$lxtest->{db}\"]");
 $sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
 $sel->title_like( qr/Lx-Office ERP Datenbankadministration/ );