@@ -, +, @@ dangerous code duplication --- t/Auth_with_shibboleth.t | 2 +- t/Biblio.t | 8 ++------ t/Calendar.t | 7 +------ t/Images.t | 7 +------ t/Koha.t | 7 +------ t/Letters.t | 7 +------ t/Matcher.t | 7 +------ t/Members_AttributeTypes.t | 7 +------ t/NorwegianPatronDB.t | 7 +------ t/Prices.t | 7 +------ t/SocialData.t | 7 +------ t/XSLT.t | 15 ++------------- t/db_dependent/Sitemapper.t | 7 +------ 13 files changed, 15 insertions(+), 80 deletions(-) --- a/t/Auth_with_shibboleth.t +++ a/t/Auth_with_shibboleth.t @@ -34,7 +34,7 @@ BEGIN { } } -use Test::DBIx::Class { schema_class => 'Koha::Schema', connect_info => ['dbi:SQLite:dbname=:memory:','',''] }; +use Test::DBIx::Class; # Mock Variables my $matchpoint = 'userid'; --- a/t/Biblio.t +++ a/t/Biblio.t @@ -33,12 +33,8 @@ BEGIN { use_ok('C4::Biblio'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Biblio' ; +#use Test::DBIx::Class {}, 'Biblio'; +use Test::DBIx::Class; #No difference between these two invocations in time taken to execute tests. sub fixtures { my ( $data ) = @_; --- a/t/Calendar.t +++ a/t/Calendar.t @@ -37,12 +37,7 @@ BEGIN { use_ok('Koha::Calendar'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Biblio' ; +use Test::DBIx::Class; sub fixtures { my ( $data ) = @_; --- a/t/Images.t +++ a/t/Images.t @@ -32,12 +32,7 @@ BEGIN { use_ok('C4::Images'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Biblioimage' ; +use Test::DBIx::Class; # Make the code in the module use our mocked Koha::Schema/Koha::Database my $db = Test::MockModule->new('Koha::Database'); --- a/t/Koha.t +++ a/t/Koha.t @@ -33,12 +33,7 @@ BEGIN { use_ok('C4::Koha'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Branch' ; +use Test::DBIx::Class; sub fixtures { my ( $libraries ) = @_; --- a/t/Letters.t +++ a/t/Letters.t @@ -30,12 +30,7 @@ BEGIN { } } -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Letter' ; +use Test::DBIx::Class; use t::lib::Mocks; fixtures_ok [ --- a/t/Matcher.t +++ a/t/Matcher.t @@ -35,12 +35,7 @@ BEGIN { use_ok('C4::Matcher'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'MarcMatcher' ; +use Test::DBIx::Class; fixtures_ok [ MarcMatcher => [ --- a/t/Members_AttributeTypes.t +++ a/t/Members_AttributeTypes.t @@ -32,12 +32,7 @@ BEGIN { use_ok('C4::Members::AttributeTypes'); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'BorrowerAttributeType', 'Category' ; +use Test::DBIx::Class; fixtures_ok [ Category => [ --- a/t/NorwegianPatronDB.t +++ a/t/NorwegianPatronDB.t @@ -60,12 +60,7 @@ BEGIN { } } -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Borrower', 'BorrowerSync'; +use Test::DBIx::Class {}, 'Borrower', 'BorrowerSync'; #Also loads those modules. # Make the code in the module use our mocked Koha::Schema/Koha::Database my $db = Test::MockModule->new('Koha::Database'); --- a/t/Prices.t +++ a/t/Prices.t @@ -20,12 +20,7 @@ use_ok('Koha::Number::Price'); t::lib::Mocks::mock_preference( 'gist', '0.02|0.05|0.196' ); -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Currency' ; +use Test::DBIx::Class; my $db = Test::MockModule->new('Koha::Database'); $db->mock( _new_schema => sub { return Schema(); } ); --- a/t/SocialData.t +++ a/t/SocialData.t @@ -34,12 +34,7 @@ BEGIN { use_ok('C4::SocialData'); } -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'SocialData', 'Biblioitem' ; +use Test::DBIx::Class; fixtures_ok [ Biblioitem => [ --- a/t/XSLT.t +++ a/t/XSLT.t @@ -27,7 +27,7 @@ use Module::Load::Conditional qw/check_install/; BEGIN { if ( check_install( module => 'Test::DBIx::Class' ) ) { - plan tests => 10; + plan tests => 9; } else { plan skip_all => "Need Test::DBIx::Class" } @@ -35,18 +35,7 @@ BEGIN { use_ok('C4::XSLT'); }; -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Branch' ; - -fixtures_ok [ - Branch => [ - ], -]; - +use Test::DBIx::Class; my $dir = File::Temp->newdir(); my @themes = ('prog', 'test'); --- a/t/db_dependent/Sitemapper.t +++ a/t/db_dependent/Sitemapper.t @@ -40,12 +40,7 @@ sub slurp { return $cont; } -use Test::DBIx::Class { - schema_class => 'Koha::Schema', - connect_info => ['dbi:SQLite:dbname=:memory:','',''], - connect_opts => { name_sep => '.', quote_char => '`', }, - fixture_class => '::Populate', -}, 'Biblio' ; +use Test::DBIx::Class; sub fixtures { my ( $data ) = @_; --