From 84207463800df2900484cff76065076d7bee74d8 Mon Sep 17 00:00:00 2001
From: John Stennett <john00ivy@gmail.com>
Date: Wed, 29 Nov 2017 22:28:53 +0200
Subject: [PATCH] MQE-528: Robo commands should override certain files.
- Adjusting the commands that Robo executes so it overrides certain files.
---
dev/tests/acceptance/RoboFile.php | 4 +--
.../SalesRule/Data/SalesRuleData.xml | 25 -------------------
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
index c255e9f0653..c7368c79309 100644
--- a/dev/tests/acceptance/RoboFile.php
+++ b/dev/tests/acceptance/RoboFile.php
@@ -21,8 +21,8 @@ class RoboFile extends \Robo\Tasks
function cloneFiles()
{
$this->_exec('cp -vn .env.example .env');
- $this->_exec('cp -vn codeception.dist.yml codeception.yml');
- $this->_exec('cp -vn tests/functional.suite.dist.yml tests/functional.suite.yml');
+ $this->_exec('cp -vf codeception.dist.yml codeception.yml');
+ $this->_exec('cp -vf tests/functional.suite.dist.yml tests/functional.suite.yml');
}
/**
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
deleted file mode 100644
index 3f13fbf02a8..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
- <entity name="SimpleSalesRule" type="SalesRule">
- <data key="name" unique="suffix">SalesRule</data>
- <data key="is_active">true</data>
- <required-entity type="SalesRuleStoreLabel">SalesRuleStoreLabel1</required-entity>
- <required-entity type="SalesRuleStoreLabel">SalesRuleStoreLabel2</required-entity>
- </entity>
- <entity name="SalesRuleStoreLabel1" type="SalesRuleStoreLabel">
- <data key="store_id">0</data>
- <data key="store_label">TestRule_Label</data>
- </entity>
- <entity name="SalesRuleStoreLabel2" type="SalesRuleStoreLabel">
- <data key="store_id">1</data>
- <data key="store_label">TestRule_Label_default</data>
- </entity>
-</config>
--
GitLab