Test passing validator options array to processor

Cyberitas · Apr 25, 2016 · aab6f04 · aab6f04
1 parent 1dcc84b
commit aab6f04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/TinymceProcessor.php b/src/TinymceProcessor.php
@@ -117,7 +117,7 @@ private function configureRules()
                 // If configuration is provided for the validator, include it in
                 // the rule.
                 if (is_array($this->config[$validator])) {
-                    array_push($v, $this->config[$validator]);
+                    $rule = array_merge($rule, $this->config[$validator]);
                 }
 
                 array_push($this->rules, $rule);

diff --git a/tests/unit/TinymceProcessorTest.php b/tests/unit/TinymceProcessorTest.php
@@ -102,17 +102,22 @@ public function testRunsTexturizeValidator()
     public function testConfiguration()
     {
         $tmp = new TinymceProcessor(['config' => [
+            'autop'     => [
+                'convertBr' => false
+            ],
             'essence'   => false,
             'texturize' => true
         ]]);
 
         $input = <<<EOF
-Some of this should be processed...but some shouldn't.
+Some of this should be processed...
+but some shouldn't.
 
 https://www.youtube.com/watch?v=9bZkp7q19f0
 EOF;
         $expected = <<<EOF
-<p>Some of this should be processed&#8230;but some shouldn&#8217;t.</p>
+<p>Some of this should be processed&#8230;
+but some shouldn&#8217;t.</p>
 <p>https://www.youtube.com/watch?v=9bZkp7q19f0</p>
 EOF;