Browse Source

Merge pull request #5588 from cakephp/issue-5579

Fix notice error when invalid fixture types are used.
Mark Story 11 years ago
parent
commit
0e59550464

+ 1 - 0
src/TestSuite/Fixture/FixtureManager.php

@@ -155,6 +155,7 @@ class FixtureManager
                 $baseNamespace = Inflector::camelize(str_replace('\\', '\ ', $path));
                 $additionalPath = null;
             } else {
+                $baseNamespace = '';
                 $name = $fixture;
             }
             $name = Inflector::camelize($name);

+ 13 - 0
tests/TestCase/TestSuite/FixtureManagerTest.php

@@ -91,4 +91,17 @@ class FixtureManagerTest extends TestCase
             $fixtures['plugin.Company/TestPluginThree.articles']
         );
     }
+
+    /**
+     * Test that unknown types are handled gracefully.
+     *
+     * @expectedException \UnexpectedValueException
+     * @expectedExceptionMessage Referenced fixture class "Test\Fixture\Derp.derpFixture" not found. Fixture "derp.derp" was referenced
+     */
+    public function testFixturizeInvalidType()
+    {
+        $test = $this->getMock('Cake\TestSuite\TestCase');
+        $test->fixtures = ['derp.derp'];
+        $this->manager->fixturize($test);
+    }
 }