Bugzilla – Attachment 108731 Details for
Bug 26250
Test suite does not pass if Elastic is used as search engine
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26250: StockRotationItems.t and StockRotationStages.t
Bug-26250-StockRotationItemst-and-StockRotationSta.patch (text/plain), 13.42 KB, created by
Nick Clemens (kidclamp)
on 2020-08-20 11:27:36 UTC
(
hide
)
Description:
Bug 26250: StockRotationItems.t and StockRotationStages.t
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2020-08-20 11:27:36 UTC
Size:
13.42 KB
patch
obsolete
>From 9321958882fa664ff7861c676281331e3c3501ca Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 19 Aug 2020 13:56:08 +0100 >Subject: [PATCH] Bug 26250: StockRotationItems.t and StockRotationStages.t > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > t/db_dependent/StockRotationItems.t | 137 +++++++++++++++++++++++++++-------- > t/db_dependent/StockRotationStages.t | 73 ++++++++++++------- > 2 files changed, 154 insertions(+), 56 deletions(-) > >diff --git a/t/db_dependent/StockRotationItems.t b/t/db_dependent/StockRotationItems.t >index 707842e4a5..7ec621a0ab 100644 >--- a/t/db_dependent/StockRotationItems.t >+++ b/t/db_dependent/StockRotationItems.t >@@ -40,13 +40,13 @@ subtest 'Basic object tests' => sub { > > $schema->storage->txn_begin; > >- my $itm = $builder->build({ source => 'Item' }); >+ my $itm = $builder->build_sample_item; > my $stage = $builder->build({ source => 'Stockrotationstage' }); > > my $item = $builder->build({ > source => 'Stockrotationitem', > value => { >- itemnumber_id => $itm->{itemnumber}, >+ itemnumber_id => $itm->itemnumber, > stage_id => $stage->{stage_id}, > }, > }); >@@ -60,7 +60,7 @@ subtest 'Basic object tests' => sub { > > # Relationship to rota > isa_ok( $sritem->itemnumber, 'Koha::Item', "Fetched related item." ); >- is( $sritem->itemnumber->itemnumber, $itm->{itemnumber}, "Related rota OK." ); >+ is( $sritem->itemnumber->itemnumber, $itm->itemnumber, "Related rota OK." ); > > # Relationship to stage > isa_ok( $sritem->stage, 'Koha::StockRotationStage', "Fetched related stage." ); >@@ -77,7 +77,13 @@ subtest 'Tests for needs_repatriating' => sub { > $schema->storage->txn_begin; > > # Setup a pristine stockrotation context. >- my $sritem = $builder->build({ source => 'Stockrotationitem' }); >+ my $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => >+ { itemnumber_id => $builder->build_sample_item->itemnumber } >+ } >+ ); > my $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->itemnumber->homebranch($dbitem->stage->branchcode_id); > $dbitem->itemnumber->holdingbranch($dbitem->stage->branchcode_id); >@@ -130,7 +136,13 @@ subtest 'Tests for needs_repatriating' => sub { > subtest "Tests for repatriate." => sub { > plan tests => 3; > $schema->storage->txn_begin; >- my $sritem = $builder->build({ source => 'Stockrotationitem' }); >+ my $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => >+ { itemnumber_id => $builder->build_sample_item->itemnumber } >+ } >+ ); > my $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->stage->position(1); > $dbitem->stage->duration(50); >@@ -151,18 +163,28 @@ subtest "Tests for needs_advancing." => sub { > $schema->storage->txn_begin; > > # Test behaviour of item freshly added to rota. >- my $sritem = $builder->build({ >- source => 'Stockrotationitem', >- value => { 'fresh' => 1, }, >- }); >+ my $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ 'fresh' => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ }, >+ } >+ ); > my $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > is($dbitem->needs_advancing, 1, "An item that is fresh will always need advancing."); > > # Setup a pristine stockrotation context. >- $sritem = $builder->build({ >- source => 'Stockrotationitem', >- value => { 'fresh' => 0,} >- }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ 'fresh' => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->itemnumber->homebranch($dbitem->stage->branchcode_id); > $dbitem->itemnumber->holdingbranch($dbitem->stage->branchcode_id); >@@ -209,10 +231,15 @@ subtest "Tests for advance." => sub { > plan tests => 15; > $schema->storage->txn_begin; > >- my $sritem = $builder->build({ >- source => 'Stockrotationitem', >- value => { 'fresh' => 1 } >- }); >+ my $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ 'fresh' => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > my $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->itemnumber->holdingbranch($dbitem->stage->branchcode_id); > my $dbstage = $dbitem->stage; >@@ -284,22 +311,43 @@ subtest "Tests for investigate (singular)." => sub { > $schema->storage->txn_begin; > > # Test brand new item's investigation ['initiation'] >- my $sritem = $builder->build({ source => 'Stockrotationitem', value => { fresh => 1 } }); >+ my $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ fresh => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > my $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > is($dbitem->investigate->{reason}, 'initiation', "fresh item initiates."); > > # Test brand new item at stagebranch ['initiation'] >- $sritem = $builder->build({ source => 'Stockrotationitem', value => { fresh => 1 } }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ fresh => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->itemnumber->homebranch($dbitem->stage->branchcode_id)->store; > $dbitem->itemnumber->holdingbranch($dbitem->stage->branchcode_id)->store; > is($dbitem->investigate->{reason}, 'initiation', "fresh item at stagebranch initiates."); > > # Test item not at stagebranch with branchtransfer history ['repatriation'] >- $sritem = $builder->build({ >- source => 'Stockrotationitem', >- value => { 'fresh' => 0,} >- }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ 'fresh' => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > my $dbtransfer = Koha::Item::Transfer->new({ > 'itemnumber' => $dbitem->itemnumber_id, >@@ -312,10 +360,15 @@ subtest "Tests for investigate (singular)." => sub { > is($dbitem->investigate->{reason}, 'repatriation', "older item repatriates."); > > # Test item at stagebranch with branchtransfer history ['not-ready'] >- $sritem = $builder->build({ >- source => 'Stockrotationitem', >- value => { 'fresh' => 0,} >- }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ 'fresh' => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbtransfer = Koha::Item::Transfer->new({ > 'itemnumber' => $dbitem->itemnumber_id, >@@ -330,7 +383,15 @@ subtest "Tests for investigate (singular)." => sub { > is($dbitem->investigate->{reason}, 'not-ready', "older item at stagebranch not-ready."); > > # Test item due for advancement ['advancement'] >- $sritem = $builder->build({ source => 'Stockrotationitem', value => { fresh => 0 } }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ fresh => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->indemand(0)->store; > $dbitem->stage->duration(50)->store; >@@ -350,7 +411,15 @@ subtest "Tests for investigate (singular)." => sub { > "Item ready for advancement."); > > # Test item due for advancement but in-demand ['in-demand'] >- $sritem = $builder->build({ source => 'Stockrotationitem', value => { fresh => 0 } }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ fresh => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->indemand(1)->store; > $dbitem->stage->duration(50)->store; >@@ -370,7 +439,15 @@ subtest "Tests for investigate (singular)." => sub { > "Item advances, but in-demand."); > > # Test item ready for advancement, but at wrong library ['repatriation'] >- $sritem = $builder->build({ source => 'Stockrotationitem', value => { fresh => 0 } }); >+ $sritem = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ fresh => 0, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } >+ } >+ ); > $dbitem = Koha::StockRotationItems->find($sritem->{itemnumber_id}); > $dbitem->indemand(0)->store; > $dbitem->stage->duration(50)->store; >diff --git a/t/db_dependent/StockRotationStages.t b/t/db_dependent/StockRotationStages.t >index c8b8a687b2..7c45a6fbf2 100644 >--- a/t/db_dependent/StockRotationStages.t >+++ b/t/db_dependent/StockRotationStages.t >@@ -165,18 +165,33 @@ subtest 'Relationship to stockrotationitems' => sub { > $schema->storage->txn_begin; > my $stage = $builder->build({ source => 'Stockrotationstage' }); > >- $builder->build({ >- source => 'Stockrotationitem', >- value => { stage_id => $stage->{stage_id} }, >- }); >- $builder->build({ >- source => 'Stockrotationitem', >- value => { stage_id => $stage->{stage_id} }, >- }); >- $builder->build({ >- source => 'Stockrotationitem', >- value => { stage_id => $stage->{stage_id} }, >- }); >+ $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ stage_id => $stage->{stage_id}, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ }, >+ } >+ ); >+ $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ stage_id => $stage->{stage_id}, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ }, >+ } >+ ); >+ $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ stage_id => $stage->{stage_id}, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ }, >+ } >+ ); > > my $srstage = Koha::StockRotationStages->find($stage->{stage_id}); > my $sritems = $srstage->stockrotationitems; >@@ -283,14 +298,17 @@ subtest 'Tests for investigate (singular)' => sub { > while ( my ( $code, $count ) = each %{$spec} ) { > my $cnt = 0; > while ( $cnt < $count ) { >- my $item = $builder->build({ >- source => 'Stockrotationitem', >- value => { >- stage_id => $stage1->{stage_id}, >- indemand => 0, >- fresh => 1, >+ my $item = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ stage_id => $stage1->{stage_id}, >+ indemand => 0, >+ fresh => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } > } >- }); >+ ); > my $dbitem = Koha::StockRotationItems->find($item); > $dbitem->itemnumber->homebranch($code) > ->holdingbranch($code)->store; >@@ -322,14 +340,17 @@ subtest 'Tests for investigate (singular)' => sub { > while ( my ( $code, $count ) = each %{$spec} ) { > my $cnt = 0; > while ( $cnt < $count ) { >- my $item = $builder->build({ >- source => 'Stockrotationitem', >- value => { >- stage_id => $stage2->{stage_id}, >- indemand => 0, >- fresh => 1, >+ my $item = $builder->build( >+ { >+ source => 'Stockrotationitem', >+ value => { >+ stage_id => $stage2->{stage_id}, >+ indemand => 0, >+ fresh => 1, >+ itemnumber_id => $builder->build_sample_item->itemnumber >+ } > } >- }); >+ ); > my $dbitem = Koha::StockRotationItems->find($item); > $dbitem->itemnumber->homebranch($code) > ->holdingbranch($code)->store; >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26250
:
108590
|
108591
|
108623
|
108627
|
108730
|
108731
|
109208
|
109209
|
109838