From b0577a18fba50dda42c2b4edcd332d9dc5e63ca2 Mon Sep 17 00:00:00 2001 From: Dima Uryvskiy Date: Fri, 10 Dec 2021 11:54:05 +0300 Subject: [PATCH] Update versions WP/WC in tests --- .github/workflows/woo.yml | 772 +++++++++++++++------------- tests/bin/install.sh | 27 +- tests/test-wc-retailcrm-history.php | 40 +- 3 files changed, 435 insertions(+), 404 deletions(-) diff --git a/.github/workflows/woo.yml b/.github/workflows/woo.yml index 6aeb99a..01c88c5 100644 --- a/.github/workflows/woo.yml +++ b/.github/workflows/woo.yml @@ -20,380 +20,425 @@ jobs: strategy: matrix: include: - - php-version: '5.3' - wp: '4.4' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' + # WordPress 5.3 + + - php-version: '7.0' + wp: '5.3' + phpunit-version: 'phpunit:6.4.3' + wc: '5.4.3' coverage: 1 - - php-version: '5.4' - wp: '4.4' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.4' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.4' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.4' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.4' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.4' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.4' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.4' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.5' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.5' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.5' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.5' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.5' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.5' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.5' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.5' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.5' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.6' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.6' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.6' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.6' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.6' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.6' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.6' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.6' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.6' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.7' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.7' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.7' - wc: '3.0.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.7' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.7' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.7' - wc: '3.1.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.7' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.4' - wp: '4.7' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.7' - wc: '3.2.0' - phpunit-version: 'phpunit:4.8.18' - - - php-version: '5.3' - wp: '4.8' - wc: '3.3.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.8' - wc: '3.3.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.8' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' - php-version: '7.1' - wp: '4.8' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' + wp: '5.3' + wc: '5.4.3' - php-version: '7.2' - wp: '4.8' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.3' - wp: '4.8' - wc: '3.4.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '5.6' - wp: '4.8' - wc: '3.4.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.8' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '4.8' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '4.8' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '4.8' - wc: '3.5.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.8' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '4.8' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '4.8' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '4.9' - wc: '3.3.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.9' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '4.9' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '4.9' - wc: '3.3.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '4.9' - wc: '3.4.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.9' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '4.9' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '4.9' - wc: '3.4.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '4.9' - wc: '3.5.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '4.9' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '4.9' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '4.9' - wc: '3.5.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '5.0' - wc: '3.6.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '5.0' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '5.0' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '5.0' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '5.1' - wc: '3.6.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '5.1' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '5.1' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '5.1' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '5.6' - wp: '5.2' - wc: '3.6.0' - phpunit-version: 'phpunit:4.8.18' - - php-version: '7.0' - wp: '5.2' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '5.2' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '5.2' - wc: '3.6.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '7.0' - wp: '5.1' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '5.1' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '5.1' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' - - - php-version: '7.0' - wp: '5.2' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.1' - wp: '5.2' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' - - php-version: '7.2' - wp: '5.2' - wc: '3.7.0' - phpunit-version: 'phpunit:6.4.3' + wp: '5.3' + wc: '5.4.3' + - php-version: '7.3' + wp: '5.3' + wc: '5.4.3' - php-version: '7.0' wp: '5.3' - wc: '3.8.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.5.3' - php-version: '7.1' wp: '5.3' - wc: '3.8.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.5.3' - php-version: '7.2' wp: '5.3' - wc: '3.8.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.3' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.3' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.3' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.3' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.3' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.3' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.3' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.3' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.3' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.3' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.3' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.3' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.3' + wc: '5.8.0' + + ## WordPress 5.4 + + - php-version: '7.0' + wp: '5.4' + wc: '5.4.3' + - php-version: '7.1' + wp: '5.4' + wc: '5.4.3' + - php-version: '7.2' + wp: '5.4' + wc: '5.4.3' + - php-version: '7.3' + wp: '5.4' + wc: '5.4.3' + + - php-version: '7.0' + wp: '5.4' + wc: '5.5.3' + - php-version: '7.1' + wp: '5.4' + wc: '5.5.3' + - php-version: '7.2' + wp: '5.4' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.4' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.4' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.4' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.4' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.4' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.4' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.4' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.4' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.4' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.4' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.4' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.4' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.4' + wc: '5.8.0' + + ## WordPress 5.5 + + - php-version: '7.0' + wp: '5.5' + wc: '5.4.3' + - php-version: '7.1' + wp: '5.5' + wc: '5.4.3' + - php-version: '7.2' + wp: '5.5' + wc: '5.4.3' + - php-version: '7.3' + wp: '5.5' + wc: '5.4.3' + + - php-version: '7.0' + wp: '5.5' + wc: '5.5.3' + - php-version: '7.1' + wp: '5.5' + wc: '5.5.3' + - php-version: '7.2' + wp: '5.5' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.5' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.5' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.5' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.5' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.5' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.5' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.5' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.5' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.5' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.5' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.5' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.5' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.5' + wc: '5.8.0' + + ## WordPress 5.6 + + - php-version: '7.0' + wp: '5.6' + wc: '5.4.3' + - php-version: '7.1' + wp: '5.6' + wc: '5.4.3' + - php-version: '7.2' + wp: '5.6' + wc: '5.4.3' + - php-version: '7.3' + wp: '5.6' + wc: '5.4.3' + + - php-version: '7.0' + wp: '5.6' + wc: '5.5.3' + - php-version: '7.1' + wp: '5.6' + wc: '5.5.3' + - php-version: '7.2' + wp: '5.6' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.6' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.6' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.6' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.6' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.6' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.6' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.6' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.6' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.6' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.6' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.6' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.6' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.6' + wc: '5.8.0' + + ## WordPress 5.7 + + - php-version: '7.0' + wp: '5.7' + wc: '5.4.3' + - php-version: '7.1' + wp: '5.7' + wc: '5.4.3' + - php-version: '7.2' + wp: '5.7' + wc: '5.4.3' + - php-version: '7.3' + wp: '5.7' + wc: '5.4.3' + + - php-version: '7.0' + wp: '5.7' + wc: '5.5.3' + - php-version: '7.1' + wp: '5.7' + wc: '5.5.3' + - php-version: '7.2' + wp: '5.7' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.7' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.7' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.7' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.7' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.7' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.7' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.7' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.7' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.7' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.7' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.7' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.7' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.7' + wc: '5.8.0' + + ## WordPress 5.8 - php-version: '7.0' wp: '5.8' - wc: '3.9.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.4.3' - php-version: '7.1' wp: '5.8' - wc: '3.9.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.4.3' - php-version: '7.2' wp: '5.8' - wc: '3.9.0' - phpunit-version: 'phpunit:6.4.3' + wc: '5.4.3' - php-version: '7.3' wp: '5.8' - wc: '3.9.0' - phpunit-version: 'phpunit:6.4.3' - + wc: '5.4.3' + + - php-version: '7.0' + wp: '5.8' + wc: '5.5.3' + - php-version: '7.1' + wp: '5.8' + wc: '5.5.3' + - php-version: '7.2' + wp: '5.8' + wc: '5.5.3' + - php-version: '7.3' + wp: '5.8' + wc: '5.5.3' + + - php-version: '7.0' + wp: '5.8' + wc: '5.6.1' + - php-version: '7.1' + wp: '5.8' + wc: '5.6.1' + - php-version: '7.2' + wp: '5.8' + wc: '5.6.1' + - php-version: '7.3' + wp: '5.8' + wc: '5.6.1' + + - php-version: '7.0' + wp: '5.8' + wc: '5.7.1' + - php-version: '7.1' + wp: '5.8' + wc: '5.7.1' + - php-version: '7.2' + wp: '5.8' + wc: '5.7.1' + - php-version: '7.3' + wp: '5.8' + wc: '5.7.1' + + - php-version: '7.0' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.8' + wc: '5.8.0' + + ## WordPress 5.8 and last WooCommerce NEED DELETE , TEST WC 5.9.0 !!! + + - php-version: '7.0' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.1' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.2' + wp: '5.8' + wc: '5.8.0' + - php-version: '7.3' + wp: '5.8' + wc: '5.8.0' + services: mysql: image: mysql:5.7 @@ -410,19 +455,27 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} + tools: composer, phpunit:6.4.3 + extensions: gd, mbstring, mysqli, zip, unzip, mcrypt, mysql, pdo_mysql, dom coverage: xdebug - tools: composer:v1, ${{ matrix.phpunit-version }} - extensions: gd, mbstring, mysqli, zip, mcrypt, mysql, pdo_mysql, dom + + - name: Tool versions + run: | + php --version + composer --version + phpunit --version - name: Install Woocommerce env: WP_VERSION: ${{ matrix.wp }} WC_VERSION: ${{ matrix.wc }} run: make install + - name: Run tests env: WP_VERSION: ${{ matrix.wp }} WC_VERSION: ${{ matrix.wc }} run: make test + - name: Coverage env: COVERAGE: ${{ matrix.coverage }} @@ -430,7 +483,6 @@ jobs: run: | make coverage bash <(curl -s https://codecov.io/bash) - deploy: needs: ['test'] if: success() && github.event_name == 'push' && github.repository_owner == 'retailcrm' && github.ref == 'refs/heads/master' @@ -441,7 +493,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '7.2' - tools: composer:v1 + tools: composer:v2 - name: Build release run: | git fetch origin --unshallow --tags @@ -479,4 +531,4 @@ jobs: make svn_push - name: Cleanup if: env.LAST_TAG != env.RELEASE_TAG - run: make remove_dir + run: make remove_dir \ No newline at end of file diff --git a/tests/bin/install.sh b/tests/bin/install.sh index c26fd04..b6b5b03 100644 --- a/tests/bin/install.sh +++ b/tests/bin/install.sh @@ -75,29 +75,8 @@ install_woocommerce() { cd /tmp git clone https://github.com/woocommerce/woocommerce.git cd woocommerce - php -r "copy('https://getcomposer.org/download/1.10.17/composer.phar', 'composer.phar');" - - if [[ ! $WC_VERSION == 'latest' ]]; then - # If we use php 5.3, we have problem with warning: CRLF will be replaced by LF in tests/legacy/unit-tests/importer/sample_update_product.csv. - # The solution is to remove this file, because we don't use it. - if [[ $PHP_VERSION == 5.3 ]]; then - rm -R tests/legacy/unit-tests/importer/sample_update_product.csv - fi - - git checkout $WC_VERSION - - version=($(echo $WC_VERSION | tr "." "\n")) - if [[ ${version[0]} -ge 3 && ${version[1]} -ge 7 ]]; then - php composer.phar install --ignore-platform-reqs - fi - fi - - if [[ $WC_VERSION == 'latest' ]]; then - php composer.phar install --ignore-platform-reqs - php composer.phar dump-autoload - php composer.phar update - fi - + git checkout $WC_VERSION + composer install --ignore-platform-reqs cd - fi } @@ -162,4 +141,4 @@ install_db() { install_wp install_test_suite install_woocommerce -install_db +install_db \ No newline at end of file diff --git a/tests/test-wc-retailcrm-history.php b/tests/test-wc-retailcrm-history.php index 4057e84..7f25640 100644 --- a/tests/test-wc-retailcrm-history.php +++ b/tests/test-wc-retailcrm-history.php @@ -429,10 +429,10 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper $this->assertEquals('Tester4867', $order->get_billing_last_name()); $this->assertEquals('tester4867@example.com', $order->get_billing_email()); $this->assertEquals('TestCompany3428769', $order->get_billing_company()); - $this->assertEquals('--', $order->get_shipping_city()); - $this->assertEquals('--', $order->get_shipping_postcode()); - $this->assertEquals('--', $order->get_shipping_state()); - $this->assertEquals('--', $order->get_shipping_country()); + $this->assertEquals('', $order->get_shipping_city()); + $this->assertEquals('', $order->get_shipping_postcode()); + $this->assertEquals('', $order->get_shipping_state()); + $this->assertEquals('', $order->get_shipping_country()); $this->assertEquals('', $order->get_billing_phone()); $this->assertEmpty($order->get_customer_id()); } @@ -494,10 +494,10 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper $this->assertEquals('Tester4867', $order->get_billing_last_name()); $this->assertEquals('tester4867@example.com', $order->get_billing_email()); $this->assertEquals('TestCompany017089465', $order->get_billing_company()); - $this->assertEquals('--', $order->get_shipping_city()); - $this->assertEquals('--', $order->get_shipping_postcode()); - $this->assertEquals('--', $order->get_shipping_state()); - $this->assertEquals('--', $order->get_shipping_country()); + $this->assertEquals('', $order->get_shipping_city()); + $this->assertEquals('', $order->get_shipping_postcode()); + $this->assertEquals('', $order->get_shipping_state()); + $this->assertEquals('', $order->get_shipping_country()); $this->assertEquals('', $order->get_billing_phone()); $this->assertEmpty($order->get_customer_id()); } @@ -559,10 +559,10 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper $this->assertEquals('Tester2890', $order->get_billing_last_name()); $this->assertEquals('tester2890@example.com', $order->get_billing_email()); $this->assertEquals('TestCompany017089465', $order->get_billing_company()); - $this->assertEquals('--', $order->get_shipping_city()); - $this->assertEquals('--', $order->get_shipping_postcode()); - $this->assertEquals('--', $order->get_shipping_state()); - $this->assertEquals('--', $order->get_shipping_country()); + $this->assertEquals('', $order->get_shipping_city()); + $this->assertEquals('', $order->get_shipping_postcode()); + $this->assertEquals('', $order->get_shipping_state()); + $this->assertEquals('', $order->get_shipping_country()); $this->assertEquals('32418790888', $order->get_billing_phone()); $this->assertEmpty($order->get_customer_id()); } @@ -618,14 +618,14 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper $this->assertEquals('tester001', $order->get_billing_first_name()); $this->assertEquals('tester001', $order->get_billing_last_name()); $this->assertEquals('tester001@example.com', $order->get_billing_email()); - $this->assertEquals('--', $order->get_billing_city()); - $this->assertEquals('--', $order->get_billing_postcode()); - $this->assertEquals('--', $order->get_billing_state()); - $this->assertEquals('--', $order->get_billing_country()); - $this->assertEquals('--', $order->get_shipping_city()); - $this->assertEquals('--', $order->get_shipping_postcode()); - $this->assertEquals('--', $order->get_shipping_state()); - $this->assertEquals('--', $order->get_shipping_country()); + $this->assertEquals('', $order->get_billing_city()); + $this->assertEquals('', $order->get_billing_postcode()); + $this->assertEquals('', $order->get_billing_state()); + $this->assertEquals('', $order->get_billing_country()); + $this->assertEquals('', $order->get_shipping_city()); + $this->assertEquals('', $order->get_shipping_postcode()); + $this->assertEquals('', $order->get_shipping_state()); + $this->assertEquals('', $order->get_shipping_country()); $this->assertEquals('2354708915097', $order->get_billing_phone()); $this->assertEquals('ул. Пушкина дом Колотушкина', $order->get_billing_address_1()); $this->assertEmpty($order->get_billing_company());