Skip to content

Commit a324431

Browse files
committed
Merge remote-tracking branch 'origin/MQE-148' into develop
2 parents 797c76d + 20e5bfc commit a324431

File tree

128 files changed

+9078
-6050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+9078
-6050
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.idea
22
composer.phar
3-
vendor/*
3+
vendor/*

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
language: php
2+
php:
3+
- 7.0
4+
- 7.1
5+
install: composer install --no-interaction --prefer-source
6+
script:
7+
- vendor/bin/phpcs ./src --standard=./dev/tests/static/Magento

bootstrap.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
defined('FW_BP') || define('FW_BP', str_replace('\\', '/', (__DIR__)));
4+
defined('TESTS_BP') || define('TESTS_BP', dirname(dirname(dirname(FW_BP))));
5+
6+
require_once __DIR__ . '/vendor/autoload.php';
7+
8+
$dotenv = new Dotenv\Dotenv(TESTS_BP, '.env');
9+
$dotenv->load();
10+
11+
$objectManager = \Magento\AcceptanceTestFramework\ObjectManagerFactory::getObjectManager();

composer.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"description": "Magento Acceptance Testing Framework",
55
"keywords": ["magento", "automation", "acceptance", "testing"],
66
"require": {
7-
"codeception/codeception": "~2.2|2.3",
7+
"php": "~7.0",
8+
"codeception/codeception": "2.2|2.3",
89
"flow/jsonpath": ">0.2",
9-
"fzaninotto/faker": "^1.6"
10+
"fzaninotto/faker": "^1.6",
11+
"vlucas/phpdotenv": "~2.4"
12+
},
13+
"require-dev": {
14+
"squizlabs/php_codesniffer": "1.5.3"
1015
},
1116
"autoload": {
1217
"psr-4": {
13-
"Magento\\Xxyyzz\\": "src/Magento/Xxyyzz"
18+
"Magento\\AcceptanceTestFramework\\": [
19+
"src/Magento/AcceptanceTestFramework"
20+
]
1421
}
1522
}
1623
}

0 commit comments

Comments
 (0)