Merge pull request #298 from kidunot89/devops/stripe-test-skipped-pr

Skip conditional added to stripe test
wp-graphql · Jun 15, 2020 · 14f5316 · 14f5316
2 parents 13a5bf0 + 71c53da
commit 14f5316
Show file tree

Hide file tree

Showing 9 changed files with 161 additions and 168 deletions.
diff --git a/.github/workflows/testing-integration.yml b/.github/workflows/testing-integration.yml
@@ -16,6 +16,9 @@ on:
 
 jobs:
   run:
+    env:
+      STRIPE_API_PUBLISHABLE_KEY: ${{ secrets.STRIPE_API_PUBLISHABLE_KEY }}
+      STRIPE_API_SECRET_KEY: ${{ secrets.STRIPE_API_SECRET_KEY }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -53,15 +56,13 @@ jobs:
 
       - name: Run Tests w/ Docker.
         env:
-          STRIPE_API_PUBLISHABLE_KEY: ${{ secrets.STRIPE_API_PUBLISHABLE_KEY }}
-          STRIPE_API_SECRET_KEY: ${{ secrets.STRIPE_API_SECRET_KEY }}
           COVERAGE: ${{ matrix.coverage }}
           DEBUG: ${{ matrix.debug }}
           SKIP_TESTS_CLEANUP: ${{ matrix.coverage }}
         run: bin/run-docker.sh run -t
-      
+
       - name: Push Codecoverage to Coveralls.io
-        if: matrix.coverage == 1
+        if: ${{ matrix.coverage == 1 && env.STRIPE_API_PUBLISHABLE_KEY != 0 }}
         env:
           COVERALLS_RUN_LOCALLY: 1
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/includes/data/class-factory.php b/includes/data/class-factory.php
@@ -87,7 +87,7 @@ public static function resolve_crud_object( $id, AppContext $context ) {
 		if ( empty( $id ) || ! absint( $id ) ) {
 			return null;
 		}
-		
+
 		$context->getLoader( 'wc_cpt' )->buffer( array( $id ) );
 		return new Deferred(
 			function () use ( $id, $context ) {
@@ -121,7 +121,7 @@ public static function resolve_order_item( $item ) {
 	 *
 	 * @param string $id - Tax rate ID.
 	 * @param AppContext $context - AppContext object.
-	 * 
+	 *
 	 * @return Deferred object
 	 */
 	public static function resolve_tax_rate( $id, AppContext $context ) {
@@ -165,7 +165,7 @@ public static function resolve_shipping_method( $id ) {
 
 	/**
 	 * Checks if the WooCommerce Session needs to be (re)initialized.
-	 * 
+	 *
 	 * @return bool  True if (re)initialized.
 	 */
 	public static function maybe_initialize_session() {
@@ -208,7 +208,7 @@ public static function resolve_cart() {
 	 *
 	 * @param string     $key      Cart item key.
 	 * @param AppContext $context  AppContext object.
-	 * 
+	 *
 	 * @return Deferred object
 	 */
 	public static function resolve_cart_item( $key, AppContext $context ) {
@@ -244,7 +244,7 @@ public static function resolve_cart_fee( $id ) {
 	 *
 	 * @param int        $id       Downloadable item ID.
 	 * @param AppContext $context  AppContext object.
-	 * 
+	 *
 	 * @return Deferred object
 	 */
 	public static function resolve_downloadable_item( $id, AppContext $context ) {

diff --git a/includes/data/loader/class-wc-cpt-loader.php b/includes/data/loader/class-wc-cpt-loader.php
@@ -143,7 +143,7 @@ function ( $split, \WP_Query $query ) {
 			$context     = $this->context;
 			$customer_id = null;
 			$parent_id   = null;
-			
+
 			// Resolve post author for future capability checks.
 			switch ( $post_type ) {
 				case 'shop_order':

diff --git a/tests/_support/Helper/crud-helpers/cart.php b/tests/_support/Helper/crud-helpers/cart.php
@@ -8,6 +8,8 @@ public function to_relay_id( $id ) {
 	}
 
 	public function add( ...$products ) {
+		$keys = array();
+
 		foreach( $products as $product ) {
 			if ( gettype( $product ) === 'array' ) {
 				if ( empty( $product['product_id'] ) ) {
@@ -16,7 +18,7 @@ public function add( ...$products ) {
 					continue;
 				}
 
-				WC()->cart->add_to_cart(
+				$keys[] = WC()->cart->add_to_cart(
 					$product['product_id'],
 					! empty( $product['quantity'] ) ? $product['quantity'] : 1,
 					! empty( $product['variation_id'] ) ? $product['variation_id'] : 0,
@@ -27,6 +29,8 @@ public function add( ...$products ) {
 				WC()->cart->add_to_cart( $product, 1 );
 			}
 		}
+
+		return $keys;
 	}
 
 	public function print_query( $id = 0 ) {

diff --git a/tests/wpunit/CartMutationsTest.php b/tests/wpunit/CartMutationsTest.php
@@ -17,13 +17,10 @@ public function setUp() {
         $this->product      = $this->getModule('\Helper\Wpunit')->product();
         $this->variation    = $this->getModule('\Helper\Wpunit')->product_variation();
         $this->cart         = $this->getModule('\Helper\Wpunit')->cart();
-
-        // Clear cart.
-        WC()->cart->empty_cart( true );
     }
 
     public function tearDown() {
-        \WC()->cart->empty_cart();
+        \WC()->cart->empty_cart( true );
 
         parent::tearDown();
     }
@@ -170,7 +167,7 @@ public function testAddToCartMutationWithProduct() {
         $cart = WC()->cart;
         $cart_item = $cart->get_cart_item( $key );
         $this->assertNotEmpty( $cart_item );
-        
+
         // Check cart item data.
 		$expected = array(
 			'data' => array(
@@ -207,7 +204,7 @@ public function testAddToCartMutationWithProductVariation() {
 
         // use --debug flag to view.
         codecept_debug( $actual );
-        
+
         // Retrieve cart item key.
         $this->assertArrayHasKey('data', $actual );
         $this->assertArrayHasKey('addToCart', $actual['data'] );
@@ -319,7 +316,7 @@ public function testUpdateCartItemQuantitiesMutation() {
 
         // use --debug flag to view.
         codecept_debug( $actual );
-        
+
         // Check cart item data.
 		$expected = array(
 			'data' => array(
@@ -871,7 +868,7 @@ public function testApplyCouponMutationWithInvalidCoupons() {
 
         /**
          * Assertion One
-         * 
+         *
          * Can't pass coupon ID as coupon "code". Mutation should fail.
          */
         $variables = array(
@@ -895,7 +892,7 @@ public function testApplyCouponMutationWithInvalidCoupons() {
 
         /**
          * Assertion Two
-         * 
+         *
          * Can't pass expired coupon code. Mutation should fail.
          */
         $variables = array(
@@ -919,7 +916,7 @@ public function testApplyCouponMutationWithInvalidCoupons() {
 
         /**
          * Assertion Three
-         * 
+         *
          * Can't pass coupon already applied to the cart. Mutation should fail.
          */
         $variables = array(
@@ -1117,4 +1114,4 @@ public function testAddFeeMutation() {
 
         $this->assertEquals( $expected, $actual );
     }
-}
+}
diff --git a/tests/wpunit/CartQueriesTest.php b/tests/wpunit/CartQueriesTest.php
@@ -18,13 +18,10 @@ public function setUp() {
 		$this->variation_helper = $this->getModule('\Helper\Wpunit')->product_variation();
 		$this->coupon_helper    = $this->getModule('\Helper\Wpunit')->coupon();
 		$this->helper           = $this->getModule('\Helper\Wpunit')->cart();
-
-		// Clear cart.
-		WC()->cart->empty_cart( true );
 	}
 
 	public function tearDown() {
-		// your tear down methods here
+		WC()->cart->empty_cart( true );
 
 		// then
 		parent::tearDown();
@@ -168,7 +165,7 @@ public function testCartItemConnection() {
 
 		/**
 		 * Assertion Two
-		 * 
+		 *
 		 * Tests "needsShipping" parameter.
 		 */
 		$variables = array( 'needsShipping' => true );
@@ -203,7 +200,7 @@ public function testCartItemConnection() {
 
 		/**
 		 * Assertion Three
-		 * 
+		 *
 		 * Tests "needsShipping" parameter reversed.
 		 */
 		$variables = array( 'needsShipping' => false );
@@ -333,7 +330,7 @@ public function testCartItemPagination() {
 
 		/**
 		 * Assertion One
-		 * 
+		 *
 		 * Tests "first" parameter.
 		 */
 		$variables = array( 'first' => 2 );
@@ -370,7 +367,7 @@ function( $item ) {
 
 		/**
 		 * Assertion Two
-		 * 
+		 *
 		 * Tests "after" parameter.
 		 */
 		$variables = array(
@@ -410,7 +407,7 @@ function( $item ) {
 
 		/**
 		 * Assertion Three
-		 * 
+		 *
 		 * Tests "last" parameter.
 		 */
 		$variables = array( 'last' => 2 );
@@ -447,7 +444,7 @@ function( $item ) {
 
 		/**
 		 * Assertion Four
-		 * 
+		 *
 		 * Tests "before" parameter.
 		 */
 		$variables = array( 'last' => 4, 'before' => $cart_items[4] );
@@ -482,4 +479,4 @@ function( $item ) {
 
 		$this->assertEquals( $expected, $actual );
 	}
-}
+}