TT#38150 fix and re-enable api-journals.t

Change-Id: Ia5e73e6ba31c865f8a97d6711f24a113a2526d74
changes/37/21737/2
Rene Krenn 7 years ago
parent b96431b909
commit fa967c4d92

@ -316,9 +316,9 @@ sub handle_api_journals_options {
my ($controller, $c, $id) = @_;
my @allowed_methods = ('OPTIONS');
my %journal_actions_found = map { $_ => 1 } @{ $controller->get_journal_methods };
if (exists $journal_actions_found{'journals_get'}) {
if (exists $journal_actions_found{'handle_journals_get'}) {
push(@allowed_methods,'GET');
if (exists $journal_actions_found{'journals_head'}) {
if (exists $journal_actions_found{'handle_journals_head'}) {
push(@allowed_methods,'HEAD');
}
}
@ -334,9 +334,9 @@ sub handle_api_journalsitem_options {
my ($controller, $c, $id) = @_;
my @allowed_methods = ('OPTIONS');
my %journal_actions_found = map { $_ => 1 } @{ $controller->get_journal_methods };
if (exists $journal_actions_found{'journalsitem_get'}) {
if (exists $journal_actions_found{'handle_journalsitem_get'}) {
push(@allowed_methods,'GET');
if (exists $journal_actions_found{'journalsitem_head'}) {
if (exists $journal_actions_found{'handle_journalsitem_head'}) {
push(@allowed_methods,'HEAD');
}
}
@ -654,3 +654,4 @@ sub _create_journal {
}
1;

File diff suppressed because it is too large Load Diff

@ -25,7 +25,7 @@ fi
if [ "${SELECT}" = "stable" ] ; then
echo "Test selection: ${SELECT}"
SELECT=$(echo ./t/api-rest/api-{all-links,balanceintervals,bannedips,bannedusers,billingfees,billingnetworks,billingprofiles,billingzones,calllists,calls,cert-auth,cfdestinationsets,contracts,customercontacts,customers,faxes,lnp,ncoslevels,pbxdevicemodels,pbxdevices,peeringgroups,peeringrules,peeringinboundrules,peeringservers,preferences,profilepackages,resellers,rewriterules,rewriterulesets,root,soundsets,subscriberregistrations,subscribers,systemcontacts,threads,topuplogs,trustedsources,valid-patch,vouchers,method-override}.t)
SELECT=$(echo ./t/api-rest/api-{all-links,balanceintervals,bannedips,bannedusers,billingfees,billingnetworks,billingprofiles,billingzones,calllists,calls,cert-auth,cfdestinationsets,contracts,customercontacts,customers,faxes,journals,lnp,ncoslevels,pbxdevicemodels,pbxdevices,peeringgroups,peeringrules,peeringinboundrules,peeringservers,preferences,profilepackages,resellers,rewriterules,rewriterulesets,root,soundsets,subscriberregistrations,subscribers,systemcontacts,threads,topuplogs,trustedsources,valid-patch,vouchers,method-override}.t)
elif [ "${SELECT}" = "fast" ] ; then
echo "Test selection: ${SELECT}"
SELECT=$(echo ./t/api-rest/api-{bannedips,bannedusers,billingnetworks,billingzones,calls,cert-auth,cfdestinationsets,ncoslevels,peeringgroups,peeringrules,peeringinboundrules,peeringservers,resellers,rewriterules,root,soundsets,systemcontacts,valid-patch,vouchers,method-override}.t)

Loading…
Cancel
Save