Skip to content

Fix for #39767 #39768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: 2.4-develop
Choose a base branch
from
Open

Fix for #39767 #39768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c287ba
Fix for #39767
Mar 27, 2025
f7b9481
Fix-For- #39767 - Updating Unit Test
senthilengg Mar 27, 2025
d3af9e5
Merge branch '2.4-develop' into FixFor39767
senthilengg Mar 28, 2025
87d0df5
Merge branch '2.4-develop' into FixFor39767
senthilengg Apr 3, 2025
17c36ec
Merge branch '2.4-develop' into FixFor39767
senthilengg Apr 3, 2025
e6f96bc
Merge branch '2.4-develop' into FixFor39767
senthilengg Apr 4, 2025
d1c8b22
Merge branch '2.4-develop' into FixFor39767
senthilengg Apr 7, 2025
d8952b0
Merge branch '2.4-develop' into FixFor39767
senthilengg Apr 15, 2025
82df4f6
Merge branch '2.4-develop' into FixFor39767
senthilengg May 3, 2025
8c81b7d
Merge branch '2.4-develop' into FixFor39767
senthilengg May 5, 2025
71aff43
Merge branch '2.4-develop' into FixFor39767
senthilengg May 21, 2025
38df8d8
Merge branch '2.4-develop' into FixFor39767
senthilengg Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/code/Magento/ImportExport/Model/Import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,6 @@ private function importSourceCallback()
{
$ids = $this->getImportIds();
$this->_getEntityAdapter()->setIds($ids);
$this->setData('entity', $this->getDataSourceModel()->getEntityTypeCode($ids));
$this->setData('behavior', $this->getDataSourceModel()->getBehavior($ids));

//Validating images temporary directory path if the constraint has been provided
if ($this->hasData('images_base_directory')
Expand Down
6 changes: 0 additions & 6 deletions app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ public function testImportSource()
->method('getEntityTypeCode')
->willReturn($entityTypeCode);
$behaviour = 'behaviour';
$this->_importData->expects($this->once())
->method('getBehavior')
->willReturn($behaviour);
$this->import->expects($this->any())
->method('getDataSourceModel')
->willReturn($this->_importData);
Expand Down Expand Up @@ -389,9 +386,6 @@ public function testImportSourceException()
->method('getEntityTypeCode')
->willReturn($entityTypeCode);
$behaviour = 'behaviour';
$this->_importData->expects($this->any())
->method('getBehavior')
->willReturn($behaviour);
$this->import->expects($this->any())
->method('getDataSourceModel')
->willReturn($this->_importData);
Expand Down