@@ -17,7 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * @var AbstractThemeConfiguration |
| 19 | 19 | */ |
| 20 | - protected $theme; // Here for code completion assistance |
|
| 20 | + protected $theme; // Here for code completion assistance |
|
| 21 | 21 | |
| 22 | 22 | public function __construct(WebDriver $webDriver, AbstractTestCase $testCase, AbstractThemeConfiguration $theme) |
| 23 | 23 | { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | return $value; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | - throw new MissingValueException('Could not find the value for option: ' . $text); |
|
| 54 | + throw new MissingValueException('Could not find the value for option: '.$text); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | throw new UnparseableValueException('Unable to determine the link'); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - $linkElementXpath = $this->theme->getLayeredNavigationFilterLinkXpath($this->title) . sprintf('[@href="%s"]', $linkUrl); |
|
| 112 | + $linkElementXpath = $this->theme->getLayeredNavigationFilterLinkXpath($this->title).sprintf('[@href="%s"]', $linkUrl); |
|
| 113 | 113 | $linkElement = $this->webDriver->byXpath($linkElementXpath); |
| 114 | 114 | |
| 115 | 115 | $value = new FilterValue($linkElement, $text, $linkUrl, $count); |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if ($name === null) { |
| 108 | - throw new MissingSwatchNameException('Unable to extract the swatch name from HTML: ' . $element->getAttribute('innerHTML')); |
|
| 108 | + throw new MissingSwatchNameException('Unable to extract the swatch name from HTML: '.$element->getAttribute('innerHTML')); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | $isSwatch = $this->swatchProcessor->isConfigurableSwatch($count+1); |
@@ -27,19 +27,19 @@ |
||
| 27 | 27 | { |
| 28 | 28 | $translator = $this->testCase->getTranslator(); |
| 29 | 29 | $baseXpath = '//h4[contains(concat(" ",normalize-space(@class)," ")," head-products ")]/../../following-sibling::div[1]/descendant::tr[%d]'; |
| 30 | - $titleXpath = $baseXpath . '/descendant::div[contains(concat(" ",normalize-space(@class)," ")," item-text ")]/h5'; |
|
| 31 | - $skuXpath = $baseXpath . '/descendant::div[contains(concat(" ",normalize-space(@class)," ")," item-text ")]/div'; |
|
| 32 | - $itemStatusXpath = $baseXpath . '/td[2]'; |
|
| 33 | - $originalPriceXpath = $baseXpath . '/td[3]/span'; |
|
| 34 | - $priceXpath = $baseXpath . '/td[4]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 35 | - $orderedQtyXpath = $baseXpath . sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Ordered')); |
|
| 36 | - $invoicedQtyXpath = $baseXpath . sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Invoiced')); |
|
| 37 | - $shippedQtyXpath = $baseXpath . sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Shipped')); |
|
| 38 | - $subtotalXpath = $baseXpath . '/td[6]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 39 | - $taxXpath = $baseXpath . '/td[7]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 40 | - $taxPercentXpath = $baseXpath . '/td[8]'; |
|
| 41 | - $discountAmountXpath = $baseXpath . '/td[9]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 42 | - $rowTotalXpath = $baseXpath . '/td[10]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 30 | + $titleXpath = $baseXpath.'/descendant::div[contains(concat(" ",normalize-space(@class)," ")," item-text ")]/h5'; |
|
| 31 | + $skuXpath = $baseXpath.'/descendant::div[contains(concat(" ",normalize-space(@class)," ")," item-text ")]/div'; |
|
| 32 | + $itemStatusXpath = $baseXpath.'/td[2]'; |
|
| 33 | + $originalPriceXpath = $baseXpath.'/td[3]/span'; |
|
| 34 | + $priceXpath = $baseXpath.'/td[4]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 35 | + $orderedQtyXpath = $baseXpath.sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Ordered')); |
|
| 36 | + $invoicedQtyXpath = $baseXpath.sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Invoiced')); |
|
| 37 | + $shippedQtyXpath = $baseXpath.sprintf('/td[5]/descendant::td[.="%s"]/../td/strong', $translator->translate('Shipped')); |
|
| 38 | + $subtotalXpath = $baseXpath.'/td[6]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 39 | + $taxXpath = $baseXpath.'/td[7]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 40 | + $taxPercentXpath = $baseXpath.'/td[8]'; |
|
| 41 | + $discountAmountXpath = $baseXpath.'/td[9]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 42 | + $rowTotalXpath = $baseXpath.'/td[10]/descendant::span[contains(concat(" ",normalize-space(@class)," ")," price ")]'; |
|
| 43 | 43 | |
| 44 | 44 | $count = 2; // To take into account the order items header |
| 45 | 45 | while ($this->webDriver->elementExists(sprintf($skuXpath, $count), WebDriver::BY_XPATH)) { |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | { |
| 40 | 40 | $xpath = '//h4[contains(concat(" ",normalize-space(@class)," ")," head-payment-method ")]/../../descendant::fieldset'; |
| 41 | 41 | |
| 42 | - $currencyXpath = $xpath . '/div'; |
|
| 42 | + $currencyXpath = $xpath.'/div'; |
|
| 43 | 43 | |
| 44 | 44 | $currencyElement = $this->webDriver->byXpath($currencyXpath); |
| 45 | 45 | $currencyText = trim($currencyElement->getText()); |
@@ -1,4 +1,4 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -\Magium\Cli\CommandLoader::addCommandDir('Magium\Magento\Cli\Command', realpath(__DIR__ . '/lib/Magento/Cli/Command')); |
|
| 4 | -\Magium\Cli\Command\ListElements::addDirectory(realpath(__DIR__ . '/lib'), 'Magium'); |
|
| 5 | 3 | \ No newline at end of file |
| 4 | +\Magium\Cli\CommandLoader::addCommandDir('Magium\Magento\Cli\Command', realpath(__DIR__.'/lib/Magento/Cli/Command')); |
|
| 5 | +\Magium\Cli\Command\ListElements::addDirectory(realpath(__DIR__.'/lib'), 'Magium'); |
|
| 6 | 6 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | WebDriver $webDriver |
| 16 | 16 | ) |
| 17 | 17 | { |
| 18 | - $this->webDriver = $webDriver; |
|
| 18 | + $this->webDriver = $webDriver; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | public function wait() |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | const NAME = 'Saved CC'; |
| 9 | 9 | const ACTION = 'Admin\Configuration\PaymentMethods\SavedCC'; |
| 10 | 10 | |
| 11 | - protected $section = 'Payment Methods/' . self::NAME; |
|
| 11 | + protected $section = 'Payment Methods/'.self::NAME; |
|
| 12 | 12 | |
| 13 | 13 | protected $settings = [ |
| 14 | 14 | 'payment_ccsave_active' => 0, |
@@ -8,20 +8,20 @@ discard block |
||
| 8 | 8 | class ThemeConfiguration extends AbstractThemeConfiguration |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - public $accountNavigationXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," block-account ")]/descendant::a[.="%s"]'; |
|
| 11 | + public $accountNavigationXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," block-account ")]/descendant::a[.="%s"]'; |
|
| 12 | 12 | public $accountSectionHeaderXpath = '//div[contains(concat(" ",normalize-space(@class)," ")," col-main ")]/descendant::h1[.="%s"]'; |
| 13 | 13 | |
| 14 | - public $orderPageName = '{{My Orders}}'; |
|
| 14 | + public $orderPageName = '{{My Orders}}'; |
|
| 15 | 15 | |
| 16 | 16 | public $viewOrderLinkXpath = '//td[.="%s"]/../td/descendant::a[.="{{View Order}}"]'; |
| 17 | 17 | |
| 18 | - public $orderPageTitleContainsText = '{{Order}} #'; |
|
| 18 | + public $orderPageTitleContainsText = '{{Order}} #'; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @var array Instructions in an Xpath array syntax to get to the customer registration page |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | - public $registrationNavigationInstructions = [ |
|
| 24 | + public $registrationNavigationInstructions = [ |
|
| 25 | 25 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@class="account-cart-wrapper"]/descendant::span[.="Account"]'], |
| 26 | 26 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@id="header-account"]/descendant::a[@title="Register"]'] |
| 27 | 27 | ]; |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * @var array Instructions in an Xpath array syntax to get to the customer registration page |
| 31 | 31 | */ |
| 32 | 32 | |
| 33 | - public $logoutNavigationInstructions = [ |
|
| 33 | + public $logoutNavigationInstructions = [ |
|
| 34 | 34 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@class="account-cart-wrapper"]/descendant::span[.="Account"]'], |
| 35 | 35 | [\Magium\WebDriver\WebDriver::INSTRUCTION_MOUSE_CLICK, '//div[@id="header-account"]/descendant::a[@title="Log Out"]'] |
| 36 | 36 | ]; |
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | * @var string Xpath for the customer email form element |
| 50 | 50 | */ |
| 51 | 51 | |
| 52 | - public $loginUsernameField = '//input[@type="text" and @id="email"]'; |
|
| 52 | + public $loginUsernameField = '//input[@type="text" and @id="email"]'; |
|
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * @var string Xpath for the customer password form element |
| 56 | 56 | */ |
| 57 | 57 | |
| 58 | - public $loginPasswordField = '//input[@type="password" and @id="pass"]'; |
|
| 58 | + public $loginPasswordField = '//input[@type="password" and @id="pass"]'; |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -70,19 +70,19 @@ discard block |
||
| 70 | 70 | public $orderShippingMethod = '//h2[.="{{Shipping Method}}"]/../../descendant::div[contains(concat(" ",normalize-space(@class)," ")," box-content ")]'; |
| 71 | 71 | public $orderPaymentMethod = '//h2[.="{{Payment Method}}"]/../../descendant::div[contains(concat(" ",normalize-space(@class)," ")," box-content ")]'; |
| 72 | 72 | |
| 73 | - public $orderItemNameXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::h3[contains(concat(" ",normalize-space(@class)," ")," product-name ")]'; |
|
| 73 | + public $orderItemNameXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::h3[contains(concat(" ",normalize-space(@class)," ")," product-name ")]'; |
|
| 74 | 74 | public $orderItemSkuXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[2]'; |
| 75 | - public $orderItemPriceXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[3]/descendant::span[@class="price"]'; |
|
| 75 | + public $orderItemPriceXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[3]/descendant::span[@class="price"]'; |
|
| 76 | 76 | public $orderItemQtyXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[4]'; |
| 77 | 77 | |
| 78 | 78 | public $orderItemQtyOrderedRegex = '/{{Ordered}}:\s+(\d+)/'; |
| 79 | 79 | public $orderItemQtyShippedRegex = '/{{Shipped}}:\s+(\d+)/'; |
| 80 | 80 | |
| 81 | - public $orderItemSubtotalXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[5]/descendant::span[@class="price"]'; |
|
| 81 | + public $orderItemSubtotalXpath = '//table[@id="my-orders-table"]/tbody/tr[%d]/descendant::td[5]/descendant::span[@class="price"]'; |
|
| 82 | 82 | |
| 83 | 83 | public $orderSubtotalXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," subtotal ")]/td[2]/span[@class="price"]'; |
| 84 | 84 | public $orderShippingAndHandlingXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," shipping ")]/td[2]/span[@class="price"]'; |
| 85 | - public $orderTaxXpath = '//table[@id="my-orders-table"]/descendant::td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/following-sibling::td[1]/span[@class="price"]'; |
|
| 85 | + public $orderTaxXpath = '//table[@id="my-orders-table"]/descendant::td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/following-sibling::td[1]/span[@class="price"]'; |
|
| 86 | 86 | public $orderGrandTotalXpath = '//table[@id="my-orders-table"]/descendant::tr[contains(concat(" ",normalize-space(@class)," ")," grand_total ")]/td[2]/descendant::span[@class="price"]'; |
| 87 | 87 | |
| 88 | 88 | public $orderDateXpath = '//p[@class="order-date"]'; |