@@ -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()); |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | $previousExpandXpath = ''; |
59 | 59 | $element = null; |
60 | 60 | foreach ($parts as $part) { |
61 | - $xpath .= '/' . $this->theme->getXTreeChildXpath($part); |
|
62 | - if(!$this->webDriver->elementExists($xpath, WebDriver::BY_XPATH)) { |
|
61 | + $xpath .= '/'.$this->theme->getXTreeChildXpath($part); |
|
62 | + if (!$this->webDriver->elementExists($xpath, WebDriver::BY_XPATH)) { |
|
63 | 63 | if ($previousExpandXpath) { |
64 | 64 | $this->testCase->assertElementExists($previousExpandXpath, WebDriver::BY_XPATH); |
65 | 65 | $this->webDriver->byXpath($previousExpandXpath)->click(); |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | $this->testCase->assertElementExists($xpath, WebDriver::BY_XPATH); |
71 | 71 | $element = $this->webDriver->byXpath($xpath); |
72 | 72 | if (!$element->isDisplayed()) { |
73 | - throw new ElementNotVisibleException('Node element is not visible and cannot be made visible: ' . $part); |
|
73 | + throw new ElementNotVisibleException('Node element is not visible and cannot be made visible: '.$part); |
|
74 | 74 | } |
75 | - $previousExpandXpath = $xpath . $this->theme->getXTreeChildNodeExpandPrefixXpath(); |
|
75 | + $previousExpandXpath = $xpath.$this->theme->getXTreeChildNodeExpandPrefixXpath(); |
|
76 | 76 | $xpath .= $this->theme->getXTreeChildNodePrefixXpath(); |
77 | 77 | } |
78 | 78 | $this->node = $element; |
@@ -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 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | ) |
47 | 47 | ); |
48 | 48 | } catch (\Exception $e) { |
49 | - throw new NoSuchShippingMethodException('Unable to find the shipping method: ' . $this->name); |
|
49 | + throw new NoSuchShippingMethodException('Unable to find the shipping method: '.$this->name); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | // Some products, such as virtual products, do not get shipped |
@@ -42,7 +42,7 @@ |
||
42 | 42 | |
43 | 43 | $this->form->execute($registerForNewsletter); |
44 | 44 | |
45 | - $submitElement = $this->webdriver->byXpath($this->theme->getRegisterSubmitXpath()); |
|
45 | + $submitElement = $this->webdriver->byXpath($this->theme->getRegisterSubmitXpath()); |
|
46 | 46 | |
47 | 47 | $submitElement->click(); |
48 | 48 |
@@ -66,7 +66,7 @@ |
||
66 | 66 | |
67 | 67 | $this->webDriver->byId('sagepaydirectpro_cc_owner')->clear(); |
68 | 68 | $this->webDriver->byId('sagepaydirectpro_cc_owner')->sendKeys( |
69 | - $this->customer->getBillingFirstName() . ' ' . $this->customer->getBillingLastName() |
|
69 | + $this->customer->getBillingFirstName().' '.$this->customer->getBillingLastName() |
|
70 | 70 | ); |
71 | 71 | |
72 | 72 | } |
@@ -38,7 +38,7 @@ |
||
38 | 38 | $emailElement = $this->webdriver->byXpath($this->theme->getRegisterEmailXpath()); |
39 | 39 | $passwordElement = $this->webdriver->byXpath($this->theme->getRegisterPasswordXpath()); |
40 | 40 | $confirmElement = $this->webdriver->byXpath($this->theme->getRegisterConfirmPasswordXpath()); |
41 | - $registerElement = $this->webdriver->byXpath($this->theme->getRegisterNewsletterXpath()); |
|
41 | + $registerElement = $this->webdriver->byXpath($this->theme->getRegisterNewsletterXpath()); |
|
42 | 42 | |
43 | 43 | $firstnameElement->sendKeys($this->customerIdentity->getFirstName()); |
44 | 44 | $lastnameElement->sendKeys($this->customerIdentity->getLastName()); |
@@ -36,9 +36,9 @@ |
||
36 | 36 | { |
37 | 37 | |
38 | 38 | usleep(500000); // Give the UI some time to update |
39 | - $xpath .= '/descendant::' . $this->themeConfiguration->getNavigationChildXPathSelector($path); |
|
39 | + $xpath .= '/descendant::'.$this->themeConfiguration->getNavigationChildXPathSelector($path); |
|
40 | 40 | |
41 | - $element = $this->webdriver->byXpath($xpath . '/a'); |
|
41 | + $element = $this->webdriver->byXpath($xpath.'/a'); |
|
42 | 42 | |
43 | 43 | $this->execute($element); |
44 | 44 |