Bugzilla – Attachment 161495 Details for
Bug 30645
Generated DBIC query incorrect for API searches across joined extended attributes when several terms are passed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30645: (QA follow-up): Tidy
Bug-30645-QA-follow-up-Tidy.patch (text/plain), 26.66 KB, created by
Pedro Amorim
on 2024-01-26 09:36:04 UTC
(
hide
)
Description:
Bug 30645: (QA follow-up): Tidy
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2024-01-26 09:36:04 UTC
Size:
26.66 KB
patch
obsolete
>From d4cb71188b2ae5b77a55c620213f7ad8dbfbcf22 Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Fri, 26 Jan 2024 09:28:41 +0000 >Subject: [PATCH] Bug 30645: (QA follow-up): Tidy > >--- > t/db_dependent/selenium/patrons_search.t | 286 +++++++++++++++-------- > 1 file changed, 185 insertions(+), 101 deletions(-) > >diff --git a/t/db_dependent/selenium/patrons_search.t b/t/db_dependent/selenium/patrons_search.t >index 78ea22209c1..aace269d4c1 100755 >--- a/t/db_dependent/selenium/patrons_search.t >+++ b/t/db_dependent/selenium/patrons_search.t >@@ -25,13 +25,13 @@ our @cleanup; > our $DT_delay = 1; > > END { >- unless ( @cleanup ) { say "WARNING: Cleanup failed!" } >+ unless (@cleanup) { say "WARNING: Cleanup failed!" } > C4::Context->set_preference( 'dateformat', $original_dateformat ); > C4::Context->set_preference( 'DefaultPatronSearchFields', $original_DefaultPatronSearchFields ); > C4::Context->set_preference( 'DefaultPatronSearchMethod', $original_DefaultPatronSearchMethod ); > C4::Context->set_preference( 'PatronsPerPage', $original_PatronsPerPage ); > $_->delete for @cleanup; >-}; >+} > > use C4::Context; > >@@ -47,7 +47,7 @@ use t::lib::Selenium; > use t::lib::TestBuilder; > > eval { require Selenium::Remote::Driver; }; >-if ( $@ ) { >+if ($@) { > plan skip_all => "Selenium::Remote::Driver is needed for selenium tests."; > } else { > plan tests => 1; >@@ -63,17 +63,17 @@ my $schema = Koha::Database->schema; > subtest 'Search patrons' => sub { > plan tests => 28; > >- if ( Koha::Patrons->search({surname => {-like => "test_patron_%"}})->count ) { >+ if ( Koha::Patrons->search( { surname => { -like => "test_patron_%" } } )->count ) { > BAIL_OUT("Cannot run this test, data we need to create already exist in the DB"); > } > my @patrons; > my $borrowernotes = q|<strong>just 'a" note</strong> \123 â¤|; > my $borrowernotes_displayed = q|just 'a" note \123 â¤|; >- my $branchname = q|<strong>just 'another" library</strong> \123 â¤|; >- my $firstname = q|<strong>fir's"tname</strong> \123 â¤|; >- my $address = q|<strong>add'res"s</strong> \123 â¤|; >- my $email = q|a<strong>bad_email</strong>@example\123 â¤.com|; >- my $patron_category = $builder->build_object( >+ my $branchname = q|<strong>just 'another" library</strong> \123 â¤|; >+ my $firstname = q|<strong>fir's"tname</strong> \123 â¤|; >+ my $address = q|<strong>add'res"s</strong> \123 â¤|; >+ my $email = q|a<strong>bad_email</strong>@example\123 â¤.com|; >+ my $patron_category = $builder->build_object( > { > class => 'Koha::Patron::Categories', > value => { category_type => 'A' } >@@ -81,14 +81,12 @@ subtest 'Search patrons' => sub { > ); > push @cleanup, $patron_category; > >- my $library = $builder->build_object( >- { class => 'Koha::Libraries', value => { branchname => $branchname } } >- ); >+ my $library = $builder->build_object( { class => 'Koha::Libraries', value => { branchname => $branchname } } ); > push @cleanup, $library; > > for my $i ( 1 .. 25 ) { > push @patrons, >- $builder->build_object( >+ $builder->build_object( > { > class => 'Koha::Patrons', > value => { >@@ -101,7 +99,7 @@ subtest 'Search patrons' => sub { > email => $email, > } > } >- ); >+ ); > } > > push @patrons, $builder->build_object( >@@ -121,13 +119,11 @@ subtest 'Search patrons' => sub { > > unshift @cleanup, $_ for @patrons; > >- my $library_2 = $builder->build_object( >- { class => 'Koha::Libraries', value => { branchname => 'X' . $branchname } } >- ); >+ my $library_2 = >+ $builder->build_object( { class => 'Koha::Libraries', value => { branchname => 'X' . $branchname } } ); > push @cleanup, $library_2; > >- my $patron_27 = >- $builder->build_object( >+ my $patron_27 = $builder->build_object( > { > class => 'Koha::Patrons', > value => { >@@ -141,124 +137,156 @@ subtest 'Search patrons' => sub { > dateofbirth => '1980-06-17', > } > } >- ); >+ ); > unshift @cleanup, $patron_27; > > my $attribute_type = Koha::Patron::Attribute::Type->new( > { >- code => 'my code1', >- description => 'my description1', >- staff_searchable => 0, >+ code => 'my code1', >+ description => 'my description1', >+ staff_searchable => 0, > searched_by_default => 0 > } > )->store; > my $attribute_type_searchable_1 = Koha::Patron::Attribute::Type->new( > { >- code => 'my code2', >- description => 'my description2', >- opac_display => 1, >- staff_searchable => 1, >+ code => 'my code2', >+ description => 'my description2', >+ opac_display => 1, >+ staff_searchable => 1, > searched_by_default => 1 > } > )->store; > my $attribute_type_searchable_2 = Koha::Patron::Attribute::Type->new( > { >- code => 'my code3', >- description => 'my description3', >- opac_display => 1, >- staff_searchable => 1, >+ code => 'my code3', >+ description => 'my description3', >+ opac_display => 1, >+ staff_searchable => 1, > searched_by_default => 1 > } > )->store; > my $attribute_type_searchable_not_default = Koha::Patron::Attribute::Type->new( > { >- code => 'mycode4', >- description => 'my description4', >- opac_display => 1, >- staff_searchable => 1, >+ code => 'mycode4', >+ description => 'my description4', >+ opac_display => 1, >+ staff_searchable => 1, > searched_by_default => 0 > } > )->store; >- push @cleanup, $attribute_type, $attribute_type_searchable_1, $attribute_type_searchable_2, $attribute_type_searchable_not_default; >- >- $patrons[0]->extended_attributes([ >- { code => $attribute_type->code, attribute => 'test_attr_1' }, >- { code => $attribute_type_searchable_1->code, attribute => 'test_attr_2'}, >- { code => $attribute_type_searchable_2->code, attribute => 'test_attr_3'}, >- { code => $attribute_type_searchable_not_default->code, attribute => 'test_attr_4'}, >- ]); >- $patrons[1]->extended_attributes([ >- { code => $attribute_type->code, attribute => 'test_attr_1' }, >- { code => $attribute_type_searchable_1->code, attribute => 'test_attr_2'}, >- { code => $attribute_type_searchable_2->code, attribute => 'test_attr_3'}, >- { code => $attribute_type_searchable_not_default->code, attribute => 'test_attr_4'}, >- ]); >+ push @cleanup, $attribute_type, $attribute_type_searchable_1, $attribute_type_searchable_2, >+ $attribute_type_searchable_not_default; >+ >+ $patrons[0]->extended_attributes( >+ [ >+ { code => $attribute_type->code, attribute => 'test_attr_1' }, >+ { code => $attribute_type_searchable_1->code, attribute => 'test_attr_2' }, >+ { code => $attribute_type_searchable_2->code, attribute => 'test_attr_3' }, >+ { code => $attribute_type_searchable_not_default->code, attribute => 'test_attr_4' }, >+ ] >+ ); >+ $patrons[1]->extended_attributes( >+ [ >+ { code => $attribute_type->code, attribute => 'test_attr_1' }, >+ { code => $attribute_type_searchable_1->code, attribute => 'test_attr_2' }, >+ { code => $attribute_type_searchable_2->code, attribute => 'test_attr_3' }, >+ { code => $attribute_type_searchable_not_default->code, attribute => 'test_attr_4' }, >+ ] >+ ); > > my $total_number_of_patrons = Koha::Patrons->search->count; >- my $table_id = "memberresultst"; >+ my $table_id = "memberresultst"; > > $s->auth; >- C4::Context->set_preference('DefaultPatronSearchFields',""); >- C4::Context->set_preference('DefaultPatronSearchMethod',"contains"); >- my $searchable_attributes = Koha::Patron::Attribute::Types->search({ staff_searchable => 1 })->count(); >- my $PatronsPerPage = 15; >- my $nb_standard_fields = 13 + $searchable_attributes; # Standard fields, plus one searchable attribute >- C4::Context->set_preference('PatronsPerPage', $PatronsPerPage); >+ C4::Context->set_preference( 'DefaultPatronSearchFields', "" ); >+ C4::Context->set_preference( 'DefaultPatronSearchMethod', "contains" ); >+ my $searchable_attributes = Koha::Patron::Attribute::Types->search( { staff_searchable => 1 } )->count(); >+ my $PatronsPerPage = 15; >+ my $nb_standard_fields = 13 + $searchable_attributes; # Standard fields, plus one searchable attribute >+ C4::Context->set_preference( 'PatronsPerPage', $PatronsPerPage ); > $driver->get( $base_url . "/members/members-home.pl" ); > my @adv_options = $driver->find_elements('//select[@id="searchfieldstype"]/option'); >- is( scalar @adv_options, $nb_standard_fields + 1, 'All standard fields are searchable if DefaultPatronSearchFields not set. middle_name is there.'); >- is( $adv_options[0]->get_value(), 'standard', 'Standard search uses value "standard"'); >+ is( >+ scalar @adv_options, $nb_standard_fields + 1, >+ 'All standard fields are searchable if DefaultPatronSearchFields not set. middle_name is there.' >+ ); >+ is( $adv_options[0]->get_value(), 'standard', 'Standard search uses value "standard"' ); > my @filter_options = $driver->find_elements('//select[@id="searchfieldstype_filter"]/option'); >- is( scalar @filter_options, $nb_standard_fields + 1, 'All standard fields + middle_name are searchable by filter if DefaultPatronSearchFields not set'); >- is( $filter_options[0]->get_value(), 'standard', 'Standard filter uses hard coded value "standard" DefaultPatronSearchFields not set'); >- C4::Context->set_preference('DefaultPatronSearchFields',"firstname|initials"); >+ is( >+ scalar @filter_options, $nb_standard_fields + 1, >+ 'All standard fields + middle_name are searchable by filter if DefaultPatronSearchFields not set' >+ ); >+ is( >+ $filter_options[0]->get_value(), 'standard', >+ 'Standard filter uses hard coded value "standard" DefaultPatronSearchFields not set' >+ ); >+ C4::Context->set_preference( 'DefaultPatronSearchFields', "firstname|initials" ); > $driver->get( $base_url . "/members/members-home.pl" ); > @adv_options = $driver->find_elements('//select[@id="searchfieldstype"]/option'); >- is( scalar @adv_options, $nb_standard_fields, 'New option added when DefaultPatronSearchFields is populated with a field. Note that middle_name disappears, we do not want it if not part of DefaultPatronSearchFields'); >- is( $adv_options[0]->get_value(), 'standard', 'Standard search uses value "standard"'); >+ is( >+ scalar @adv_options, $nb_standard_fields, >+ 'New option added when DefaultPatronSearchFields is populated with a field. Note that middle_name disappears, we do not want it if not part of DefaultPatronSearchFields' >+ ); >+ is( $adv_options[0]->get_value(), 'standard', 'Standard search uses value "standard"' ); > @filter_options = $driver->find_elements('//select[@id="searchfieldstype_filter"]/option'); >- is( scalar @filter_options, $nb_standard_fields, 'New filter option added when DefaultPatronSearchFields is populated with a field'); >- is( $filter_options[0]->get_value(), 'standard', 'Standard filter uses value "standard"'); >+ is( >+ scalar @filter_options, $nb_standard_fields, >+ 'New filter option added when DefaultPatronSearchFields is populated with a field' >+ ); >+ is( $filter_options[0]->get_value(), 'standard', 'Standard filter uses value "standard"' ); > $driver->get( $base_url . "/members/members-home.pl" ); >- @adv_options = $driver->find_elements('//select[@id="searchfieldstype"]/option'); >+ @adv_options = $driver->find_elements('//select[@id="searchfieldstype"]/option'); > @filter_options = $driver->find_elements('//select[@id="searchfieldstype_filter"]/option'); >- is( scalar @adv_options, $nb_standard_fields, 'Invalid option not added when DefaultPatronSearchFields is populated with an invalid field'); >- is( scalar @filter_options, $nb_standard_fields, 'Invalid filter option not added when DefaultPatronSearchFields is populated with an invalid field'); >+ is( >+ scalar @adv_options, $nb_standard_fields, >+ 'Invalid option not added when DefaultPatronSearchFields is populated with an invalid field' >+ ); >+ is( >+ scalar @filter_options, $nb_standard_fields, >+ 'Invalid filter option not added when DefaultPatronSearchFields is populated with an invalid field' >+ ); > > # NOTE: We should probably ensure the bad field is removed from 'standard' search here, else searches are broken >- C4::Context->set_preference('DefaultPatronSearchFields',""); >+ C4::Context->set_preference( 'DefaultPatronSearchFields', "" ); > $driver->get( $base_url . "/members/members-home.pl" ); > $s->fill_form( { search_patron_filter => 'test_patron' } ); > $s->submit_form; > my $first_patron = $patrons[0]; > > sleep $DT_delay && $s->wait_for_ajax; >- my @td = $driver->find_elements('//table[@id="'.$table_id.'"]/tbody/tr/td'); >- like ($td[2]->get_text, qr[\Q$firstname\E], >+ my @td = $driver->find_elements( '//table[@id="' . $table_id . '"]/tbody/tr/td' ); >+ like( >+ $td[2]->get_text, qr[\Q$firstname\E], > 'Column "Name" should be the 3rd and contain the firstname correctly filtered' > ); >- like ($td[2]->get_text, qr[\Q$address\E], >+ like( >+ $td[2]->get_text, qr[\Q$address\E], > 'Column "Name" should be the 3rd and contain the address correctly filtered' > ); >- like ($td[2]->get_text, qr[\Q$email\E], >+ like( >+ $td[2]->get_text, qr[\Q$email\E], > 'Column "Name" should be the 3rd and contain the email address correctly filtered' > ); >- is( $td[4]->get_text, $branchname, >+ is( >+ $td[4]->get_text, $branchname, > 'Column "Library" should be the 6th and contain the html tags - they have been html filtered' > ); >- is( $td[9]->get_text, $borrowernotes_displayed, >+ is( >+ $td[9]->get_text, $borrowernotes_displayed, > 'Column "Circ note" should be the 10th and not contain the html tags - they have not been html filtered' > ); > > $driver->find_element( >- '//a[@href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=' >- . $first_patron->borrowernumber >- . '"]' )->click; >+ '//a[@href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=' >+ . $first_patron->borrowernumber >+ . '"]' )->click; > is( > $driver->get_title, > sprintf( > "Modify patron %s %s %s (%s) %s (%s) (%s) ⺠Patrons ⺠Koha", >- $first_patron->title, $first_patron->firstname, $first_patron->middle_name, $first_patron->othernames, $first_patron->surname, $first_patron->cardnumber, >+ $first_patron->title, $first_patron->firstname, $first_patron->middle_name, $first_patron->othernames, >+ $first_patron->surname, $first_patron->cardnumber, > $first_patron->category->description, > ), > 'Page title is correct after following modification link' >@@ -269,13 +297,31 @@ subtest 'Search patrons' => sub { > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; > >- $s->driver->find_element('//*[@id="'.$table_id.'_filter"]//input')->send_keys('test_patron'); >+ $s->driver->find_element( '//*[@id="' . $table_id . '_filter"]//input' )->send_keys('test_patron'); > sleep $DT_delay && $s->wait_for_ajax; >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 26, $total_number_of_patrons), 'Searching in standard brings back correct results' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( >+ 'Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 26, >+ $total_number_of_patrons >+ ), >+ 'Searching in standard brings back correct results' >+ ); > >- $s->driver->find_element('//table[@id="'.$table_id.'"]//th[@data-filter="libraries"]/select/option[@value="'.$library->branchcode.'"]')->click; >+ $s->driver->find_element( '//table[@id="' >+ . $table_id >+ . '"]//th[@data-filter="libraries"]/select/option[@value="' >+ . $library->branchcode >+ . '"]' )->click; > sleep $DT_delay && $s->wait_for_ajax; >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 25, $total_number_of_patrons), 'Filtering on library works in combination with main search' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( >+ 'Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 25, >+ $total_number_of_patrons >+ ), >+ 'Filtering on library works in combination with main search' >+ ); > > # Reset the filters > $driver->find_element('//form[@id="patron_search_form"]//*[@id="clear_search"]')->click(); >@@ -283,14 +329,24 @@ subtest 'Search patrons' => sub { > sleep $DT_delay && $s->wait_for_ajax; > > # And make sure all the patrons are present >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries', $PatronsPerPage, $total_number_of_patrons), 'Resetting filters works as expected' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries', $PatronsPerPage, $total_number_of_patrons ), >+ 'Resetting filters works as expected' >+ ); > > # Pattern terms must be split > $s->fill_form( { search_patron_filter => 'test patron' } ); > $s->submit_form; > > sleep $DT_delay && $s->wait_for_ajax; >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 26, $total_number_of_patrons) ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( >+ 'Showing 1 to %s of %s entries (filtered from %s total entries)', $PatronsPerPage, 26, >+ $total_number_of_patrons >+ ) >+ ); > $driver->find_element('//form[@id="patron_search_form"]//*[@id="clear_search"]')->click(); > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; >@@ -300,7 +356,11 @@ subtest 'Search patrons' => sub { > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; > >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('No entries to show (filtered from %s total entries)', $total_number_of_patrons), 'Searching on a non-searchable attribute returns no results' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'No entries to show (filtered from %s total entries)', $total_number_of_patrons ), >+ 'Searching on a non-searchable attribute returns no results' >+ ); > > # clear form > $driver->find_element('//form[@id="patron_search_form"]//*[@id="clear_search"]')->click(); >@@ -310,39 +370,62 @@ subtest 'Search patrons' => sub { > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; > >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons), 'Searching on a searchable attribute returns correct results' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons ), >+ 'Searching on a searchable attribute returns correct results' >+ ); > > # clear form > $driver->find_element('//form[@id="patron_search_form"]//*[@id="clear_search"]')->click(); > >- $s->fill_form( { search_patron_filter => 'test_attr_3' } ); # Terms must be split >+ $s->fill_form( { search_patron_filter => 'test_attr_3' } ); # Terms must be split > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; > >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons), 'Searching on a searchable attribute returns correct results' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons ), >+ 'Searching on a searchable attribute returns correct results' >+ ); > > # clear form > $driver->find_element('//form[@id="patron_search_form"]//*[@id="clear_search"]')->click(); > > # Search on searchable attribute as specific field, we expect 2 patrons > $s->fill_form( { search_patron_filter => 'test_attr_4' } ); >- $driver->find_element('//form[@id="patron_search_form"]//*[@id="searchfieldstype_filter"]//option[@value="_ATTR_'.$attribute_type_searchable_not_default->code.'"]')->click(); >+ $driver->find_element( '//form[@id="patron_search_form"]//*[@id="searchfieldstype_filter"]//option[@value="_ATTR_' >+ . $attribute_type_searchable_not_default->code >+ . '"]' )->click(); > $s->submit_form; > sleep $DT_delay && $s->wait_for_ajax; > >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons), 'Searching on a searchable attribute as a specific field returns correct results' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons ), >+ 'Searching on a searchable attribute as a specific field returns correct results' >+ ); > > # Refine search and search for test_patron in all the data using the DT global search > # No change in result expected, still 2 patrons >- $s->driver->find_element('//*[@id="'.$table_id.'_filter"]//input')->send_keys('test_patron'); >+ $s->driver->find_element( '//*[@id="' . $table_id . '_filter"]//input' )->send_keys('test_patron'); > sleep $DT_delay && $s->wait_for_ajax; >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons), 'Refining with DataTables search works to further filter the original query' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries (filtered from %s total entries)', 2, 2, $total_number_of_patrons ), >+ 'Refining with DataTables search works to further filter the original query' >+ ); > > # Adding the surname of the first patron in the "Name" column > # We expect only 1 result >- $s->driver->find_element('//table[@id="'.$table_id.'"]//input[@placeholder="Name search"]')->send_keys($patrons[0]->surname); >+ $s->driver->find_element( '//table[@id="' . $table_id . '"]//input[@placeholder="Name search"]' ) >+ ->send_keys( $patrons[0]->surname ); > sleep $DT_delay && $s->wait_for_ajax; >- is( $driver->find_element('//div[@id="'.$table_id.'_info"]')->get_text, sprintf('Showing 1 to %s of %s entries (filtered from %s total entries)', 1, 1, $total_number_of_patrons), 'Refining with header filters works to further filter the original query' ); >+ is( >+ $driver->find_element( '//div[@id="' . $table_id . '_info"]' )->get_text, >+ sprintf( 'Showing 1 to %s of %s entries (filtered from %s total entries)', 1, 1, $total_number_of_patrons ), >+ 'Refining with header filters works to further filter the original query' >+ ); > > subtest 'remember_search' => sub { > >@@ -356,8 +439,7 @@ subtest 'Search patrons' => sub { > my $patron_selected_text = $driver->find_element('//div[@id="table_search_selections"]/span')->get_text; > is( $patron_selected_text, "", "Patrons selected is not displayed" ); > >- my @checkboxes = $driver->find_elements( >- '//input[@type="checkbox"][@name="borrowernumber"]'); >+ my @checkboxes = $driver->find_elements('//input[@type="checkbox"][@name="borrowernumber"]'); > $checkboxes[2]->click; > $patron_selected_text = $driver->find_element('//div[@id="table_search_selections"]/span')->get_text; > is( $patron_selected_text, "Patrons selected: 1", "One patron selected" ); >@@ -368,8 +450,7 @@ subtest 'Search patrons' => sub { > > $driver->find_element('//*[@id="memberresultst_next"]')->click; > sleep $DT_delay && $s->wait_for_ajax; >- @checkboxes = $driver->find_elements( >- '//input[@type="checkbox"][@name="borrowernumber"]'); >+ @checkboxes = $driver->find_elements('//input[@type="checkbox"][@name="borrowernumber"]'); > $checkboxes[0]->click; > $patron_selected_text = $driver->find_element('//div[@id="table_search_selections"]/span')->get_text; > is( $patron_selected_text, "Patrons selected: 3", "Three patrons are selected" ); >@@ -389,8 +470,11 @@ subtest 'Search patrons' => sub { > $driver->find_element('//button[@id="add_to_patron_list_submit"]')->click; > sleep $DT_delay && $s->wait_for_ajax; > is( $driver->find_element('//*[@id="patron_list_dialog"]')->get_text, "Added 3 patrons to $patron_list_name." ); >- my $patron_list = $schema->resultset('PatronList')->search({ name => $patron_list_name })->next; >- is( $schema->resultset('PatronListPatron')->search({ patron_list_id => $patron_list->patron_list_id })->count, 3 ); >+ my $patron_list = $schema->resultset('PatronList')->search( { name => $patron_list_name } )->next; >+ is( >+ $schema->resultset('PatronListPatron')->search( { patron_list_id => $patron_list->patron_list_id } )->count, >+ 3 >+ ); > > $patron_list->delete; > }; >-- >2.30.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=161495">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30645
:
134253
|
154949
|
159414
|
159450
|
159651
|
159652
|
159675
|
159676
|
160208
|
160216
|
161495
|
161528
|
164982
|
165009
|
165010
|
165011