Bug 1403777 - Migrate urlbase from params to localconfig

5 files changed, 19 insertions, 39 deletions

diff --git a/qa/config/checksetup_answers.txt b/qa/config/checksetup_answers.txt
index f9fb6ea60..79d9cb90c 100644
--- a/qa/config/checksetup_answers.txt
+++ b/qa/config/checksetup_answers.txt
@@ -22,6 +22,5 @@ $answer{'db_user'}   = 'bugs';
 $answer{'diffpath'} = '/usr/bin';
 $answer{'index_html'} = 0;
 $answer{'interdiffbin'} = '/usr/bin/interdiff';
-$answer{'urlbase'} = 'http://localhost/bmo/';
 $answer{'use_suexec'} = '';
 $answer{'webservergroup'} = '%USER%';
diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl
index 333bffa26..6bd9dd355 100644
--- a/qa/config/generate_test_data.pl
+++ b/qa/config/generate_test_data.pl
@@ -67,17 +67,6 @@ Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
 # Set Parameters
 ##########################################################################
 
-# Some parameters must be turned on to create bugs requiring them.
-# They are also expected to be turned on by some webservice_*.t scripts.
-my ($urlbase, $sslbase);
-$urlbase = $config->{browser_url} . '/' . $config->{bugzilla_installation};
-$urlbase .= '/' unless $urlbase =~ /\/$/;
-
-if ($urlbase =~ /^https/) {
-    $sslbase = $urlbase;
-    $urlbase =~ s/^https(.+)$/http$1/;
-}
-
 # Create missing priorities
 # BMO uses P1-P5 which is different from upstream
 my $field = Bugzilla::Field->new({ name => 'priority' });
@@ -98,8 +87,6 @@ foreach my $value (qw(PC)) {
 }
 
 my %set_params = (
-    urlbase => $urlbase,
-    sslbase => $sslbase,
     usebugaliases => 1,
     useqacontact  => 1,
     mail_delivery_method => 'Test',
diff --git a/qa/t/lib/QA/Util.pm b/qa/t/lib/QA/Util.pm
index 0ef843ce7..f80837c0e 100644
--- a/qa/t/lib/QA/Util.pm
+++ b/qa/t/lib/QA/Util.pm
@@ -357,8 +357,8 @@ sub set_parameters {
     go_to_admin($sel);
     $sel->click_ok("link=Parameters", undef, "Go to the Config Parameters page");
     $sel->wait_for_page_to_load(WAIT_TIME);
-    $sel->title_is("Configuration: Required Settings");
-    my $last_section = "Required Settings";
+    $sel->title_is("Configuration: General");
+    my $last_section = "General";
 
     foreach my $section (keys %$params) {
         if ($section ne $last_section) {
diff --git a/qa/t/test_security.t b/qa/t/test_security.t
index 56fba4b01..757c33d06 100644
--- a/qa/t/test_security.t
+++ b/qa/t/test_security.t
@@ -35,8 +35,7 @@ my $bug1_id = create_bug($sel, $bug_summary);
 
 # No alternate host for attachments; cookies will be accessible.
 
-set_parameters($sel, { "Attachments" => {"allow_attachment_display-on" => undef,
-                                         "reset-attachment_base" => undef} });
+set_parameters($sel, { "Attachments" => {"allow_attachment_display-on" => undef } });
 
 go_to_bug($sel, $bug1_id);
 $sel->click_ok("link=simple patch, v1");
@@ -51,24 +50,22 @@ $sel->go_back_ok();
 $sel->wait_for_page_to_load_ok(WAIT_TIME);
 $sel->title_like(qr/^$bug1_id /);
 
-# Alternate host for attachments; no cookie should be accessible.
-
-set_parameters($sel, { "Attachments" => {"attachment_base" => {type  => "text",
-                                                               value => "$config->{browser_ip_url}/$urlbase/"}} });
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("link=simple patch, v1");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("");
-@cookies = split(/[\s;]+/, $sel->get_cookie());
-$nb_cookies = scalar @cookies;
-ok(!$nb_cookies, "No cookies found");
-ok(!$sel->is_cookie_present("Bugzilla_login"), "Bugzilla_login not accessible");
-ok(!$sel->is_cookie_present("Bugzilla_logincookie"), "Bugzilla_logincookie not accessible");
-$sel->go_back_ok();
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_like(qr/^$bug1_id /);
-
-set_parameters($sel, { "Attachments" => {"reset-attachment_base" => undef} });
+# # Alternate host for attachments; no cookie should be accessible.
+
+# set_parameters($sel, { "Attachments" => {"attachment_base" => {type  => "text",
+#                                                                value => "$config->{browser_ip_url}/$urlbase/"}} });
+# go_to_bug($sel, $bug1_id);
+# $sel->click_ok("link=simple patch, v1");
+# $sel->wait_for_page_to_load_ok(WAIT_TIME);
+# $sel->title_is("");
+# @cookies = split(/[\s;]+/, $sel->get_cookie());
+# $nb_cookies = scalar @cookies;
+# ok(!$nb_cookies, "No cookies found");
+# ok(!$sel->is_cookie_present("Bugzilla_login"), "Bugzilla_login not accessible");
+# ok(!$sel->is_cookie_present("Bugzilla_logincookie"), "Bugzilla_logincookie not accessible");
+# $sel->go_back_ok();
+# $sel->wait_for_page_to_load_ok(WAIT_TIME);
+# $sel->title_like(qr/^$bug1_id /);
 
 #######################################################################
 # Security bug 472362.
diff --git a/qa/t/test_shutdown.t b/qa/t/test_shutdown.t
index 922307207..dc5cabd4a 100644
--- a/qa/t/test_shutdown.t
+++ b/qa/t/test_shutdown.t
@@ -58,9 +58,6 @@ $sel->type_ok("Bugzilla_login", $config->{admin_user_login}, "Enter admin login
 $sel->type_ok("Bugzilla_password", $config->{admin_user_passwd}, "Enter admin password");
 $sel->click_ok("log_in");
 $sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Configuration: Required Settings");
-$sel->click_ok("link=General");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
 $sel->title_is("Configuration: General");
 $sel->type_ok("shutdownhtml", "");
 $sel->click_ok('//input[@type="submit" and @value="Save Changes"]', undef, "Save Changes");