Bug 15774: (follow-up) Address QA issues

[koha.git] / t / Members_AttributeTypes.t

diff --git a/t/Members_AttributeTypes.t b/t/Members_AttributeTypes.t
index 055e767..42b04d5 100755 (executable)
--- a/t/Members_AttributeTypes.t
+++ b/t/Members_AttributeTypes.t
@@ -1,21 +1,38 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Tests 'fetch', 'fake db data', and 'checks for existant attributes'
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
+
 use Test::MockModule;
-use Test::More tests => 10;
+use Test::More;
+
+use Module::Load::Conditional qw/check_install/;
 
 BEGIN {
-    use_ok('C4::Members::AttributeTypes');
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 8;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
+    }
 }
 
-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_ok('C4::Members::AttributeTypes');
+
+use Test::DBIx::Class;
 
 fixtures_ok [
     Category => [
@@ -26,13 +43,13 @@ fixtures_ok [
     [
         'code',             'description',
         'repeatable',       'unique_id',
-        'opac_display',     'password_allowed',
+        'opac_display',
         'staff_searchable', 'authorised_value_category',
         'display_checkout', 'category_code',
         'class'
     ],
-    [ 'one', 'ISBN', '1', '1', '1', '1', '1', 'red',  '1', 'orange', 'green' ],
-    [ 'two', 'ISSN', '0', '0', '0', '0', '0', 'blue', '0', 'yellow', 'silver' ]
+    [ 'one', 'ISBN', '1', '1', '1', '1', 'red',  '1', 'orange', 'green' ],
+    [ 'two', 'ISSN', '0', '0', '0', '0', 'blue', '0', 'yellow', 'silver' ]
 
     ],
 ], 'add fixtures';
@@ -52,14 +69,6 @@ is( $members_attributetypes[0]->{'class'},
 is( $members_attributetypes[1]->{'class'},
     'silver', 'Second class value is silver' );
 
-ok( C4::Members::AttributeTypes::AttributeTypeExists('one'),
-    'checking an attribute type exists' );
-
-ok(
-    !C4::Members::AttributeTypes::AttributeTypeExists('three'),
-    "checking a attribute that isn't in the code doesn't exist"
-);
-
 ok( C4::Members::AttributeTypes->fetch('one'), "testing fetch feature" );
 
 ok( !C4::Members::AttributeTypes->fetch('FAKE'),