aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-17 19:59:39 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-17 19:59:39 +0200
commit86ea314598f84bbf95f7cdc6317555f91637e918 (patch)
tree15fd80277618bd144bbf11c985e6c1488c6edf73 /tests
parent72012381048589108b2837cbd61091c7f22b986b (diff)
parent46a9fe93d797bf7d56fd9b1e204f3c0459270122 (diff)
downloadforums-86ea314598f84bbf95f7cdc6317555f91637e918.tar
forums-86ea314598f84bbf95f7cdc6317555f91637e918.tar.gz
forums-86ea314598f84bbf95f7cdc6317555f91637e918.tar.bz2
forums-86ea314598f84bbf95f7cdc6317555f91637e918.tar.xz
forums-86ea314598f84bbf95f7cdc6317555f91637e918.zip
Merge pull request #2951 from Nicofuma/ticket/13064
[ticket/13064] Validate the migrations provided to migrator::set_migrations() * Nicofuma/ticket/13064: [ticket/13064] Validate the migrations provided to migrator::set_migrations()
Diffstat (limited to 'tests')
-rw-r--r--tests/dbal/migrator_test.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 10a9444d63..05e60a510b 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -118,9 +118,17 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->db_tools->sql_column_remove('phpbb_config', 'extra_column');
}
- public function test_unfulfillable()
+ /**
+ * @expectedException \phpbb\db\migration\exception
+ */
+ public function test_unfulfillable_exception()
{
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'));
+ }
+
+ public function test_unfulfillable()
+ {
+ $this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'), false);
while (!$this->migrator->finished())
{