From 6c8a96c23a56f8db29948f265d895541369ac36b Mon Sep 17 00:00:00 2001 From: Thomas Kasulke Date: Thu, 23 Aug 2007 12:01:05 +0000 Subject: [PATCH] =?utf8?q?Fortf=C3=BChrung=20der=20Struturierung=20und=20h?= =?utf8?q?inzuf=C3=BCgen=20von=20Systemtests,=20sowie=20globaler=20Login?= =?utf8?q?=20und=20Logout=20Tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- t/lx-office.t | 2 +- t/selenium/AllTests.t | 10 ++++++---- t/selenium/testscripts/accounting/begin/A000Login.t | 1 + t/selenium/testscripts/accounting/begin/A999Logout.t | 1 + t/selenium/testscripts/accounting/end/A000Login.t | 1 + t/selenium/testscripts/accounting/end/A999Logout.t | 1 + ...CreateTestDatabase.t => A001CreateTestDatabase.t} | 5 ++--- .../{B002CreateTestUser.t => A002CreateTestUser.t} | 1 + .../{B003UpdateDatabase.t => A003UpdateDatabase.t} | 3 ++- .../{E998DeleteTestUser.t => A998DeleteTestUser.t} | 1 + ...DeleteTestDatabase.t => A999DeleteTestDatabase.t} | 1 + .../testscripts/administration/end/E997Logout.t | 8 -------- .../begin/B004Login.t => base/000Login.t} | 12 ++++++++++-- t/selenium/testscripts/base/999Logout.t | 8 ++++++++ t/selenium/testscripts/masterdata/begin/M000Login.t | 1 + t/selenium/testscripts/masterdata/begin/M999Logout.t | 1 + t/selenium/testscripts/masterdata/end/M000Login.t | 1 + t/selenium/testscripts/masterdata/end/M999Logout.t | 1 + t/selenium/testscripts/payments/begin/P000Login.t | 1 + t/selenium/testscripts/payments/begin/P999Logout.t | 1 + t/selenium/testscripts/payments/end/P000Login.t | 1 + t/selenium/testscripts/payments/end/P999Logout.t | 1 + t/selenium/testscripts/printing/begin/P000Login.t | 1 + t/selenium/testscripts/printing/begin/P999Logout.t | 1 + t/selenium/testscripts/printing/end/P000Login.t | 1 + t/selenium/testscripts/printing/end/P999Logout.t | 1 + t/selenium/testscripts/programm/begin/P000Login.t | 1 + t/selenium/testscripts/programm/begin/P999Logout.t | 1 + t/selenium/testscripts/programm/end/P000Login.t | 1 + t/selenium/testscripts/programm/end/P999Logout.t | 1 + t/selenium/testscripts/purchase/begin/P000Login.t | 1 + t/selenium/testscripts/purchase/begin/P999Logout.t | 1 + t/selenium/testscripts/purchase/end/P000Login.t | 1 + t/selenium/testscripts/purchase/end/P999Logout.t | 1 + t/selenium/testscripts/reports/begin/R000Login.t | 1 + t/selenium/testscripts/reports/begin/R999Logout.t | 1 + t/selenium/testscripts/reports/end/R000Login.t | 1 + t/selenium/testscripts/reports/end/R999Logout.t | 1 + t/selenium/testscripts/selling/begin/S000Login.t | 1 + t/selenium/testscripts/selling/begin/S999Logout.t | 1 + t/selenium/testscripts/selling/end/S000Login.t | 1 + t/selenium/testscripts/selling/end/S999Logout.t | 1 + t/selenium/testscripts/system/begin/S000Login.t | 1 + .../system/begin/S001CreateProductGroups.t | 6 +----- .../system/begin/S002CreatePriceBrackets.t | 4 ---- .../testscripts/system/begin/S003AddLanguage.t | 4 ---- .../testscripts/system/begin/S004ShowLanguages.t | 4 ---- .../system/begin/S005AddPaymentConditions.t | 4 ---- .../system/begin/S006ShowPaymentConditions.t | 4 ---- .../system/begin/S007AddCustomerVendorTypes.t | 4 ---- .../system/begin/S008ShowCustomerVendorTypes.t | 4 ---- .../system/begin/S009AddShowDeleteMeasure.t | 4 ---- .../system/begin/S010AddShowDeleteServiceMeasure.t | 4 ---- t/selenium/testscripts/system/begin/S999Logout.t | 1 + t/selenium/testscripts/system/end/S000Login.t | 1 + ...leteProductGroups.t => S992DeleteProductGroups.t} | 0 .../system/end/S995DeleteCustomerVendorTypes.t | 4 ---- .../system/end/S996DeletePaymentConditions.t | 4 ---- .../testscripts/system/end/S997DeleteLanguages.t | 4 ---- .../testscripts/system/end/S998DeletePriceBrackets.t | 4 ---- t/selenium/testscripts/system/end/S999Logout.t | 1 + 61 files changed, 69 insertions(+), 76 deletions(-) create mode 120000 t/selenium/testscripts/accounting/begin/A000Login.t create mode 120000 t/selenium/testscripts/accounting/begin/A999Logout.t create mode 120000 t/selenium/testscripts/accounting/end/A000Login.t create mode 120000 t/selenium/testscripts/accounting/end/A999Logout.t rename t/selenium/testscripts/administration/begin/{B001CreateTestDatabase.t => A001CreateTestDatabase.t} (97%) rename t/selenium/testscripts/administration/begin/{B002CreateTestUser.t => A002CreateTestUser.t} (99%) rename t/selenium/testscripts/administration/begin/{B003UpdateDatabase.t => A003UpdateDatabase.t} (99%) rename t/selenium/testscripts/administration/end/{E998DeleteTestUser.t => A998DeleteTestUser.t} (99%) rename t/selenium/testscripts/administration/end/{E999DeleteTestDatabase.t => A999DeleteTestDatabase.t} (96%) delete mode 100644 t/selenium/testscripts/administration/end/E997Logout.t rename t/selenium/testscripts/{administration/begin/B004Login.t => base/000Login.t} (74%) create mode 100644 t/selenium/testscripts/base/999Logout.t create mode 120000 t/selenium/testscripts/masterdata/begin/M000Login.t create mode 120000 t/selenium/testscripts/masterdata/begin/M999Logout.t create mode 120000 t/selenium/testscripts/masterdata/end/M000Login.t create mode 120000 t/selenium/testscripts/masterdata/end/M999Logout.t create mode 120000 t/selenium/testscripts/payments/begin/P000Login.t create mode 120000 t/selenium/testscripts/payments/begin/P999Logout.t create mode 120000 t/selenium/testscripts/payments/end/P000Login.t create mode 120000 t/selenium/testscripts/payments/end/P999Logout.t create mode 120000 t/selenium/testscripts/printing/begin/P000Login.t create mode 120000 t/selenium/testscripts/printing/begin/P999Logout.t create mode 120000 t/selenium/testscripts/printing/end/P000Login.t create mode 120000 t/selenium/testscripts/printing/end/P999Logout.t create mode 120000 t/selenium/testscripts/programm/begin/P000Login.t create mode 120000 t/selenium/testscripts/programm/begin/P999Logout.t create mode 120000 t/selenium/testscripts/programm/end/P000Login.t create mode 120000 t/selenium/testscripts/programm/end/P999Logout.t create mode 120000 t/selenium/testscripts/purchase/begin/P000Login.t create mode 120000 t/selenium/testscripts/purchase/begin/P999Logout.t create mode 120000 t/selenium/testscripts/purchase/end/P000Login.t create mode 120000 t/selenium/testscripts/purchase/end/P999Logout.t create mode 120000 t/selenium/testscripts/reports/begin/R000Login.t create mode 120000 t/selenium/testscripts/reports/begin/R999Logout.t create mode 120000 t/selenium/testscripts/reports/end/R000Login.t create mode 120000 t/selenium/testscripts/reports/end/R999Logout.t create mode 120000 t/selenium/testscripts/selling/begin/S000Login.t create mode 120000 t/selenium/testscripts/selling/begin/S999Logout.t create mode 120000 t/selenium/testscripts/selling/end/S000Login.t create mode 120000 t/selenium/testscripts/selling/end/S999Logout.t create mode 120000 t/selenium/testscripts/system/begin/S000Login.t create mode 120000 t/selenium/testscripts/system/begin/S999Logout.t create mode 120000 t/selenium/testscripts/system/end/S000Login.t rename t/selenium/testscripts/system/end/{S999DeleteProductGroups.t => S992DeleteProductGroups.t} (100%) create mode 120000 t/selenium/testscripts/system/end/S999Logout.t diff --git a/t/lx-office.t b/t/lx-office.t index 84ea4b360..6925930b6 100644 --- 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; } - +unlink("/tmp/lxtest-temp.conf"); exit 1; \ No newline at end of file diff --git a/t/selenium/AllTests.t b/t/selenium/AllTests.t index c3c5265b7..a6cca0704 100644 --- a/t/selenium/AllTests.t +++ b/t/selenium/AllTests.t @@ -39,7 +39,6 @@ use Test::More qw(no_plan); use IO::Socket; - 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->{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"); @@ -116,6 +115,9 @@ } closedir(SCRIPTS); } + if($!) { + @! = ("Test fehlgeschlagen!"); + } $sel->stop(); } diff --git a/t/selenium/testscripts/accounting/begin/A000Login.t b/t/selenium/testscripts/accounting/begin/A000Login.t new file mode 120000 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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/B001CreateTestDatabase.t b/t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t similarity index 97% rename from t/selenium/testscripts/administration/begin/B001CreateTestDatabase.t rename to t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t index 50ac47609..c45e1bc7f 100644 --- a/t/selenium/testscripts/administration/begin/B001CreateTestDatabase.t +++ b/t/selenium/testscripts/administration/begin/A001CreateTestDatabase.t @@ -1,8 +1,7 @@ ### 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\")]"); @@ -15,8 +14,8 @@ 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 -"); +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 -"); diff --git a/t/selenium/testscripts/administration/begin/B002CreateTestUser.t b/t/selenium/testscripts/administration/begin/A002CreateTestUser.t similarity index 99% rename from t/selenium/testscripts/administration/begin/B002CreateTestUser.t rename to t/selenium/testscripts/administration/begin/A002CreateTestUser.t index 9ea21bb10..c9bbee6d0 100644 --- a/t/selenium/testscripts/administration/begin/B002CreateTestUser.t +++ b/t/selenium/testscripts/administration/begin/A002CreateTestUser.t @@ -2,6 +2,7 @@ ### 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}); diff --git a/t/selenium/testscripts/administration/begin/B003UpdateDatabase.t b/t/selenium/testscripts/administration/begin/A003UpdateDatabase.t similarity index 99% rename from t/selenium/testscripts/administration/begin/B003UpdateDatabase.t rename to t/selenium/testscripts/administration/begin/A003UpdateDatabase.t index 49aeac404..af2016ce3 100644 --- a/t/selenium/testscripts/administration/begin/B003UpdateDatabase.t +++ b/t/selenium/testscripts/administration/begin/A003UpdateDatabase.t @@ -2,6 +2,7 @@ # 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}); @@ -59,4 +60,4 @@ $sel->title_like( qr/Lx-Office ERP Datenbankadministration/ ); #$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/end/E998DeleteTestUser.t b/t/selenium/testscripts/administration/end/A998DeleteTestUser.t similarity index 99% rename from t/selenium/testscripts/administration/end/E998DeleteTestUser.t rename to t/selenium/testscripts/administration/end/A998DeleteTestUser.t index f0c430e82..8fa1c5db9 100644 --- a/t/selenium/testscripts/administration/end/E998DeleteTestUser.t +++ b/t/selenium/testscripts/administration/end/A998DeleteTestUser.t @@ -1,6 +1,7 @@ ### 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}); diff --git a/t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t b/t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t similarity index 96% rename from t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t rename to t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t index 53ee427e9..6c8ce3f24 100644 --- a/t/selenium/testscripts/administration/end/E999DeleteTestDatabase.t +++ b/t/selenium/testscripts/administration/end/A999DeleteTestDatabase.t @@ -1,5 +1,6 @@ $sel->open_ok($lxtest->{lxadmin}); + $sel->title_is("Lx-Office ERP Administration -"); diag('Lock the system'); diff --git a/t/selenium/testscripts/administration/end/E997Logout.t b/t/selenium/testscripts/administration/end/E997Logout.t deleted file mode 100644 index 3dd9c6350..000000000 --- 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/begin/B004Login.t b/t/selenium/testscripts/base/000Login.t similarity index 74% rename from t/selenium/testscripts/administration/begin/B004Login.t rename to t/selenium/testscripts/base/000Login.t index 3125c77c8..e8ec603f5 100644 --- a/t/selenium/testscripts/administration/begin/B004Login.t +++ b/t/selenium/testscripts/base/000Login.t @@ -11,11 +11,19 @@ $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 - -")) { + +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}); + +$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 index 000000000..b49e0af79 --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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 9f1627cef..75a40e733 100644 --- 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"); diff --git a/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t b/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t index 42ee1330f..c14180df3 100644 --- a/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t +++ b/t/selenium/testscripts/system/begin/S002CreatePriceBrackets.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/begin/S003AddLanguage.t b/t/selenium/testscripts/system/begin/S003AddLanguage.t index 376b429c4..1ffd59965 100644 --- a/t/selenium/testscripts/system/begin/S003AddLanguage.t +++ b/t/selenium/testscripts/system/begin/S003AddLanguage.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/begin/S004ShowLanguages.t b/t/selenium/testscripts/system/begin/S004ShowLanguages.t index 2fb0ce6fb..c64bc20eb 100644 --- a/t/selenium/testscripts/system/begin/S004ShowLanguages.t +++ b/t/selenium/testscripts/system/begin/S004ShowLanguages.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t b/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t index 7bf3506f0..0910598bd 100644 --- a/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t +++ b/t/selenium/testscripts/system/begin/S005AddPaymentConditions.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t b/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t index e0b391f60..81c7081d5 100644 --- a/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t +++ b/t/selenium/testscripts/system/begin/S006ShowPaymentConditions.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t b/t/selenium/testscripts/system/begin/S007AddCustomerVendorTypes.t index b70a6922c..6cac12401 100644 --- 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"); -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"); diff --git a/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t b/t/selenium/testscripts/system/begin/S008ShowCustomerVendorTypes.t index 20b9f9b75..9521eef76 100644 --- 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"); -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"); diff --git a/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t b/t/selenium/testscripts/system/begin/S009AddShowDeleteMeasure.t index 301b74977..7d49e4c00 100644 --- 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"); -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"); diff --git a/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t b/t/selenium/testscripts/system/begin/S010AddShowDeleteServiceMeasure.t index c11a1ef13..7159d0336 100644 --- 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"); -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"); diff --git a/t/selenium/testscripts/system/begin/S999Logout.t b/t/selenium/testscripts/system/begin/S999Logout.t new file mode 120000 index 000000000..43ce84a0d --- /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 index 000000000..11cbb2686 --- /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/S999DeleteProductGroups.t b/t/selenium/testscripts/system/end/S992DeleteProductGroups.t similarity index 100% rename from t/selenium/testscripts/system/end/S999DeleteProductGroups.t rename to t/selenium/testscripts/system/end/S992DeleteProductGroups.t diff --git a/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t b/t/selenium/testscripts/system/end/S995DeleteCustomerVendorTypes.t index 8726c8980..c2999b061 100644 --- 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"); -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"); diff --git a/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t b/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t index 4caa7920e..dbfcc5903 100644 --- a/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t +++ b/t/selenium/testscripts/system/end/S996DeletePaymentConditions.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/end/S997DeleteLanguages.t b/t/selenium/testscripts/system/end/S997DeleteLanguages.t index 576562fd0..49092fd45 100644 --- a/t/selenium/testscripts/system/end/S997DeleteLanguages.t +++ b/t/selenium/testscripts/system/end/S997DeleteLanguages.t @@ -1,9 +1,5 @@ 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}); diff --git a/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t b/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t index 99f531a08..fef93c44b 100644 --- a/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t +++ b/t/selenium/testscripts/system/end/S998DeletePriceBrackets.t @@ -1,9 +1,5 @@ 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"); diff --git a/t/selenium/testscripts/system/end/S999Logout.t b/t/selenium/testscripts/system/end/S999Logout.t new file mode 120000 index 000000000..43ce84a0d --- /dev/null +++ b/t/selenium/testscripts/system/end/S999Logout.t @@ -0,0 +1 @@ +../../base/999Logout.t \ No newline at end of file -- 2.20.1