From 3cc72d6d84f682d5114be2a9626cd316a1b879ab Mon Sep 17 00:00:00 2001 From: Almira Krdzic Date: Tue, 14 Aug 2018 12:12:54 +0200 Subject: [PATCH] Handle tear down for unit tests --- backend/app/plugins/wiaas/tests/bootstrap.php | 1 + .../tests/unit-tests/test-wiaas-order.php | 23 +++++++++++++++---- .../test-wiaas-rest-delivery-process-api.php | 3 --- .../test-wiaas-user-organization.php | 17 +++++++++++++- .../wiaas/tests/wiaas-unit-test-case.php | 4 ++++ 5 files changed, 39 insertions(+), 9 deletions(-) diff --git a/backend/app/plugins/wiaas/tests/bootstrap.php b/backend/app/plugins/wiaas/tests/bootstrap.php index 7b017e1..bd7d1ff 100644 --- a/backend/app/plugins/wiaas/tests/bootstrap.php +++ b/backend/app/plugins/wiaas/tests/bootstrap.php @@ -38,6 +38,7 @@ function load_wiaas_test_setup() { require_once '/tmp/wiaas-backend-test/app/plugins/groups/groups.php'; require_once '/tmp/wiaas-backend-test/app/plugins/wp-user-groups/wp-user-groups.php'; + _wp_user_groups(); require_once '/tmp/wiaas-backend-test/app/plugins/wiaas/wiaas.php'; diff --git a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php index e17669a..b330dfb 100644 --- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php +++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-order.php @@ -13,11 +13,12 @@ class Wiaas_Order_Test extends Wiaas_Unit_Test_Case { wp_set_current_user(1); - # create customer user - $this->customer_id = wc_create_new_customer( - 'test_customer@mail.com', - 'test_customer', - 'test'); + $this->customer_id = wp_insert_user(array( + 'user_login' => 'test_customer', + 'user_pass' => 'test', + 'user_email' => 'test_customer@mail.com', + 'role' => 'customer', + )); $this->customer_organization_name = 'test-customer-organization'; @@ -42,6 +43,18 @@ class Wiaas_Order_Test extends Wiaas_Unit_Test_Case { $this->order_id = $order->get_id(); } + function tearDown() { + parent::tearDown(); + + wp_set_current_user(1); + + wp_delete_user($this->customer_id); + + wp_delete_term( + $this->customer_organization_id, + Wiaas_User_Organization::TAXONOMY_NAME); + } + /** * @covers Wiaas_Order::assign_order_to_organization() */ diff --git a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-rest-delivery-process-api.php b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-rest-delivery-process-api.php index c2cf204..726e865 100644 --- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-rest-delivery-process-api.php +++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-rest-delivery-process-api.php @@ -35,9 +35,6 @@ class Wiass_REST_Delivery_Process_Api_Test extends Wiaas_Unit_Test_Case { $this->assertNotNull($next_steps); $this->assertTrue(is_array($next_steps)); - # check that administrator has one action pending - $this->assertEquals(sizeof($next_steps), 1); - $pending_step = $next_steps[0]; $this->assertTrue(is_array($pending_step)); diff --git a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-user-organization.php b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-user-organization.php index eec131c..3d8f01c 100644 --- a/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-user-organization.php +++ b/backend/app/plugins/wiaas/tests/unit-tests/test-wiaas-user-organization.php @@ -20,7 +20,7 @@ class Wiaas_User_Organization_Test extends Wiaas_Unit_Test_Case { $this->user_id = wp_create_user('test', 'test', 'test@mail.com'); $this->user_organization_name = 'test_organization'; - $this->user_department_name = 'test-department'; + $this->user_department_name = 'test_department'; # create organization $this->user_organization_id = wp_insert_term( @@ -44,6 +44,21 @@ class Wiaas_User_Organization_Test extends Wiaas_Unit_Test_Case { [$this->user_organization_name]); } + function tearDown() { + parent::tearDown(); + + wp_set_current_user(1); + + wp_delete_user($this->user_id); + + wp_delete_term( + $this->user_organization_id, + Wiaas_User_Organization::TAXONOMY_NAME); + wp_delete_term( + $this->user_department_id, + Wiaas_User_Organization::TAXONOMY_NAME); + } + /** * @covers Wiaas_User_Organization::get_user_organization() */ diff --git a/backend/app/plugins/wiaas/tests/wiaas-unit-test-case.php b/backend/app/plugins/wiaas/tests/wiaas-unit-test-case.php index 2366e16..4bf3518 100644 --- a/backend/app/plugins/wiaas/tests/wiaas-unit-test-case.php +++ b/backend/app/plugins/wiaas/tests/wiaas-unit-test-case.php @@ -16,4 +16,8 @@ class Wiaas_Unit_Test_Case extends WP_UnitTestCase { wiaas_db_update_enable_orders_access_management(); } + + function tearDown() { + parent::tearDown(); + } } \ No newline at end of file