fix for OC 3

This commit is contained in:
Akolzin Dmitry 2020-02-20 10:26:40 +03:00
parent a48ef3e1ea
commit e7270aac4b
2 changed files with 11 additions and 4 deletions

View File

@ -72,7 +72,14 @@ class RoboFile extends \Robo\Tasks
public function opencartSetup() public function opencartSetup()
{ {
$this->taskDeleteDir('www')->run(); $startUp = getenv('TEST_SUITE') === '2.3'
? 'catalog/controller/startup/test_startup.php'
: 'admin/controller/startup/test_startup.php';
$startUpTo = getenv('TEST_SUITE') === '2.3'
? 'catalog/controller/startup/test_startup.php'
: 'admin/controller/startup/test_startup.php';
$this->taskDeleteDir($this->root_dir . 'www')->run();
$this->taskFileSystemStack() $this->taskFileSystemStack()
->mirror( ->mirror(
$this->root_dir . 'vendor/opencart/opencart/upload', $this->root_dir . 'vendor/opencart/opencart/upload',
@ -83,8 +90,8 @@ class RoboFile extends \Robo\Tasks
$this->root_dir . 'www/system/config/test-config.php' $this->root_dir . 'www/system/config/test-config.php'
) )
->copy( ->copy(
$this->root_dir . 'vendor/beyondit/opencart-test-suite/src/upload/catalog/controller/startup/test_startup.php', $this->root_dir . 'vendor/beyondit/opencart-test-suite/src/upload/' . $startUp,
$this->root_dir . 'www/catalog/controller/startup/test_startup.php' $this->root_dir . 'www/' . $startUpTo
) )
->chmod($this->root_dir . 'www', 0777, 0000, true) ->chmod($this->root_dir . 'www', 0777, 0000, true)
->run(); ->run();

View File

@ -1,5 +1,5 @@
TRUNCATE TABLE `oc_customer`; TRUNCATE TABLE `oc_customer`;
INSERT INTO `oc_customer` (`customer_id`, `customer_group_id`, `store_id`, `language_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `password`, `salt`, `cart`, `wishlist`, `newsletter`, `address_id`, `custom_field`, `ip`, `status`, `approved`, `safe`, `token`, `code`, `date_added`) VALUES ('1', '1', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', 'ed3798da75d6cdd695e99e87a60d587a10aa95ff', '51TalnrgH', '', '', '0', '1', '', '172.21.0.1', '1', '1', '0', '', '', '2018-06-07 13:50:08'); INSERT INTO `oc_customer` (`customer_id`, `customer_group_id`, `store_id`, `language_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `password`, `salt`, `cart`, `wishlist`, `newsletter`, `address_id`, `custom_field`, `ip`, `status`, `safe`, `token`, `code`, `date_added`) VALUES ('1', '1', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', 'ed3798da75d6cdd695e99e87a60d587a10aa95ff', '51TalnrgH', '', '', '0', '1', '', '172.21.0.1', '1', '0', '', '', '2018-06-07 13:50:08');
TRUNCATE TABLE `oc_customer_activity`; TRUNCATE TABLE `oc_customer_activity`;
TRUNCATE TABLE `oc_customer_group`; TRUNCATE TABLE `oc_customer_group`;