Merge pull request #61 from tddwizard/fixing-stuff

Final changes for 1.0.0 version

Author: schmengler

.travis/before_script.sh

@@ -28,6 +28,11 @@ composer config repositories.travis_to_test git https://github.com/$TRAVIS_REPO_
 if [ ! -z $TRAVIS_TAG  ]
 then
     composer require ${COMPOSER_PACKAGE_NAME}:${TRAVIS_TAG}
+elif [ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]
+then
+    # For pull requests, use the remote repository
+    composer config repositories.travis_to_test git https://github.com/${TRAVIS_PULL_REQUEST_SLUG}.git
+    composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_PULL_REQUEST_BRANCH}\#${TRAVIS_PULL_REQUEST_SHA}
 else
     composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_BRANCH}\#${TRAVIS_COMMIT}
 fi

README.md

@@ -1,12 +1,5 @@
 # TddWizard Fixture library
 
-This library is in *alpha* state, that means:
-
-- it's super incomplete
-- nothing is guaranteed to work
-- everything can still be changed
-
-
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
 [![Build Status][ico-travis]][link-travis]
@@ -16,6 +9,10 @@ This library is in *alpha* state, that means:
 
 ---
 
+Magento 2 Fixtures by Fabian Schmengler
+
+🧙🏻‍♂ https://tddwizard.com/
+
 ## What is it?
 
 An alternative to the procedural script based fixtures in Magento 2 integration tests.

composer.json

@@ -42,7 +42,7 @@
         "magento/module-payment": "^100.3",
         "magento/module-quote": "^101.1",
         "magento/module-sales": "^102.0|^103.0",
-        "fzaninotto/faker": "^v1.9.0"
+        "fzaninotto/faker": "^1.8.0"
     },
     "require-dev": {
         "ext-json": "*",

src/Catalog/CategoryBuilder.php

@@ -99,7 +99,7 @@ public static function childCategoryOf(
 
         $category->setName('Child Category');
         $category->setIsActive(true);
-        $category->setPath($parent->getCategory()->getPath());
+        $category->setPath((string)$parent->getCategory()->getPath());
 
         return new self(
             $objectManager->create(CategoryRepositoryInterface::class),

src/Catalog/CategoryFixture.php

@@ -35,7 +35,7 @@ public function getUrlKey(): string
     {
         /** @var Category $category */
         $category = $this->category;
-        return $category->getUrlKey();
+        return (string)$category->getUrlKey();
     }
 
     public function rollback(): void

src/Catalog/CategoryFixturePool.php

@@ -34,7 +34,7 @@ public function get($key = null): CategoryFixture
         if ($key === null) {
             $key = \array_key_last($this->categoryFixtures);
         }
-        if (!array_key_exists($key, $this->categoryFixtures)) {
+        if ($key === null || !array_key_exists($key, $this->categoryFixtures)) {
             throw new \OutOfBoundsException('No matching category found in fixture pool');
         }
         return $this->categoryFixtures[$key];

src/Catalog/ProductBuilder.php

@@ -144,6 +144,14 @@ public static function aSimpleProduct(): ProductBuilder
         );
     }
 
+    public static function aVirtualProduct(): ProductBuilder
+    {
+        $builder = self::aSimpleProduct();
+        $builder->product->setName('Virtual Product');
+        $builder->product->setTypeId(Type::TYPE_VIRTUAL);
+        return $builder;
+    }
+
     /**
      * @param mixed[] $data
      * @return ProductBuilder
@@ -346,12 +354,4 @@ private static function isTransactionException($exception): bool
             $exception->getMessage()
         );
     }
-
-    public static function aVirtualProduct(): ProductBuilder
-    {
-        $builder = self::aSimpleProduct();
-        $builder->product->setName('Virtual Product');
-        $builder->product->setTypeId(Type::TYPE_VIRTUAL);
-        return $builder;
-    }
 }

src/Catalog/ProductFixturePool.php

@@ -34,7 +34,7 @@ public function get($key = null): ProductFixture
         if ($key === null) {
             $key = \array_key_last($this->productFixtures);
         }
-        if (!array_key_exists($key, $this->productFixtures)) {
+        if ($key === null || !array_key_exists($key, $this->productFixtures)) {
             throw new \OutOfBoundsException('No matching product found in fixture pool');
         }
         return $this->productFixtures[$key];

src/Checkout/CustomerCheckout.php

@@ -9,7 +9,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteManagement;
-use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
 use Magento\TestFramework\Helper\Bootstrap;
 
 class CustomerCheckout
@@ -158,10 +158,10 @@ private function getPaymentMethodCode(): string
     }
 
     /**
-     * @return OrderInterface
+     * @return Order
      * @throws \Exception
      */
-    public function placeOrder(): OrderInterface
+    public function placeOrder(): Order
     {
         $this->saveBilling();
         $this->saveShipping();
@@ -171,6 +171,10 @@ public function placeOrder(): OrderInterface
         // Collect missing totals, like shipping
         $reloadedQuote->collectTotals();
         $order = $this->quoteManagement->submit($reloadedQuote);
+        if (! $order instanceof Order) {
+            $returnType = is_object($order) ? get_class($order) : gettype($order);
+            throw new \RuntimeException('QuoteManagement::submit() returned ' . $returnType . ' instead of Order');
+        }
         $this->cart->getCheckoutSession()->clearQuote();
         return $order;
     }

src/Customer/CustomerBuilder.php

@@ -208,7 +208,7 @@ function (AddressBuilder $addressBuilder) {
          * Magento automatically sets random confirmation key for new account with password.
          * We need to save again with our own confirmation (null for confirmed customer)
          */
-        $customer->setConfirmation($builder->customer->getConfirmation());
+        $customer->setConfirmation((string)$builder->customer->getConfirmation());
         return $builder->customerRepository->save($customer);
     }