Skip to content

Commit 44ed422

Browse files
authored
Merge pull request #132 from akeneo/API-599
API-599: replace integration tests by end-to-end tests
2 parents 46c4609 + 80f889d commit 44ed422

File tree

101 files changed

+917
-13477
lines changed

Some content is hidden

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

101 files changed

+917
-13477
lines changed

.ci/Jenkinsfile

Lines changed: 0 additions & 688 deletions
This file was deleted.

.ci/akeneo.conf

Lines changed: 0 additions & 22 deletions
This file was deleted.

.ci/k8s/pim_17_ce.yaml

Lines changed: 0 additions & 111 deletions
This file was deleted.

.ci/k8s/pim_20_ce.yaml

Lines changed: 0 additions & 147 deletions
This file was deleted.

.travis.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
language: php
2+
3+
php:
4+
- 5.6
5+
- 7.0
6+
- 7.1
7+
8+
sudo: false
9+
10+
cache:
11+
directories:
12+
- $HOME/.composer/cache/files
13+
14+
before_install:
15+
- phpenv config-rm xdebug.ini
16+
- phpenv config-add travis.php.ini
17+
- echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
18+
- composer self-update --no-interaction
19+
20+
install:
21+
- composer require php-http/guzzle6-adapter
22+
- composer install --prefer-dist --no-interaction
23+
24+
script:
25+
- bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
26+
- bin/phpspec run --no-interaction
27+
- php -d error_reporting="E_ALL" bin/phpunit -c phpunit.xml.dist
28+
29+
notifications:
30+
email: false

CHANGELOG-1.0.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# 2.0.1 (2018-04-05)
1+
# 1.0.x
2+
3+
## Bug Fixes
4+
5+
- API-599: fix const not supported by PHP 5.6
6+
7+
# 1.0.1 (2018-04-05)
28

39
## Improvements
410

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,20 @@ $client->getProductApi()->upsertList([
128128
]);
129129
```
130130

131+
## Testing
132+
133+
Do note that you have to delete the `composer.lock` because Doctrine dependencies are loaded.
134+
These dependencies are different in function of the PHP version running `composer install`.
135+
136+
```
137+
cp docker-compose.yml.dist docker-compose.yml
138+
rm -rf composer.lock vendor/
139+
docker-compose run client_56 composer install
140+
docker-compose run client_56 bin/phpunit -c phpunit.xml.dist
141+
docker-compose run client_56 bin/phpspec run
142+
docker-compose run client_56 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php -vvv
143+
```
144+
131145
## Support
132146

133147
If you find a bug or want to submit an improvement, don't hesitate to raise an issue on Github.

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"friendsofphp/php-cs-fixer": "^v2.3",
3434
"phpunit/phpunit": "5.7.*",
3535
"phpspec/phpspec": "3.2.*",
36-
"symfony/yaml": "^3.3"
36+
"symfony/yaml": "^3.3",
37+
"donatj/mock-webserver": "^2.0"
3738
},
3839
"config": {
3940
"bin-dir": "bin"

0 commit comments

Comments
 (0)