Skip to content

Fix typo in test method's name and test result #15297

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
merged 4 commits into from
Jun 7, 2018
Merged

Fix typo in test method's name and test result #15297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
becbf6a
Fix typo in test method's name and test result
dmytro-ch May 18, 2018
629f650
Merge branch '2.2-develop' into fix/2.2-typo-in-test-method-name-and-…
dmytro-ch Jun 2, 2018
7715d65
Restore the deprecated method
dmytro-ch Jun 2, 2018
73afa84
Added @see tag to the deprecated method
rogyar Jun 5, 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
13 changes: 12 additions & 1 deletion dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,24 @@ public function selectShippingMethod(array $method)
* @param array $method
* @return bool
*/
public function isShippingMethodAvaiable(array $method)
public function isShippingMethodAvailable(array $method)
{
$this->waitForShippingRates();
$selector = sprintf($this->shippingMethod, $method['shipping_method'], $method['shipping_service']);
return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
}

/**
* @deprecated
* @see isShippingMethodAvailable
* @param array $method
* @return bool
*/
public function isShippingMethodAvaiable(array $method)
{
return $this->isShippingMethodAvailable($method);
}

/**
* Click continue button.
*
Expand Down
4 changes: 2 additions & 2 deletions ...ctional/tests/app/Magento/Shipping/Test/Constraint/AssertCityBasedShippingRateChanged.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $shippingMethod,
'Shipping rate has not been changed.'
);
}
$shippingAvailability = $isShippingAvailable ? 'avaiable' : 'unavailable';
$shippingAvailability = $isShippingAvailable ? 'available' : 'unavailable';
\PHPUnit_Framework_Assert::assertEquals(
$isShippingAvailable,
$checkoutOnepage->getShippingMethodBlock()->isShippingMethodAvaiable($shippingMethod),
$checkoutOnepage->getShippingMethodBlock()->isShippingMethodAvailable($shippingMethod),
"Shipping rates for {$shippingMethod['shipping_service']} should be $shippingAvailability."
);
}
Expand Down