File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed
app/code/Magento/ImportExport Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -528,7 +528,8 @@ public function importSource()
528
528
$ this ->getErrorAggregator ()->getInvalidRowsCount (),
529
529
$ this ->getErrorAggregator ()->getErrorsCount ()
530
530
),
531
- __ ('The import was successful. ' ),
531
+ $ this ->getForceImport () == '0 ' && $ this ->getErrorAggregator ()->getErrorsCount () > 0 ?
532
+ __ ('The import was not successful. ' ) : __ ('The import was successful. ' ),
532
533
]
533
534
);
534
535
$ this ->importHistoryModel ->updateReport ($ this , true );
Original file line number Diff line number Diff line change @@ -268,6 +268,7 @@ protected function setUp(): void
268
268
'_getEntityAdapter '
269
269
]
270
270
)
271
+ ->addMethods (['getForceImport ' ])
271
272
->getMock ();
272
273
$ this ->setPropertyValue ($ this ->import , '_varDirectory ' , $ this ->_varDirectory );
273
274
}
@@ -302,6 +303,8 @@ public function testImportSource()
302
303
$ this ->import ->expects ($ this ->any ())
303
304
->method ('_getEntityAdapter ' )
304
305
->willReturn ($ this ->_entityAdapter );
306
+ $ this ->import ->expects ($ this ->once ())
307
+ ->method ('getForceImport ' );
305
308
$ this ->_importConfig
306
309
->expects ($ this ->any ())
307
310
->method ('getEntities ' )
You can’t perform that action at this time.
0 commit comments