Skip to content

Commit

Permalink
Merge pull request #17 from t3n/tests
Browse files Browse the repository at this point in the history
Fix unit tests
  • Loading branch information
johannessteu authored Feb 4, 2020
2 parents 1d1e8d9 + a1fdd79 commit 5eb140c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 12 deletions.
24 changes: 22 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

aliases:
- &ci-build-image quay.io/yeebase/ci-build:7.2
- &ci-build-image quay.io/yeebase/ci-build:7.3
- &workspace_root ~/workspace

- &save_composer_cache
Expand Down Expand Up @@ -65,7 +65,27 @@ workflows:
version: 2
build_and_test:
jobs:
- checkout
- checkout:
filters:
branches:
ignore: /dependabot.*/
- lint:
requires:
- checkout
- unit-tests:
requires:
- checkout

build_and_test_dependabot:
jobs:
- hold:
type: approval
filters:
branches:
only: /dependabot.*/
- checkout:
requires:
- hold
- lint:
requires:
- checkout
Expand Down
6 changes: 6 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 1
update_configs:
- package_manager: "php:composer"
directory: "/"
update_schedule: "weekly"
target_branch: "master"
2 changes: 1 addition & 1 deletion Tests/Unit/RoutingComponentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function uriWithSpecialCharsDoesNotThrowAnException(): void
$newUri = $routingComponent->handleToLowerCase($uri);
$newUri = $routingComponent->handleTrailingSlash($newUri);

$this->assertEquals($uri, $newUri);
$this->assertEquals(strtolower((string) $uri), $newUri);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"neos/flow": "~6.0"
},
"require-dev": {
"t3n/coding-standard": "~1.0.0"
"t3n/coding-standard": "~1.1.0"
},
"autoload": {
"psr-4": {
Expand Down
12 changes: 4 additions & 8 deletions composer.json.ci
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{
"name": "t3n/test-setup",
"description": "Test setup for flow packages",
"repositories": [
{
"type": "git",
"url": "[email protected]:t3n/seo-routing.git"
},
{
"repositories": {
"srcPackage": {
"type": "path",
"url": "./seo-routing"
}
],
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
Expand All @@ -23,7 +19,7 @@
"t3n/seo-routing": "@dev"
},
"require-dev": {
"t3n/coding-standard": "~1.0.0",
"t3n/coding-standard": "~1.1.0",
"phpunit/phpunit": "~8.5",
"mikey179/vfsstream": "~1.6"
},
Expand Down

0 comments on commit 5eb140c

Please sign in to comment.