Merge pull request #34 from ionutcalara/master

Updated tests and version

Author: ionutcalara

paylikepayment.zip

@@ -4,7 +4,7 @@
  * @author    DerikonDevelopment <ionut@derikon.com>
  * @copyright Copyright (c) permanent, DerikonDevelopment
  * @license   Addons PrestaShop license limitation
- * @version   1.1.1
+ * @version   1.2.0
  * @link      http://www.derikon.com/
  *
  */

paylikepayment/controllers/front/paymentreturn.php

@@ -4,7 +4,7 @@
  * @author    DerikonDevelopment <ionut@derikon.com>
  * @copyright Copyright (c) permanent, DerikonDevelopment
  * @license   Addons PrestaShop license limitation
- * @version   1.1.1
+ * @version   1.2.0
  * @link      http://www.derikon.com/
  *
  */
@@ -28,7 +28,7 @@ class PaylikePayment extends PaymentModule {
 	public function __construct() {
 		$this->name      = 'paylikepayment';
 		$this->tab       = 'payments_gateways';
-		$this->version   = '1.1.1';
+		$this->version   = '1.2.0';
 		$this->author    = 'DerikonDevelopment';
 		$this->bootstrap = true;
 

paylikepayment/paylikepayment.php

@@ -26,7 +26,7 @@ class PrestashopQuickTest extends AbstractTestCase {
 	public function testUsdPaymentBeforeOrderInstant() {
 		$this->runner = new PrestashopRunner( $this );
 		$this->runner->ready( array(
-				'capture_mode'           => 'instant',
+				'capture_mode'           => 'delayed',
 			)
 		);
 	}

tests/PrestashopQuickTest.php

@@ -157,22 +157,6 @@ private function outputVersions() {
 	}
 
 
-	/**
-	 * @throws NoSuchElementException
-	 * @throws TimeOutException
-	 */
-	public function changeDecimal() {
-		$this->goToPage( 'wp-admin/admin.php?page=wc-settings', '#select2-prestashop_currency-container' );
-		$this->type( '#prestashop_price_decimal_sep', '.' );
-	}
-
-	/**
-	 *
-	 */
-	public function submitAdmin() {
-		$this->click( '#module_form_submit_btn' );
-	}
-
 	/**
 	 * @throws NoSuchElementException
 	 * @throws TimeOutException
@@ -189,25 +173,13 @@ private function directPayment() {
 		$this->finalPaylike();
 		$this->selectOrder();
 		if ( $this->capture_mode == 'delayed' ) {
-			$this->checkNoCaptureWarning();
 			$this->capture();
 		} else {
 			$this->refund();
 		}
 
 	}
 
-	/**
-	 * @throws NoSuchElementException
-	 * @throws TimeOutException
-	 * @throws UnexpectedTagNameException
-	 */
-	public function checkNoCaptureWarning() {
-		$this->moveOrderToStatus( 'Payment accepted' );
-		$text = $this->pluckElement( '.history-status tr td', 1 )->getText();
-		$messages = explode( "\n", $text );
-		$this->main_test->assertEquals( 'Remote payment accepted', $messages[0], "Not captured warning" );
-	}
 
 	/**
 	 * @param $status
@@ -216,10 +188,8 @@ public function checkNoCaptureWarning() {
 	 * @throws UnexpectedTagNameException
 	 */
 	public function moveOrderToStatus( $status ) {
-		$this->click( '#id_order_state_chosen' );
-		$this->type( ".chosen-search input", $status );
-		$this->pressEnter();
-		$this->click( 'submitState' );
+		$this->selectValueByLabel('#update_order_status_action_input',$status);
+		$this->click( '#update_order_status_action_btn' );
 	}
 
 	/**
@@ -228,17 +198,9 @@ public function moveOrderToStatus( $status ) {
 	 * @throws UnexpectedTagNameException
 	 */
 	public function capture() {
-		$this->selectValue( "#paylike_action", "capture" );
-		$this->click( '#submit_paylike_action' );
-		$this->waitElementDisappear( ".margin-form #submit_paylike_action.disabled" );
-		$this->waitForPageReload( function () {
-		}, 5000 );
-		$text = $this->pluckElement( '.history-status tr td', 1 )->getText();
-		if ( $text == 'Delivered' || $text == 'Delivered' ) {
-			$text = $this->pluckElement( '.history-status tr td', 1 )->getText();
-		}
-		$messages = explode( "\n", $text );
-		$this->main_test->assertEquals( 'Delivered', $messages[0], "Delivered" );
+		$this->moveOrderToStatus( 'Delivered' );
+		$text = $this->pluckElement( '.tab-content #historyTabContent tr td', 0 )->getText();
+		$this->main_test->assertEquals( 'Delivered', $text, "Payment captured" );
 	}
 
 	/**
@@ -364,10 +326,9 @@ public function popupPaylike() {
 	 * @throws TimeOutException
 	 */
 	public function selectOrder() {
-		$this->goToPage( "/index.php?controller=AdminOrders", '.btn-continue', true );
-        $this->click( ".btn-continue" );
-		$this->waitForElement( '.text-right .btn-group .icon-search-plus' );
-		$this->click( '.text-right .btn-group .icon-search-plus' );
+		$this->goToPage( "/index.php?controller=AdminOrders", '#page-header-desc-configuration-add', true );
+		$this->waitForElement( '.text-right .btn[data-original-title="View"]' );
+		$this->click( '.text-right .btn[data-original-title="View"]' );
 	}
 
 	/**
@@ -376,25 +337,14 @@ public function selectOrder() {
 	 * @throws UnexpectedTagNameException
 	 */
 	public function refund() {
-		$this->waitForElement( '#paylike_action' );
-		$this->selectValue( "#paylike_action", "refund" );
-		$refund = preg_match_all( '!\d+!', $this->getText( '.amount strong' ), $refund_value );
-		$refund_value = $refund_value[0];
-		$this->type( 'paylike_amount_to_refund', $refund_value[0] );
-		$this->click( '#submit_paylike_action' );
-		try {
-			$this->waitElementDisappear( ".margin-form #submit_paylike_action.disabled" );
-		} catch ( NoSuchElementException $e ) {
-			// the element may have already dissapeared
-		}
-		$this->waitForPageReload( function () {
-		}, 5000 );
-		$text = $this->pluckElement( '.history-status tr td', 1 )->getText();
-		if ( $text == 'Refunded' || $text == 'Refunded' ) {
-			$text = $this->pluckElement( '.history-status tr td', 1 )->getText();
-		}
-		$messages = explode( "\n", $text );
-		$this->main_test->assertEquals( 'Refunded', $messages[0], "Refunded" );
+		$this->waitForElement( '.partial-refund-display' );
+		$this->click('.partial-refund-display');
+		$this->type( '.refund-quantity', 1 );
+		$this->click( '#cancel_product_save' );
+
+		$this->waitForElement( '.alert.alert-success' );
+		$text = $this->pluckElement( '.alert.alert-success', 0 )->getText();
+		$this->main_test->assertEquals( 'Paylike: Transaction successfully Refunded.', $text, "Refunded" );
 	}
 
 	/**

tests/PrestashopRunner.php

@@ -149,6 +149,23 @@ public function selectValue($selectQuery, $value) {
         return $this;
     }
 
+	/**
+	 * set value from select by option label
+	 *
+	 * @param $selectQuery
+	 * @param $value
+	 *
+	 * @return $this
+	 * @throws NoSuchElementException
+	 * @throws \Facebook\WebDriver\Exception\UnexpectedTagNameException
+	 */
+	public function selectValueByLabel($selectQuery, $value) {
+		$select = new WebDriverSelect($this->find($selectQuery));
+		$select->selectByVisibleText($value);
+
+		return $this;
+	}
+
     /**
      * @param $selectQuery
      * @param $value