Cleanup: Adds tests for setStorage and enableRequestMatchers.

php-vcr · Feb 20, 2014 · f5d318c · f5d318c
1 parent fcac43c
commit f5d318c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/VCR/Configuration.php b/src/VCR/Configuration.php
@@ -148,7 +148,7 @@ public function enableRequestMatchers(array $matchers)
 
     public function setStorage($storageName)
     {
-        Assertion::inArray($storageName, $this->availableStorages, "Storage '{$storageName}' not available.");
+        Assertion::keyExists($this->availableStorages, $storageName, "Storage '{$storageName}' not available.");
         $this->enabledStorage = $storageName;
 
         return $this;

diff --git a/tests/VCR/ConfigurationTest.php b/tests/VCR/ConfigurationTest.php
@@ -64,6 +64,12 @@ public function testEnableRequestMatchers()
         );
     }
 
+    public function testEnableRequestMatchersFailsWithNoExistingName()
+    {
+        $this->setExpectedException('InvalidArgumentException', "Request matchers don't exist: wrong, name");
+        $this->config->enableRequestMatchers(array('wrong', 'name'));
+    }
+
     public function testAddRequestMatcherFailsWithNoName()
     {
         $this->setExpectedException('VCR\VCRException', "A request matchers name must be at least one character long. Found ''");
@@ -88,6 +94,23 @@ public function testAddRequestMatchers()
         $this->assertContains($expected, $this->config->getRequestMatchers());
     }
 
+    /**
+     * @dataProvider availableStorageProvider
+     */
+    public function testSetStorage($name, $className)
+    {
+        $this->config->setStorage($name);
+        $this->assertEquals($className, $this->config->getStorage(), "$name should be class $className.");
+    }
+
+    public function availableStorageProvider()
+    {
+        return array(
+            array('json', 'VCR\Storage\Json'),
+            array('yaml', 'VCR\Storage\Yaml'),
+        );
+    }
+
     public function testSetStorageInvalidName()
     {
         $this->setExpectedException('VCR\VCRException', "Storage 'Does not exist' not available.");