From b8594dc1a2cfc98a0d2e3df33030dd08653c6f37 Mon Sep 17 00:00:00 2001 From: Nicolas MURE Date: Mon, 25 Jan 2016 09:02:12 +0100 Subject: [PATCH] tmbURL unit test merge fix --- Tests/Configuration/ElFinderConfigurationReaderTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/Configuration/ElFinderConfigurationReaderTest.php b/Tests/Configuration/ElFinderConfigurationReaderTest.php index e445776..d33815d 100644 --- a/Tests/Configuration/ElFinderConfigurationReaderTest.php +++ b/Tests/Configuration/ElFinderConfigurationReaderTest.php @@ -304,9 +304,10 @@ public function testPathAndUrlAndHomeFolder() $this->assertEquals('http://test.com/unit-test/home-url-without-path/bob', $configuration['roots'][0]['URL']); } - public function testAccessTmbURLOpion() + public function testAccessTmbURLOption() { - $configuration = $this->reader->getConfiguration('default'); + $reader = $this->getConfigurationReader($this->getDefaultAttributesObject()); + $configuration = $reader->getConfiguration('default'); $this->assertArrayHasKey('tmbURL', $configuration['roots'][0]); } }