Skip to content

Commit

Permalink
Merge pull request #1135 from dunglas/fix_tests
Browse files Browse the repository at this point in the history
Fix tests
  • Loading branch information
dunglas committed May 23, 2017
2 parents a4a3d92 + 611a486 commit 7fb10f1
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install:

script:
- if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit; fi
- 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
- 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
- if [[ $coverage = 1 ]]; then phpdbg -qrr phpcov.phar merge --clover build/logs/clover.xml build/cov; fi
- tests/Fixtures/app/console api:swagger:export > swagger.json && swagger validate swagger.json && rm swagger.json
- if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
Expand Down
1 change: 1 addition & 0 deletions features/bootstrap/FeatureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ public function thereIsACompositeIdentifierObject()
}

$this->manager->flush();
$this->manager->clear();
}

/**
Expand Down
1 change: 0 additions & 1 deletion features/doctrine/date_filter.feature
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Feature: Date filter on collections
Then the response status code should be 200
And the response should be in JSON
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
And print last JSON response
And the JSON should be valid according to this schema:
"""
{
Expand Down
1 change: 0 additions & 1 deletion tests/Fixtures/app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ framework:
enable_annotations: true
serializer:
enable_annotations: true
trusted_proxies: ~
test: ~
session:
storage_id: 'session.storage.mock_file'
Expand Down

0 comments on commit 7fb10f1

Please sign in to comment.