Merge pull request #104 from kschroeder/master

Added check payment method

composer.json

@@ -17,6 +17,9 @@
     "magium/magium": "~1.1",
     "zendframework/zend-uri": "^2.5"
   },
+  "require-dev": {
+      "phpunit/phpunit": "^5.7"
+  },
   "repositories" : [ {
     "type" : "composer",
     "url" : "https://packagist.org/"

lib/Magento/Actions/Admin/Configuration/Enabler.php

@@ -41,7 +41,7 @@ public function __construct(
 
     protected function setting($setting)
     {
-        $parts = explode('/', $setting);
+        $parts = explode('/', $setting, 2);
         $this->testCase->assertCount(2, $parts);
         $this->tab  = $parts[0];
         $this->section  = $parts[1];
@@ -92,4 +92,4 @@ public function disable($setting, $save = true)
 
     }
 
-}
+}

lib/Magento/Actions/Admin/Login/Login.php

@@ -56,6 +56,10 @@ public function login($username = null, $password = null)
             }
         } else {
             $this->openCommand->open($adminUrl);
+            $title = $this->webdriver->getTitle();
+            if (strpos($title, $this->testCase->getTranslator()->translate('Dashboard')) !== false) {
+                return;
+            }
         }
 
         $usernameElement = $this->webdriver->byXpath($this->theme->getLoginUsernameField());

lib/Magento/Actions/Checkout/PaymentMethods/CheckMoneyOrder.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Magium\Magento\Actions\Checkout\PaymentMethods;
+
+use Magium\Magento\AbstractMagentoTestCase;
+use Magium\WebDriver\WebDriver;
+
+class CheckMoneyOrder implements PaymentMethodInterface
+{
+
+    const ACTION = 'Checkout\PaymentMethods\CheckMoneyOrder';
+
+    protected $webDriver;
+    protected $testCase;
+
+    public function __construct(
+        WebDriver                   $webDriver,
+        AbstractMagentoTestCase     $testCase
+    ) {
+        $this->webDriver    = $webDriver;
+        $this->testCase     = $testCase;
+    }
+
+    public function getId()
+    {
+        return 'p_method_checkmo';
+    }
+
+    /**
+     * Fills in the payment form, selecting it, if necessary
+     *
+     * @param $requirePayment
+     */
+
+    public function pay($requirePayment)
+    {
+        if ($requirePayment) {
+            $this->testCase->assertElementExists($this->getId());
+        }
+
+        if ($this->webDriver->elementDisplayed($this->getId())) {
+            $element = $this->webDriver->byId($this->getId());
+            $this->webDriver->getMouse()->click($element->getCoordinates());
+        }
+    }
+}

lib/Magento/Navigators/Admin/SystemConfiguration.php

@@ -34,7 +34,7 @@ public function __construct(
 
     public function navigateTo($path)
     {
-        $instructions = explode('/', $path);
+        $instructions = explode('/', $path, 2);
         if (count($instructions) !== 2) {
             throw new InvalidInstructionException('System Configuration instructions need to be in the format of "Tab/Section"');
         }
@@ -57,4 +57,4 @@ public function navigateTo($path)
         }
     }
 
-}
+}

lib/Magento/Themes/Customer/AbstractThemeConfiguration.php

@@ -4,8 +4,9 @@
 
 
 use Magium\AbstractConfigurableElement;
+use Magium\Themes\ThemeConfigurationInterface;
 
-abstract class AbstractThemeConfiguration extends AbstractConfigurableElement
+abstract class AbstractThemeConfiguration extends AbstractConfigurableElement implements ThemeConfigurationInterface
 {
 
     public $accountNavigationXpath;

tests/Magento/Checkout/CheckMoneyOrderPaymentTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Magium\Magento\Checkout;
+
+use Magium\Magento\AbstractMagentoTestCase;
+use Magium\Magento\Actions\Admin\Configuration\Enabler;
+use Magium\Magento\Actions\Admin\Login\Login;
+use Magium\Magento\Actions\Cart\AddItemToCart;
+use Magium\Magento\Actions\Checkout\GuestCheckout;
+
+class CheckMoneyOrderPaymentTest extends AbstractMagentoTestCase
+{
+
+    public function testCheckMoneyOrder()
+    {
+        $this->getAction(Login::ACTION)->login();
+        $this->getAction(Enabler::ACTION)->enable('Payment Methods/Check / Money Order');
+
+        $this->commandOpen($this->getTheme()->getBaseUrl());
+        $this->getAction(AddItemToCart::ACTION)->addSimpleProductToCartFromCategoryPage();
+        $this->setPaymentMethod('CheckMoneyOrder');
+        $this->getAction(GuestCheckout::ACTION)->execute();
+    }
+
+    protected function tearDown()
+    {
+        $this->getAction(Login::ACTION)->login();
+        $this->getAction(Enabler::ACTION)->disable('Payment Methods/Check / Money Order');
+        parent::tearDown();
+    }
+
+}

tests/Magento/Checkout/SavedCCPaymentTest.php

@@ -26,7 +26,7 @@ protected function tearDown()
     {
         $this->getAction(Login::ACTION)->login();
         $this->getAction(Enabler::ACTION)->disable('Payment Methods/Saved CC');
-        parent::tearDown(); // TODO: Change the autogenerated stub
+        parent::tearDown();
     }
 
-}
+}

tests/Magento18/Checkout/CustomerCheckoutTest.php

@@ -12,4 +12,9 @@ protected function setUp()
         $this->switchThemeConfiguration('Magium\Magento\Themes\Magento18\ThemeConfiguration');
     }
 
-}
+    public function testCheckoutwithDifferentBillingAddress()
+    {
+        return parent::testCheckoutwithDifferentBillingAddress();
+    }
+
+}

tests/Magento18/Checkout/SavedCCPaymentTest.php

@@ -20,8 +20,8 @@ protected function setUp()
             \Magium\Magento\Themes\Admin\ThemeConfiguration::THEME
         )->set(
             'baseUrl',
-            $this->getTheme(ThemeConfiguration::THEME)->getBaseUrl() . 'admin/'
+            $this->getTheme(ThemeConfiguration::THEME)->getBaseUrl() . 'index.php/admin/'
         );
         $this->switchThemeConfiguration(ThemeConfiguration::THEME);
     }
-}
+}