Skip to content

[Forwardport] Corrected return message from ProductRuleTest.php #16853

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

Merged
magento-engcom-team merged 3 commits into from
Jul 29, 2018
Merged

[Forwardport] Corrected return message from ProductRuleTest.php #16853

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87a7a2c
Corrected return message from ProductRuleTest.php
sanganinamrata Jul 11, 2018
2513062
Corrected return message from SequenceManager.php
sanganinamrata Jul 11, 2018
864f742
Update ProductRuleTest.php
gelanivishal Jul 27, 2018
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: 1 addition & 1 deletion app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ public function testGetAccessTokenVerifierInvalid($verifier, $verifierFromToken)
public function dataProviderForGetAccessTokenVerifierInvalidTest()
{
// Verifier is not a string
return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesnt match']];
return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesn\'t match']];
}

public function testGetAccessToken()
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function testReindexWithProductNotVisibleIndividually()
$this->assertEquals(
7.5,
$this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
"Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
"Catalog price rule doesn't ap product with visibility value \"Not Visibility Individually\""
Copy link
Contributor

@ihor-sviziev ihor-sviziev Jul 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like mistake. This file wasn't changed in original PR

Copy link
Contributor

@gelanivishal gelanivishal Jul 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

);
}
}
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function force($entityType, $identifier)

if (!isset($sequenceInfo['sequenceTable'])) {
throw new \Exception(
'TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists'
'TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesn\'t exists'
);
}

Expand Down Expand Up @@ -101,7 +101,7 @@ public function delete($entityType, $identifier)
$metadata = $this->metadataPool->getMetadata($entityType);
$sequenceInfo = $this->sequenceRegistry->retrieve($entityType);
if (!isset($sequenceInfo['sequenceTable'])) {
throw new \Exception('TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists');
throw new \Exception('TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesn\'t exists');
}
try {
$connection = $this->appResource->getConnectionByName($metadata->getEntityConnectionName());
Expand Down