Skip to content
This repository has been archived by the owner on Feb 22, 2021. It is now read-only.

Commit

Permalink
Updated behat, droped php 5.3 support, improved dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
norberttech committed Oct 24, 2015
1 parent f6e33b6 commit 3565d02
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 34 deletions.
24 changes: 17 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.4
- 5.5
- 5.6

env:
- COMPOSER_OPTIONS='install --prefer-source'

matrix:
include:
- php: 5.4
env: COMPOSER_OPTIONS='update --prefer-lowest --prefer-source'

before_install:
- composer self-update

before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar update
- COMPOSER_ROOT_VERSION=dev-master composer $COMPOSER_OPTIONS

script:
- bin/phpspec r -v
- bin/behat -v
- ./bin/phpspec run --format=dot
- ./bin/behat
5 changes: 5 additions & 0 deletions behat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
default:
suites:
default:
contexts:
- PHPSpecContext
10 changes: 6 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
}
],
"require": {
"php": ">=5.3.0",
"phpspec/phpspec": "~2.0"
"php": ">=5.4.0",
"phpspec/phpspec": "^2"
},
"require-dev": {
"behat/behat": "2.4.*@stable",
"behat/behat": "3.0.*",
"symfony/filesystem": "~2.3",
"bossa/phpspec2-expect": "dev-master"
"symfony/process": "~2.3",
"symfony/console": "~2.3.2",
"bossa/phpspec2-expect": "^1"
},
"autoload": {
"psr-0": { "Coduo\\PhpSpec": "src/"}
Expand Down
2 changes: 2 additions & 0 deletions features/bootstrap/Console/ApplicationTester.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Console;

use Symfony\Component\Console\Application;
use Symfony\Component\Console\Input\StringInput;
use Symfony\Component\Console\Output\StreamOutput;
Expand Down
20 changes: 0 additions & 20 deletions features/bootstrap/FeatureContext.php

This file was deleted.

6 changes: 3 additions & 3 deletions features/bootstrap/PHPSpecContext.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

use Behat\Behat\Context\BehatContext;
use Behat\Behat\Context\SnippetAcceptingContext;
use Behat\Gherkin\Node\PyStringNode;
use Symfony\Component\Filesystem\Filesystem;
use PhpSpec\Console\Application;

class PHPSpecContext extends BehatContext
class PHPSpecContext implements SnippetAcceptingContext
{
/**
* @var string
Expand Down Expand Up @@ -78,7 +78,7 @@ public function iRunPhpspec()
$application = new Application('2.0-dev');
$application->setAutoExit(false);

$this->applicationTester = new ApplicationTester($application);
$this->applicationTester = new Console\ApplicationTester($application);
$this->applicationTester->run('run --no-interaction -f pretty');
}

Expand Down

0 comments on commit 3565d02

Please sign in to comment.