diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-10-04 01:35:35 +0200 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-10-04 01:35:35 +0200 |
| commit | 04871c9097e4d5108f17f316c78f35c25c32a0b1 (patch) | |
| tree | bab8103da135ac27dddfb088eb68bbd57328cc94 /xt/lib/Bugzilla/Test/Search.pm | |
| parent | 9936d9f1631ef862fed0b7874db751c1be298402 (diff) | |
| download | bugzilla-04871c9097e4d5108f17f316c78f35c25c32a0b1.tar.gz bugzilla-04871c9097e4d5108f17f316c78f35c25c32a0b1.tar.xz | |
Bug 601519 - Test pronouns (like %user%, %reporter%, etc.) in xt/search.t
r=mkanat, a=mkanat (module owner)
Diffstat (limited to 'xt/lib/Bugzilla/Test/Search.pm')
| -rw-r--r-- | xt/lib/Bugzilla/Test/Search.pm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xt/lib/Bugzilla/Test/Search.pm b/xt/lib/Bugzilla/Test/Search.pm index 5137302b7..02ff48a80 100644 --- a/xt/lib/Bugzilla/Test/Search.pm +++ b/xt/lib/Bugzilla/Test/Search.pm @@ -592,6 +592,7 @@ sub _create_one_bug { my $update_alias = $self->bug_update_value($number, 'alias'); # Otherwise, make bug 6 a clone of bug 1. + my $real_number = $number; $number = 1 if $number == 6; my $reporter = $self->bug_create_value($number, 'reporter'); @@ -689,9 +690,14 @@ sub _create_one_bug { $update_params{groups} = { add => $update_params{groups}, remove => $bug->groups_in }; my @cc_remove = map { $_->login } @{ $bug->cc_users }; - my $cc_add = $update_params{cc}; - $cc_add = [$cc_add] if !ref $cc_add; - $update_params{cc} = { add => $cc_add, remove => \@cc_remove }; + my $cc_new = $update_params{cc}; + my @cc_add = ref($cc_new) ? @$cc_new : ($cc_new); + # We make the admin an explicit CC on bug 1 (but not on bug 6), so + # that we can test the %user% pronoun properly. + if ($real_number == 1) { + push(@cc_add, $self->admin->login); + } + $update_params{cc} = { add => \@cc_add, remove => \@cc_remove }; my $see_also_remove = $bug->see_also; my $see_also_add = [$update_params{see_also}]; $update_params{see_also} = { add => $see_also_add, |