Skip to content

Commit

Permalink
Merge pull request #217 from steinkel/hotfix/travis
Browse files Browse the repository at this point in the history
Hotfix/travis
  • Loading branch information
Cake Development Corporation committed Jun 9, 2015
2 parents 9717ede + 1489496 commit 8e90e17
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ env:
- REQUIRE="phpunit/phpunit:3.7.31"

matrix:
- DB=mysql CAKE_VERSION=master
- DB=mysql CAKE_VERSION=2.6

matrix:
include:
- php: 5.3
env:
- CAKE_VERSION=master
- CAKE_VERSION=2.6
- php: 5.4
env:
- CAKE_VERSION=master
- CAKE_VERSION=2.6
- php: 5.5
env:
- CAKE_VERSION=master
- CAKE_VERSION=2.6

before_script:
- git clone https://github.com/burzum/travis.git --depth 1 ../travis
- git clone https://github.com/steinkel/travis.git --depth 1 ../travis
- ../travis/before_script.sh
- if [ "$PHPCS" != 1 ]; then
echo "
Expand All @@ -44,3 +44,4 @@ after_success:
notifications:
email: false
6 changes: 3 additions & 3 deletions Test/Case/Console/Command/MigrationShellTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -957,12 +957,12 @@ public function testMigrationStatus() {
/Migrations Plugin
Current version:
#002 002_convert_version_to_class_names
#003 003_increase_class_name_length
Latest version:
#003 003_increase_class_name_length/
TEXT;
$this->assertRegExp(str_replace("\r\n", "\n", $pattern), $result);
$this->Shell->Version->setVersion(2, 'migrations', false);
$this->Shell->Version->setVersion(3, 'migrations', false);
$this->Shell->output = '';
$this->Shell->args = array('outdated');
$this->Shell->status();
Expand All @@ -971,7 +971,7 @@ public function testMigrationStatus() {
/Migrations Plugin
Current version:
#001 001_init_migrations
#002 002_convert_version_to_class_names
Latest version:
#003 003_increase_class_name_length/
TEXT;
Expand Down

0 comments on commit 8e90e17

Please sign in to comment.