Skip to content

Commit 7fb10f1

Browse files
authored
Merge pull request #1135 from dunglas/fix_tests
Fix tests
2 parents a4a3d92 + 611a486 commit 7fb10f1

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ install:
3333

3434
script:
3535
- if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit; fi
36-
- if [[ $coverage = 1 ]]; then for f in $(find features -name '*.feature'); do FEATURE=${f//\//_} phpdbg -qrr vendor/bin/behat --profile coverage $f; done; else vendor/bin/behat; fi
36+
- if [[ $coverage = 1 ]]; then for f in $(find features -name '*.feature'); do FEATURE=${f//\//_} phpdbg -qrr vendor/bin/behat --profile coverage $f || exit $?; done; else vendor/bin/behat; fi
3737
- if [[ $coverage = 1 ]]; then phpdbg -qrr phpcov.phar merge --clover build/logs/clover.xml build/cov; fi
3838
- tests/Fixtures/app/console api:swagger:export > swagger.json && swagger validate swagger.json && rm swagger.json
3939
- if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi

features/bootstrap/FeatureContext.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ public function thereIsACompositeIdentifierObject()
351351
}
352352

353353
$this->manager->flush();
354+
$this->manager->clear();
354355
}
355356

356357
/**

features/doctrine/date_filter.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Feature: Date filter on collections
1010
Then the response status code should be 200
1111
And the response should be in JSON
1212
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
13-
And print last JSON response
1413
And the JSON should be valid according to this schema:
1514
"""
1615
{

tests/Fixtures/app/config/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ framework:
1010
enable_annotations: true
1111
serializer:
1212
enable_annotations: true
13-
trusted_proxies: ~
1413
test: ~
1514
session:
1615
storage_id: 'session.storage.mock_file'

0 commit comments

Comments
 (0)