Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
293 lines
12 KiB
Perl
Executable file
293 lines
12 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 50;
|
|
|
|
use MARC::Record;
|
|
|
|
use C4::Biblio qw( AddBiblio );
|
|
use Koha::Database;
|
|
use Koha::Patrons;
|
|
use t::lib::Mocks;
|
|
use t::lib::TestBuilder;
|
|
use_ok('C4::Serials', qw( NewSubscription GetSubscription NewIssue GetPreviousSerialid ));
|
|
use_ok('C4::Budgets', qw( AddBudgetPeriod AddBudget ));
|
|
|
|
# Mock userenv
|
|
local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /redefined/ };
|
|
my $userenv;
|
|
*C4::Context::userenv = \&Mock_userenv;
|
|
|
|
my $schema = Koha::Database->schema;
|
|
$schema->storage->txn_begin;
|
|
my $builder = t::lib::TestBuilder->new;
|
|
my $library1 = $builder->build({
|
|
source => 'Branch',
|
|
});
|
|
my $library2 = $builder->build({
|
|
source => 'Branch',
|
|
});
|
|
my $patron_category = $builder->build({ source => 'Category' });
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my $record = MARC::Record->new();
|
|
$record->append_fields(
|
|
MARC::Field->new( '952', '0', '0', a => $library1->{branchcode}, b => $library1->{branchcode} )
|
|
);
|
|
my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio($record, '');
|
|
|
|
my $my_branch = $library1->{branchcode};
|
|
my $another_branch = $library2->{branchcode};
|
|
my $bpid = AddBudgetPeriod({
|
|
budget_period_startdate => '2015-01-01',
|
|
budget_period_enddate => '2015-12-31',
|
|
budget_period_description => "budget desc"
|
|
});
|
|
|
|
my $budget_id = AddBudget({
|
|
budget_code => "ABCD",
|
|
budget_amount => "123.132",
|
|
budget_name => "Périodiques",
|
|
budget_notes => "This is a note",
|
|
budget_period_id => $bpid
|
|
});
|
|
|
|
my $subscriptionid_from_my_branch = NewSubscription(
|
|
undef, $my_branch, undef, undef, $budget_id, $biblionumber,
|
|
'2013-01-01', undef, undef, undef, undef,
|
|
undef, undef, undef, undef, undef, undef,
|
|
1, "notes",undef, '2013-01-01', undef, undef,
|
|
undef, undef, 0, "intnotes", 0,
|
|
undef, undef, 0, undef, '2013-12-31', 0
|
|
);
|
|
die unless $subscriptionid_from_my_branch;
|
|
|
|
my $subscriptionid_from_another_branch = NewSubscription(
|
|
undef, $another_branch, undef, undef, $budget_id, $biblionumber,
|
|
'2013-01-01', undef, undef, undef, undef,
|
|
undef, undef, undef, undef, undef, undef,
|
|
1, "notes",undef, '2013-01-01', undef, undef,
|
|
undef, undef, 0, "intnotes", 0,
|
|
undef, undef, 0, undef, '2013-12-31', 0
|
|
);
|
|
|
|
|
|
my $subscription_from_my_branch = GetSubscription( $subscriptionid_from_my_branch );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 0, "cannot edit a subscription without userenv set");
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 0, "cannot edit a subscription without userenv set");
|
|
|
|
my $userid = 'my_userid';
|
|
my $borrowernumber = Koha::Patron->new({
|
|
firstname => 'my fistname',
|
|
surname => 'my surname',
|
|
categorycode => $patron_category->{categorycode},
|
|
branchcode => $my_branch,
|
|
userid => $userid,
|
|
})->store->borrowernumber;
|
|
|
|
$userenv = { flags => 1, id => $borrowernumber, branch => '' };
|
|
|
|
# Can edit a subscription
|
|
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1, "User can edit a subscription with an empty branchcode");
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 1, "User can edit a subscription with an empty branchcode");
|
|
|
|
my $subscription_from_another_branch = GetSubscription( $subscriptionid_from_another_branch );
|
|
|
|
$userenv->{id} = $userid;
|
|
$userenv->{branch} = $my_branch;
|
|
|
|
# Branches are independent
|
|
t::lib::Mocks::mock_preference( "IndependentBranches", 1 );
|
|
set_flags( 'superlibrarian', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superlibrarian can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superlibrarian can edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superlibrarian can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superlibrarian can show a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superlibrarian can claim a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superlibrarian can claim a subscription from another branch"
|
|
);
|
|
|
|
|
|
set_flags( 'superserials', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superserials can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superserials can edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superserials can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superserials can show a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, superserials can claim a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_another_branch), 1,
|
|
"With IndependentBranches, superserials can claim a subscription from another branch"
|
|
);
|
|
|
|
|
|
|
|
set_flags( 'edit_subscription', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, edit_subscription can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, edit_subscription cannot edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, show_subscription can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, show_subscription cannot show a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 0,
|
|
"With IndependentBranches, claim_subscription cannot claim a subscription from his branch with the edit_subscription permission"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, claim_subscription cannot claim a subscription from another branch"
|
|
);
|
|
|
|
|
|
set_flags( 'renew_subscription', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 0,
|
|
"With IndependentBranches, renew_subscription cannot edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, renew_subscription cannot edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, renew_subscription can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, renew_subscription cannot show a subscription from another branch"
|
|
);
|
|
|
|
set_flags( 'claim_serials', $borrowernumber );
|
|
is( C4::Serials::can_claim_subscription($subscription_from_my_branch), 1,
|
|
"With IndependentBranches, claim_subscription can claim a subscription from his branch with the edit_subscription permission"
|
|
);
|
|
is( C4::Serials::can_claim_subscription($subscription_from_another_branch), 0,
|
|
"With IndependentBranches, claim_subscription cannot claim a subscription from another branch"
|
|
);
|
|
|
|
# Branches are not independent
|
|
t::lib::Mocks::mock_preference( "IndependentBranches", 0 );
|
|
set_flags( 'superlibrarian', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, superlibrarian can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, superlibrarian can edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, superlibrarian can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, superlibrarian can show a subscription from another branch"
|
|
);
|
|
|
|
set_flags( 'superserials', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, superserials can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, superserials can edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, superserials can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, superserials can show a subscription from another branch"
|
|
);
|
|
|
|
set_flags( 'edit_subscription', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, edit_subscription can edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, edit_subscription can edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, show_subscription can show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, show_subscription can show a subscription from another branch"
|
|
);
|
|
|
|
set_flags( 'renew_subscription', $borrowernumber );
|
|
is( C4::Serials::can_edit_subscription($subscription_from_my_branch), 0,
|
|
"Without IndependentBranches, renew_subscription cannot edit a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_edit_subscription($subscription_from_another_branch), 0,
|
|
"Without IndependentBranches, renew_subscription cannot edit a subscription from another branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_my_branch), 1,
|
|
"Without IndependentBranches, renew_subscription cannot show a subscription from his branch"
|
|
);
|
|
is( C4::Serials::can_show_subscription($subscription_from_another_branch), 1,
|
|
"Without IndependentBranches, renew_subscription cannot show a subscription from another branch"
|
|
);
|
|
|
|
# GetPreviousSerialid
|
|
my $serialid1 = NewIssue( 1, $subscriptionid_from_my_branch, $biblionumber, 2 );
|
|
my $serialid2 = NewIssue( 2, $subscriptionid_from_my_branch, $biblionumber, 2 );
|
|
my $serialid3 = NewIssue( 3, $subscriptionid_from_my_branch, $biblionumber, 2 );
|
|
is( GetPreviousSerialid( $subscriptionid_from_my_branch ), $serialid2, "get previous serialid without parameter");
|
|
is( GetPreviousSerialid( $subscriptionid_from_my_branch, 1 ), $serialid2, "get previous serialid with 1" );
|
|
is( GetPreviousSerialid( $subscriptionid_from_my_branch, 2 ), $serialid1, "get previous serialid with 2" );
|
|
is( GetPreviousSerialid( $subscriptionid_from_my_branch, 3 ), undef, "get previous serialid with 3, does not exist" );
|
|
|
|
$schema->storage->txn_rollback;
|
|
|
|
# C4::Context->userenv
|
|
sub Mock_userenv {
|
|
return $userenv;
|
|
}
|
|
|
|
sub set_flags {
|
|
my ( $flags, $borrowernumber ) = @_;
|
|
my $superlibrarian_flags = 1;
|
|
if ( $flags eq 'superlibrarian' ) {
|
|
$dbh->do(
|
|
q|
|
|
UPDATE borrowers SET flags=? WHERE borrowernumber=?
|
|
|, {}, $superlibrarian_flags, $borrowernumber
|
|
);
|
|
$userenv->{flags} = $superlibrarian_flags;
|
|
}
|
|
else {
|
|
$dbh->do(
|
|
q|
|
|
UPDATE borrowers SET flags=? WHERE borrowernumber=?
|
|
|, {}, 0, $borrowernumber
|
|
);
|
|
$userenv->{flags} = 0;
|
|
my ( $module_bit, $code ) = ( '15', $flags );
|
|
$dbh->do(
|
|
q|
|
|
DELETE FROM user_permissions where borrowernumber=?
|
|
|, {}, $borrowernumber
|
|
);
|
|
|
|
$dbh->do(
|
|
q|
|
|
INSERT INTO user_permissions( borrowernumber, module_bit, code ) VALUES ( ?, ?, ? )
|
|
|, {}, $borrowernumber, $module_bit, $code
|
|
);
|
|
}
|
|
}
|