Merge pull request Sylius#3953 from NeverResponse/province-filters-ga…

…lore [Addressing] Province rendering tweaks
pamil · Jan 22, 2016 · 2cd4891 · 2cd4891
2 parents 69c6e99 + ddea6df
commit 2cd4891
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Promotion/Checker/ShippingCountryRuleChecker.php b/Promotion/Checker/ShippingCountryRuleChecker.php
@@ -51,7 +51,7 @@ public function isEligible(PromotionSubjectInterface $subject, array $configurat
             return false;
         }
 
-        $country = $this->countryRepository->findOneBy(array('code' => $address->getCountry()));
+        $country = $this->countryRepository->findOneBy(array('code' => $address->getCountryCode()));
 
         if (!$country instanceof CountryInterface) {
             return false;

diff --git a/spec/Promotion/Checker/ShippingCountryRuleCheckerSpec.php b/spec/Promotion/Checker/ShippingCountryRuleCheckerSpec.php
@@ -52,7 +52,7 @@ function it_should_recognize_subject_as_not_eligible_if_country_does_not_match(
         RepositoryInterface $countryRepository
     ) {
         $country->getCode()->willReturn('IE');
-        $address->getCountry()->willReturn('IE');
+        $address->getCountryCode()->willReturn('IE');
         $subject->getShippingAddress()->willReturn($address);
 
         $countryRepository->findOneBy(array('code' => 'IE'))->willReturn($country);
@@ -68,7 +68,7 @@ function it_should_recognize_subject_as_eligible_if_country_match(
         RepositoryInterface $countryRepository
     ) {
         $country->getCode()->willReturn('IE');
-        $address->getCountry()->willReturn('IE');
+        $address->getCountryCode()->willReturn('IE');
         $subject->getShippingAddress()->willReturn($address);
 
         $country->getId()->willReturn(1);