diff --git a/mozilla/webtools/bugzilla3/tests/Main b/mozilla/webtools/bugzilla3/tests/Main
index 1e8b2d16715..4d057568fb0 100755
--- a/mozilla/webtools/bugzilla3/tests/Main
+++ b/mozilla/webtools/bugzilla3/tests/Main
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -wT
# -*- Mode: perl; tab-width: 4; indent-tabs-mode: nil; -*-
#
# This file is MPL/GPL dual-licensed under the following terms:
@@ -28,7 +28,6 @@
# under either the MPL or the GPL.
use strict; # enable stricter Perl syntax rules
-use diagnostics; # enable fuller diagnostics
use lib "."; # this is required to use the app's modules
use lib "../../PLIF"; # this is required to use PLIF
use vars qw(@ISA);
@@ -59,29 +58,40 @@ sub registerServices {
PLIF::Service::User
PLIF::Service::Passwords
PLIF::Service::UserField::String
+ PLIF::Service::UserField::Integer
PLIF::Service::UserFieldFactory
PLIF::Service::Components::AdminCommands
PLIF::Service::Components::Login
PLIF::Service::Components::CosesEditor
+ PLIF::Service::Components::UserPrefs
PLIF::Service::ContactMethod::Email
PLIF::Service::ContactMethod::AIM
+ PLIF::ProtocolHelper::Logout::HTTP
Output
Configuration
));
}
-sub unknownCommand {
+sub noCommand {
my $self = shift;
- $self->output->hello({});
+ my $user = $self->getObject('user');
+ if (defined($user)) {
+ my %strings = @{$self->getCollectingServiceList('dispatcher.output')->strings};
+ $self->output->hello(\%strings);
+ } else {
+ $self->output->hello();
+ }
}
sub cmdLogin {
my $self = shift;
- my $user = $self->getService('user.login')->hasRight($self, 'hello');
+ my $user = $self->getObject('user');
if (defined($user)) {
my %strings = @{$self->getCollectingServiceList('dispatcher.output')->strings};
$self->output->hello(\%strings);
- } # else, user has been notified
+ } else {
+ $self->getService('user.login')->requireLogin($self);
+ }
}
sub name {
diff --git a/mozilla/webtools/bugzilla3/tests/output/http/error b/mozilla/webtools/bugzilla3/tests/output/http/error
new file mode 100644
index 00000000000..13cd184db73
--- /dev/null
+++ b/mozilla/webtools/bugzilla3/tests/output/http/error
@@ -0,0 +1,22 @@
+COSES
+1
+
+
+
+
+
+
+
+
+An internal error occured. Please report this bug, including the
+date and time of the error along with the information included
+below:
+
+
]]>
+]]>
+
+
+
+
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla3/tests/output/http/hello b/mozilla/webtools/bugzilla3/tests/output/http/hello
index e60033062ac..5aeb4d60b4b 100644
--- a/mozilla/webtools/bugzilla3/tests/output/http/hello
+++ b/mozilla/webtools/bugzilla3/tests/output/http/hello
@@ -7,20 +7,19 @@ COSES
-This is the main page of the test PLIF project. It is being generated from an XML text file!
-