Fortführung der Struturierung und hinzufügen von Systemtests, sowie globaler Login...

diff --git a/t/lx-office.t b/t/lx-office.t
index 84ea4b36040eb15c48d948912b511cf6357386c4..6925930b6eaba525f8c2631394a6c8c95e98e705 100644 (file)
--- a/t/lx-office.t
+++ b/t/lx-office.t
@@ -162,5 +162,5 @@
     }
     printf "\n\t\%s\n\t%s\n","Be ensure, that usage is promitted by login and db status!","\xAF" x 58;
   }
     }
     printf "\n\t\%s\n\t%s\n","Be ensure, that usage is promitted by login and db status!","\xAF" x 58;
   }

-
+unlink("/tmp/lxtest-temp.conf");

 exit 1;
\ No newline at end of file
 exit 1;
\ No newline at end of file

diff --git a/t/selenium/AllTests.t b/t/selenium/AllTests.t
index c3c5265b7f70c29557c90620c6ed7d76856511d4..a6cca0704f518f10b845ec5d561cde6743099c33 100644 (file)
--- a/t/selenium/AllTests.t
+++ b/t/selenium/AllTests.t
@@ -39,7 +39,6 @@
   use Test::More qw(no_plan);
   use IO::Socket;
 
   use Test::More qw(no_plan);
   use IO::Socket;
 

-

   if(-f "/tmp/lxtest-temp.conf") {
     eval { require('/tmp/lxtest-temp.conf'); };
   }
   if(-f "/tmp/lxtest-temp.conf") {
     eval { require('/tmp/lxtest-temp.conf'); };
   }


@@ -74,9 +73,9 @@
 
 
     $lxtest->{test_id} = time; # create individual ids by unixtime
 
 
     $lxtest->{test_id} = time; # create individual ids by unixtime

-    $lxtest->{testuserlogin}   = $lxtest->{testlogin} . $lxtest->{test_id};
-    $lxtest->{testuserpasswd}  = $lxtest->{test_id};
-    $lxtest->{db}              = $lxtest->{db} . $lxtest->{test_id};
+    $lxtest->{testuserlogin}   = $lxtest->{testlogin} . $lxtest->{test_id} if(!$lxtest->{testuserlogin});
+    $lxtest->{testuserpasswd}  = $lxtest->{test_id} if(!$lxtest->{testuserpasswd});
+    $lxtest->{db}              = $lxtest->{db} . $lxtest->{test_id} if(!($lxtest->{db} =~ /^seleniumtestdatabase[0-9]{10}$/));

 
     ok(defined $lxtest->{rpw}, "Get root password");
   
 
     ok(defined $lxtest->{rpw}, "Get root password");
   


@@ -116,6 +115,9 @@
       }
       closedir(SCRIPTS);
     }
       }
       closedir(SCRIPTS);
     }

+    if($!) {
+      @! = ("Test fehlgeschlagen!");
+    }

     $sel->stop();
   }
   
     $sel->stop();
   }
   

diff --git a/t/selenium/testscripts/accounting/begin/A000Login.t b/t/selenium/testscripts/accounting/begin/A000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/accounting/begin/A000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/accounting/begin/A999Logout.t b/t/selenium/testscripts/accounting/begin/A999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/accounting/begin/A999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/accounting/end/A000Login.t b/t/selenium/testscripts/accounting/end/A000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/accounting/end/A000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/accounting/end/A999Logout.t b/t/selenium/testscripts/accounting/end/A999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/accounting/end/A999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t b/t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t
new file mode 100644 (file)
index 0000000..c45e1bc
--- /dev/null
+++ b/t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t
@@ -0,0 +1,43 @@
+### Create Database
+
+$sel->open_ok($lxtest->{lxadmin});
+
+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 Administration -");
+
+diag('Lock the system');
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+
+$sel->title_is("Lx-Office ERP Administration -");
+diag("Create test database '$lxtest->{db}'");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
+$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("dbhost", $lxtest->{dbhost});
+$sel->type_ok("dbport", $lxtest->{dbport});
+$sel->type_ok("dbdefault", $lxtest->{dbdefault});
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank anlegen\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank anlegen -");
+$sel->type_ok("db", $lxtest->{db});
+$sel->select_ok("encoding", "label=ISO 8859-1");
+$sel->select_ok("chart", "label=Germany-DATEV-SKR03EU");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
+$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank anlegen -");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration -");
+
+diag('Unlock the system');
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration -");

diff --git a/t/selenium/testscripts/administration/begin/A002CreateTestUser.t b/t/selenium/testscripts/administration/begin/A002CreateTestUser.t
new file mode 100644 (file)
index 0000000..c9bbee6
--- /dev/null
+++ b/t/selenium/testscripts/administration/begin/A002CreateTestUser.t
@@ -0,0 +1,33 @@
+
+### Create new user
+diag("Create test user '$lxtest->{testuserlogin}'");
+$sel->open_ok($lxtest->{lxadmin});
+
+$sel->title_is("Lx-Office ERP Administration -");
+$sel->click_ok("action");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration / Benutzer erfassen -");
+$sel->type_ok("login", $lxtest->{testuserlogin});
+$sel->type_ok("password", $lxtest->{testuserpasswd});
+$sel->type_ok("name", "Selenium");
+$sel->type_ok("email", "selenium\@lx-office.org");
+$sel->type_ok("signature", "Selenium Testuser");
+$sel->type_ok("tel", "0000");
+$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("taxnumber", "111-222-333-444");
+$sel->type_ok("co_ustid", "1234567");
+$sel->type_ok("duns", "0987654321");
+#$sel->click_ok("dbdriver");
+$sel->type_ok("newtemplates", "seleniumtestuser");
+$sel->click_ok("menustyle");
+$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/administration/begin/A003UpdateDatabase.t b/t/selenium/testscripts/administration/begin/A003UpdateDatabase.t
new file mode 100644 (file)
index 0000000..af2016c
--- /dev/null
+++ b/t/selenium/testscripts/administration/begin/A003UpdateDatabase.t
@@ -0,0 +1,63 @@
+### Update Database
+
+# NOTEST: some preruns for initializing missing parameters
+$sel->open($lxtest->{lxadmin});
+
+$sel->click("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
+$sel->wait_for_page_to_load($lxtest->{timeout});
+$sel->type("dbuser", $lxtest->{dbuser});
+$sel->type("dbpasswd", $lxtest->{dbpasswd});
+$sel->type("dbuser", $lxtest->{dbuser});
+$sel->type("dbhost", $lxtest->{dbhost});
+$sel->type("dbport", $lxtest->{dbport});
+$sel->type("dbdefault", $lxtest->{dbdefault});
+$sel->click("//input[(\@name=\"action\") and (\@value=\"Datenbank aktualisieren\")]");
+$sel->wait_for_page_to_load($lxtest->{timeoutlong});
+$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank aktualisieren -");
+
+my $count =0;
+
+while (){ # count the number of radiobuttons
+  eval {  $sel->is_checked("//input[(\@id=\"$count\")]"); };
+    if ( $@ ) { $count--; last; }; 
+  $count++;
+}
+
+#TEST: Now run the Tests
+
+$sel->open_ok($lxtest->{lxadmin});
+$sel->title_is("Lx-Office ERP Administration -");
+
+#diag('Lock the system');
+#$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
+#$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+
+diag('Update the database');
+
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
+$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});
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank aktualisieren\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
+$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank aktualisieren -");
+
+for (my $i=0; $i <= $count; $i++){
+  $sel->uncheck_ok("//input[(\@id=\"$i\")]");
+}
+
+#$sel->click_ok("//input[\@value=\"$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/ );
+
+#diag('Unlock the system');
+#$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
+#$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+#$sel->title_is("Lx-Office ERP Administration -");
+1;

diff --git a/t/selenium/testscripts/administration/begin/B001CreateTestDatabase.t b/t/selenium/testscripts/administration/begin/B001CreateTestDatabase.t
deleted file mode 100644 (file)
index 50ac476..0000000
--- a/t/selenium/testscripts/administration/begin/B001CreateTestDatabase.t
+++ /dev/null
@@ -1,44 +0,0 @@
-### Create Database
-
-$sel->open_ok($lxtest->{lxadmin});
-#$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 Administration -");
-
-diag('Lock the system');
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-
-diag("Create test database '$lxtest->{db}'");
-$sel->title_is("Lx-Office ERP Administration -");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
-$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("dbhost", $lxtest->{dbhost});
-$sel->type_ok("dbport", $lxtest->{dbport});
-$sel->type_ok("dbdefault", $lxtest->{dbdefault});
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank anlegen\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank anlegen -");
-$sel->type_ok("db", $lxtest->{db});
-$sel->select_ok("encoding", "label=ISO 8859-1");
-$sel->select_ok("chart", "label=Germany-DATEV-SKR03EU");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
-$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank anlegen -");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration -");
-
-diag('Unlock the system');
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration -");

diff --git a/t/selenium/testscripts/administration/begin/B002CreateTestUser.t b/t/selenium/testscripts/administration/begin/B002CreateTestUser.t
deleted file mode 100644 (file)
index 9ea21bb..0000000
--- a/t/selenium/testscripts/administration/begin/B002CreateTestUser.t
+++ /dev/null
@@ -1,32 +0,0 @@
-
-### Create new user
-diag("Create test user '$lxtest->{testuserlogin}'");
-$sel->open_ok($lxtest->{lxadmin});
-$sel->title_is("Lx-Office ERP Administration -");
-$sel->click_ok("action");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration / Benutzer erfassen -");
-$sel->type_ok("login", $lxtest->{testuserlogin});
-$sel->type_ok("password", $lxtest->{testuserpasswd});
-$sel->type_ok("name", "Selenium");
-$sel->type_ok("email", "selenium\@lx-office.org");
-$sel->type_ok("signature", "Selenium Testuser");
-$sel->type_ok("tel", "0000");
-$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("taxnumber", "111-222-333-444");
-$sel->type_ok("co_ustid", "1234567");
-$sel->type_ok("duns", "0987654321");
-#$sel->click_ok("dbdriver");
-$sel->type_ok("newtemplates", "seleniumtestuser");
-$sel->click_ok("menustyle");
-$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/administration/begin/B003UpdateDatabase.t b/t/selenium/testscripts/administration/begin/B003UpdateDatabase.t
deleted file mode 100644 (file)
index 49aeac4..0000000
--- a/t/selenium/testscripts/administration/begin/B003UpdateDatabase.t
+++ /dev/null
@@ -1,62 +0,0 @@
-### Update Database
-
-# NOTEST: some preruns for initializing missing parameters
-$sel->open($lxtest->{lxadmin});
-$sel->click("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
-$sel->wait_for_page_to_load($lxtest->{timeout});
-$sel->type("dbuser", $lxtest->{dbuser});
-$sel->type("dbpasswd", $lxtest->{dbpasswd});
-$sel->type("dbuser", $lxtest->{dbuser});
-$sel->type("dbhost", $lxtest->{dbhost});
-$sel->type("dbport", $lxtest->{dbport});
-$sel->type("dbdefault", $lxtest->{dbdefault});
-$sel->click("//input[(\@name=\"action\") and (\@value=\"Datenbank aktualisieren\")]");
-$sel->wait_for_page_to_load($lxtest->{timeoutlong});
-$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank aktualisieren -");
-
-my $count =0;
-
-while (){ # count the number of radiobuttons
-  eval {  $sel->is_checked("//input[(\@id=\"$count\")]"); };
-    if ( $@ ) { $count--; last; }; 
-  $count++;
-}
-
-#TEST: Now run the Tests
-
-$sel->open_ok($lxtest->{lxadmin});
-$sel->title_is("Lx-Office ERP Administration -");
-
-#diag('Lock the system');
-#$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
-#$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-
-diag('Update the database');
-
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
-$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});
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank aktualisieren\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
-$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank aktualisieren -");
-
-for (my $i=0; $i <= $count; $i++){
-  $sel->uncheck_ok("//input[(\@id=\"$i\")]");
-}
-
-#$sel->click_ok("//input[\@value=\"$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/ );
-
-#diag('Unlock the system');
-#$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
-#$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-#$sel->title_is("Lx-Office ERP Administration -");
-

diff --git a/t/selenium/testscripts/administration/begin/B004Login.t b/t/selenium/testscripts/administration/begin/B004Login.t
deleted file mode 100644 (file)
index 3125c77..0000000
--- a/t/selenium/testscripts/administration/begin/B004Login.t
+++ /dev/null
@@ -1,21 +0,0 @@
-### Login
-
-diag("Login");
-
-$sel->open_ok($lxtest->{lxbaseurl}."/login.pl");
-
-$sel->wait_for_page_to_load_ok($lxtest->{timeout}); 
-$sel->title_is("Lx-Office Version ".$lxtest->{version});
-$sel->type_ok("login", $lxtest->{testuserlogin});
-$sel->type_ok("password", $lxtest->{testuserpasswd});
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Anmeldung\")]");
-
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-if($sel->title_is("Datenbankaktualisierung - Lx-Office Version 2.4.3 - -")) {
-  $sel->click_ok("//input[(\@name=\"dummy\") and (\@value=\"Weiter\")]");
-  $sel->wait_for_page_to_load_ok($lxtest->{timeoutlong}); 
-  $sel->click_ok("//input[(\@type=\"submit\") and (\@value=\"Weiter\")]");
-  $sel->wait_for_page_to_load_ok($lxtest->{timeout}); 
-}
-
-$sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});

diff --git a/t/selenium/testscripts/administration/end/A998DeleteTestUser.t b/t/selenium/testscripts/administration/end/A998DeleteTestUser.t
new file mode 100644 (file)
index 0000000..8fa1c5d
--- /dev/null
+++ b/t/selenium/testscripts/administration/end/A998DeleteTestUser.t
@@ -0,0 +1,10 @@
+### Delete user
+diag("Delete test user '$lxtest->{testuserlogin}'");
+$sel->open_ok($lxtest->{lxadmin});
+
+$sel->title_is("Lx-Office ERP Administration -");
+$sel->click_ok("link=$lxtest->{testuserlogin}");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration / Benutzerdaten bearbeiten -");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Löschen\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});

diff --git a/t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t b/t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t
new file mode 100644 (file)
index 0000000..6c8ce3f
--- /dev/null
+++ b/t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t
@@ -0,0 +1,34 @@
+
+$sel->open_ok($lxtest->{lxadmin});
+
+$sel->title_is("Lx-Office ERP Administration -");
+
+diag('Lock the system');
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
+diag("Delete test database '$lxtest->{db}'");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP / Datenbankadministration -");
+$sel->type_ok("dbhost", $lxtest->{dbhost});
+$sel->type_ok("dbport", $lxtest->{dbport});
+$sel->type_ok("dbuser", $lxtest->{dbuser});
+$sel->type_ok("dbpasswd", $lxtest->{dbpasswd});
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank löschen\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
+$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank löschen -");
+
+$sel->select_ok("db", "label=" . $lxtest->{db});
+
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->body_text_is("Lx-Office ERP Datenbankadministration / Datenbank löschen Die Datenbank $lxtest->{db} wurde erfolgreich gelöscht.");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration -");
+
+diag('Unlock the system');
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office ERP Administration -");
\ No newline at end of file

diff --git a/t/selenium/testscripts/administration/end/E997Logout.t b/t/selenium/testscripts/administration/end/E997Logout.t
deleted file mode 100644 (file)
index 3dd9c63..0000000
--- a/t/selenium/testscripts/administration/end/E997Logout.t
+++ /dev/null
@@ -1,8 +0,0 @@
-### Login
-
-diag("Logout");
-
-$sel->select_frame_ok("relative=up") if(!$sel->is_element_present_ok("//img"));
-$sel->click_ok("link=abmelden");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office Version ".$lxtest->{version});
\ No newline at end of file

diff --git a/t/selenium/testscripts/administration/end/E998DeleteTestUser.t b/t/selenium/testscripts/administration/end/E998DeleteTestUser.t
deleted file mode 100644 (file)
index f0c430e..0000000
--- a/t/selenium/testscripts/administration/end/E998DeleteTestUser.t
+++ /dev/null
@@ -1,9 +0,0 @@
-### Delete user
-diag("Delete test user '$lxtest->{testuserlogin}'");
-$sel->open_ok($lxtest->{lxadmin});
-$sel->title_is("Lx-Office ERP Administration -");
-$sel->click_ok("link=$lxtest->{testuserlogin}");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration / Benutzerdaten bearbeiten -");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Löschen\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});

diff --git a/t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t b/t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t
deleted file mode 100644 (file)
index 53ee427..0000000
--- a/t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$sel->open_ok($lxtest->{lxadmin});
-$sel->title_is("Lx-Office ERP Administration -");
-
-diag('Lock the system');
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System sperren\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbankadministration\")]");
-diag("Delete test database '$lxtest->{db}'");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP / Datenbankadministration -");
-$sel->type_ok("dbhost", $lxtest->{dbhost});
-$sel->type_ok("dbport", $lxtest->{dbport});
-$sel->type_ok("dbuser", $lxtest->{dbuser});
-$sel->type_ok("dbpasswd", $lxtest->{dbpasswd});
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Datenbank löschen\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeoutlong});
-$sel->title_is("Lx-Office ERP Datenbankadministration / Datenbank löschen -");
-
-$sel->select_ok("db", "label=" . $lxtest->{db});
-
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->body_text_is("Lx-Office ERP Datenbankadministration / Datenbank löschen Die Datenbank $lxtest->{db} wurde erfolgreich gelöscht.");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration -");
-
-diag('Unlock the system');
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"System entsperren\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->title_is("Lx-Office ERP Administration -");
\ No newline at end of file

diff --git a/t/selenium/testscripts/base/000Login.t b/t/selenium/testscripts/base/000Login.t
new file mode 100644 (file)
index 0000000..e8ec603
--- /dev/null
+++ b/t/selenium/testscripts/base/000Login.t
@@ -0,0 +1,29 @@
+### Login
+
+diag("Login");
+
+$sel->open_ok($lxtest->{lxbaseurl}."/login.pl");
+
+$sel->wait_for_page_to_load_ok($lxtest->{timeout}); 
+$sel->title_is("Lx-Office Version ".$lxtest->{version});
+$sel->type_ok("login", $lxtest->{testuserlogin});
+$sel->type_ok("password", $lxtest->{testuserpasswd});
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Anmeldung\")]");
+
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+
+if($sel->get_text("//td") eq "Ungültiger Benutzername oder falsches Passwort!") {
+  diag("\n\n\n\nWrong username or password!\n\n\n\n");
+  $sel->stop;
+  exit(-1);
+}
+
+if($sel->get_title() eq "Datenbankaktualisierung - Lx-Office Version 2.4.3 - -") {
+  $sel->click_ok("//input[(\@name=\"dummy\") and (\@value=\"Weiter\")]");
+  $sel->wait_for_page_to_load_ok($lxtest->{timeoutlong}); 
+  $sel->click_ok("//input[(\@type=\"submit\") and (\@value=\"Weiter\")]");
+  $sel->wait_for_page_to_load_ok($lxtest->{timeout}); 
+}
+
+
+$sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
\ No newline at end of file

diff --git a/t/selenium/testscripts/base/999Logout.t b/t/selenium/testscripts/base/999Logout.t
new file mode 100644 (file)
index 0000000..b49e0af
--- /dev/null
+++ b/t/selenium/testscripts/base/999Logout.t
@@ -0,0 +1,8 @@
+### Logout
+
+diag("Logout");
+
+$sel->select_frame_ok("relative=top");
+$sel->click_ok("link=abmelden");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->title_is("Lx-Office Version ".$lxtest->{version});
\ No newline at end of file

diff --git a/t/selenium/testscripts/masterdata/begin/M000Login.t b/t/selenium/testscripts/masterdata/begin/M000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/masterdata/begin/M000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/masterdata/begin/M999Logout.t b/t/selenium/testscripts/masterdata/begin/M999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/masterdata/begin/M999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/masterdata/end/M000Login.t b/t/selenium/testscripts/masterdata/end/M000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/masterdata/end/M000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/masterdata/end/M999Logout.t b/t/selenium/testscripts/masterdata/end/M999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/masterdata/end/M999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/payments/begin/P000Login.t b/t/selenium/testscripts/payments/begin/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/payments/begin/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/payments/begin/P999Logout.t b/t/selenium/testscripts/payments/begin/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/payments/begin/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/payments/end/P000Login.t b/t/selenium/testscripts/payments/end/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/payments/end/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/payments/end/P999Logout.t b/t/selenium/testscripts/payments/end/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/payments/end/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/printing/begin/P000Login.t b/t/selenium/testscripts/printing/begin/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/printing/begin/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/printing/begin/P999Logout.t b/t/selenium/testscripts/printing/begin/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/printing/begin/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/printing/end/P000Login.t b/t/selenium/testscripts/printing/end/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/printing/end/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/printing/end/P999Logout.t b/t/selenium/testscripts/printing/end/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/printing/end/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/programm/begin/P000Login.t b/t/selenium/testscripts/programm/begin/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/programm/begin/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/programm/begin/P999Logout.t b/t/selenium/testscripts/programm/begin/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/programm/begin/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/programm/end/P000Login.t b/t/selenium/testscripts/programm/end/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/programm/end/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/programm/end/P999Logout.t b/t/selenium/testscripts/programm/end/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/programm/end/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/purchase/begin/P000Login.t b/t/selenium/testscripts/purchase/begin/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/purchase/begin/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/purchase/begin/P999Logout.t b/t/selenium/testscripts/purchase/begin/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/purchase/begin/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/purchase/end/P000Login.t b/t/selenium/testscripts/purchase/end/P000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/purchase/end/P000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/purchase/end/P999Logout.t b/t/selenium/testscripts/purchase/end/P999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/purchase/end/P999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/reports/begin/R000Login.t b/t/selenium/testscripts/reports/begin/R000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/reports/begin/R000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/reports/begin/R999Logout.t b/t/selenium/testscripts/reports/begin/R999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/reports/begin/R999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/reports/end/R000Login.t b/t/selenium/testscripts/reports/end/R000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/reports/end/R000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/reports/end/R999Logout.t b/t/selenium/testscripts/reports/end/R999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/reports/end/R999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/selling/begin/S000Login.t b/t/selenium/testscripts/selling/begin/S000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/selling/begin/S000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/selling/begin/S999Logout.t b/t/selenium/testscripts/selling/begin/S999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/selling/begin/S999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/selling/end/S000Login.t b/t/selenium/testscripts/selling/end/S000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/selling/end/S000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/selling/end/S999Logout.t b/t/selenium/testscripts/selling/end/S999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/selling/end/S999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/begin/S000Login.t b/t/selenium/testscripts/system/begin/S000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/system/begin/S000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/begin/S001CreateProductGroups.t b/t/selenium/testscripts/system/begin/S001CreateProductGroups.t
index 9f1627cef4a9794f061a4add6e1986ba838869c1..75a40e7331994eaecec5a9412eb1c40e92318381 100644 (file)
--- a/t/selenium/testscripts/system/begin/S001CreateProductGroups.t
+++ b/t/selenium/testscripts/system/begin/S001CreateProductGroups.t
@@ -1,8 +1,4 @@
-diag("CreateProductGroups");
-
-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
+diag("Create product groups");

 
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Warengruppe erfassen");
 
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Warengruppe erfassen");

diff --git a/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t b/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t
index 42ee1330f9f9aca620a455e83fc8c16c145410ec..c14180df37e2a42b4cc3e7023781d664b4295167 100644 (file)
--- a/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t
+++ b/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t
@@ -1,9 +1,5 @@
 diag("Create price brackets");
 
 diag("Create price brackets");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Preisgruppe erfassen");
 $sel->wait_for_page_to_load($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Preisgruppe erfassen");
 $sel->wait_for_page_to_load($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/begin/S003AddLanguage.t b/t/selenium/testscripts/system/begin/S003AddLanguage.t
index 376b429c4e65167cca308fe1cb58eb5fec6a6725..1ffd599657b5d6c35969be47f34d1d31343cd893 100644 (file)
--- a/t/selenium/testscripts/system/begin/S003AddLanguage.t
+++ b/t/selenium/testscripts/system/begin/S003AddLanguage.t
@@ -1,9 +1,5 @@
 diag("Add languages");
 
 diag("Add languages");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprache hinzufügen");
 $sel->wait_for_page_to_load($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprache hinzufügen");
 $sel->wait_for_page_to_load($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/begin/S004ShowLanguages.t b/t/selenium/testscripts/system/begin/S004ShowLanguages.t
index 2fb0ce6fbeeb669cf6ee71d44c9143a9b25d5adf..c64bc20eb062324ff334963dab739207892915f1 100644 (file)
--- a/t/selenium/testscripts/system/begin/S004ShowLanguages.t
+++ b/t/selenium/testscripts/system/begin/S004ShowLanguages.t
@@ -1,9 +1,5 @@
 diag("Show languages");
 
 diag("Show languages");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprachen anzeigen");
 $sel->wait_for_page_to_load($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprachen anzeigen");
 $sel->wait_for_page_to_load($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t b/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t
index 7bf3506f08ac56bb484153bc4c6275e0589a2635..0910598bd728d56ccef030a5d9487a9b69147df6 100644 (file)
--- a/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t
+++ b/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t
@@ -1,9 +1,5 @@
 diag("Add payment conditions");
 
 diag("Add payment conditions");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen hinzufügen");
 $sel->wait_for_page_to_load($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen hinzufügen");
 $sel->wait_for_page_to_load($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t b/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t
index e0b391f602535917dce5773d8c3e7e1ae85e7a33..81c7081d5eb782b5ebdd88aad0b6e253dcac6a4a 100644 (file)
--- a/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t
+++ b/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t
@@ -1,9 +1,5 @@
 diag("Show payment conditions");
 
 diag("Show payment conditions");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen anzeigen");
 $sel->wait_for_page_to_load($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen anzeigen");
 $sel->wait_for_page_to_load($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t b/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t
index b70a6922c8559781695efe0b4552036a4e3ca038..6cac124017cf13fa52d1c969e05c6291677accc5 100644 (file)
--- a/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t
+++ b/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t
@@ -1,9 +1,5 @@
 diag("Add customer/vendor types");
 
 diag("Add customer/vendor types");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden-/Lieferantentyp erfassen");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden-/Lieferantentyp erfassen");

diff --git a/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t b/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t
index 20b9f9b759358237e03b46b11905eea2a1674f90..9521eef7652db127eef894b49aed3fdac1ad4d4d 100644 (file)
--- a/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t
+++ b/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t
@@ -1,9 +1,5 @@
 diag("Show customer/vendor types");
 
 diag("Show customer/vendor types");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden\-\/Lieferantentypen\ anzeigen");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden\-\/Lieferantentypen\ anzeigen");

diff --git a/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t b/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t
index 301b749778107892db9428d427b206bfc6d6e7c3..7d49e4c002e5c95d91f51d3824e10ec8a9276f51 100644 (file)
--- a/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t
+++ b/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t
@@ -1,9 +1,5 @@
 diag("Add show and delete measure");
 
 diag("Add show and delete measure");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Maßeinheiten");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Maßeinheiten");

diff --git a/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t b/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t
index c11a1ef13e6d7c5d64a2a9c17b4ab7252f0335ee..7159d0336f6d5cf1693d73a167d2836e30c4debc 100644 (file)
--- a/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t
+++ b/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t
@@ -1,9 +1,5 @@
 diag("Add show and delete service measure");
 
 diag("Add show and delete service measure");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Dienstleistungseinheiten");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Dienstleistungseinheiten");

diff --git a/t/selenium/testscripts/system/begin/S999Logout.t b/t/selenium/testscripts/system/begin/S999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/system/begin/S999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/end/S000Login.t b/t/selenium/testscripts/system/end/S000Login.t
new file mode 120000 (symlink)
index 0000000..11cbb26
--- /dev/null
+++ b/t/selenium/testscripts/system/end/S000Login.t
@@ -0,0 +1 @@
+../../base/000Login.t
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/end/S992DeleteProductGroups.t b/t/selenium/testscripts/system/end/S992DeleteProductGroups.t
new file mode 100644 (file)
index 0000000..bacf536
--- /dev/null
+++ b/t/selenium/testscripts/system/end/S992DeleteProductGroups.t
@@ -0,0 +1,24 @@
+diag("Delete product groups");
+
+if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
+  require_ok("../../begin/B004Login.t");
+}
+
+$sel->select_frame_ok("relative=up");
+$sel->click_ok("link=Warengruppen anzeigen");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->select_frame_ok("main_window");
+$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("link=TestSeleniumWarengruppe1");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("document.forms[0].action[1]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("link=TestSeleniumWarengruppe2");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("document.forms[0].action[1]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("link=TestSeleniumWarengruppe3");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
+$sel->click_ok("document.forms[0].action[1]");
+$sel->wait_for_page_to_load_ok($lxtest->{timeout});
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t b/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t
index 8726c898054ea24337c90185d2fd62d1290e2ac8..c2999b061509eb2598611d6a731646e35a93a26e 100644 (file)
--- a/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t
+++ b/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t
@@ -1,9 +1,5 @@
 diag("Delete customer/vendor types");
 
 diag("Delete customer/vendor types");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden-/Lieferantentypen anzeigen");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Kunden-/Lieferantentypen anzeigen");

diff --git a/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t b/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t
index 4caa7920eabc55c38b3308ce0ee1c97241a65bce..dbfcc590311c96adbb05362d8752a6a9261b0449 100644 (file)
--- a/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t
+++ b/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t
@@ -1,9 +1,5 @@
 diag("Delete payment conditions");
 
 diag("Delete payment conditions");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen anzeigen");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Zahlungskonditionen anzeigen");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/end/S997DeleteLanguages.t b/t/selenium/testscripts/system/end/S997DeleteLanguages.t
index 576562fd0fb47d0f8f25975438141a1fd14f7e92..49092fd4586bbcf8e74ee7656ba17bb3b99fc085 100644 (file)
--- a/t/selenium/testscripts/system/end/S997DeleteLanguages.t
+++ b/t/selenium/testscripts/system/end/S997DeleteLanguages.t
@@ -1,9 +1,5 @@
 diag("Delete languages");
 
 diag("Delete languages");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprachen anzeigen");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});
 $sel->select_frame_ok("relative=up");
 $sel->click_ok("link=Sprachen anzeigen");
 $sel->wait_for_page_to_load_ok($lxtest->{timeout});

diff --git a/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t b/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t
index 99f531a0865ddb826b6fb674610c9e1f4d272b38..fef93c44b22f1c93b5a36dbbdee03bbe6fd2446f 100644 (file)
--- a/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t
+++ b/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t
@@ -1,9 +1,5 @@
 diag("Delete price brackets");
 
 diag("Delete price brackets");
 

-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-

 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Preisgruppen anzeigen");
 $sel->select_frame_ok("relative=up");
 $sel->title_is("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db});
 $sel->click_ok("link=Preisgruppen anzeigen");

diff --git a/t/selenium/testscripts/system/end/S999DeleteProductGroups.t b/t/selenium/testscripts/system/end/S999DeleteProductGroups.t
deleted file mode 100644 (file)
index bacf536..0000000
--- a/t/selenium/testscripts/system/end/S999DeleteProductGroups.t
+++ /dev/null
@@ -1,24 +0,0 @@
-diag("Delete product groups");
-
-if(!$sel->get_title("Lx-Office Version 2.4.3 - Selenium - " . $lxtest->{db})){
-  require_ok("../../begin/B004Login.t");
-}
-
-$sel->select_frame_ok("relative=up");
-$sel->click_ok("link=Warengruppen anzeigen");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->select_frame_ok("main_window");
-$sel->click_ok("//input[(\@name=\"action\") and (\@value=\"Weiter\")]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("link=TestSeleniumWarengruppe1");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("document.forms[0].action[1]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("link=TestSeleniumWarengruppe2");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("document.forms[0].action[1]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("link=TestSeleniumWarengruppe3");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
-$sel->click_ok("document.forms[0].action[1]");
-$sel->wait_for_page_to_load_ok($lxtest->{timeout});
\ No newline at end of file

diff --git a/t/selenium/testscripts/system/end/S999Logout.t b/t/selenium/testscripts/system/end/S999Logout.t
new file mode 120000 (symlink)
index 0000000..43ce84a
--- /dev/null
+++ b/t/selenium/testscripts/system/end/S999Logout.t
@@ -0,0 +1 @@
+../../base/999Logout.t
\ No newline at end of file