Merge branch 'Narno-success-selector'

emmanuelroecker · Jul 14, 2016 · 39f9e84 · 39f9e84
2 parents e0575cf + a4cefc5
commit 39f9e84
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 composer.phar
 composer.lock
 composer-test.lock

diff --git a/src/GlW3CValidator.php b/src/GlW3CValidator.php
@@ -36,6 +36,7 @@ class GlW3CValidator
     private $types = [
         'html' => [
             'validator' => '/',
+            'selector'  => '.success',
             'resulttag' => '#results',
             'field'     => 'file',
             'css'       => [
@@ -44,6 +45,7 @@ class GlW3CValidator
         ],
         'css'  => [
             'validator' => '/validator',
+            'selector'  => '#congrats',
             'resulttag' => '#results_container',
             'field'     => 'file',
             'css'       => [
@@ -87,6 +89,7 @@ public function __construct(
     /**
      * @param string $w3curl
      * @param string $validator
+     * @param string $selector
      * @param string $field
      * @param string $htmltag
      * @param string $file
@@ -95,7 +98,7 @@ public function __construct(
      *
      * @return string
      */
-    private function sendToW3C($w3curl, $validator, $field, $htmltag, $file, $title, $csslist)
+    private function sendToW3C($w3curl, $validator, $selector, $field, $htmltag, $file, $title, $csslist)
     {
         $client = new Client();
 
@@ -121,7 +124,7 @@ private function sendToW3C($w3curl, $validator, $field, $htmltag, $file, $title,
 
         $html = new GlHtml($html);
 
-        if ($html->get(".success")) {
+        if ($html->get($selector)) {
             return null;
         }
 
@@ -166,13 +169,14 @@ private function validateFile(SplFileInfo $fileinfo)
         $ext   = $fileinfo->getExtension();
         $title = strtr($fileinfo->getRelativePathname(), ["\\" => "/"]);
         $view  = $this->sendToW3C(
-                      $this->types[$ext]['w3curl'],
-                          $this->types[$ext]['validator'],
-                          $this->types[$ext]['field'],
-                          $this->types[$ext]['resulttag'],
-                          strtr($fileinfo->getRealPath(), ["\\" => "/"]),
-                          $title,
-                          $this->types[$ext]['css']
+            $this->types[$ext]['w3curl'],
+            $this->types[$ext]['validator'],
+            $this->types[$ext]['selector'],
+            $this->types[$ext]['field'],
+            $this->types[$ext]['resulttag'],
+            strtr($fileinfo->getRealPath(), ["\\" => "/"]),
+            $title,
+            $this->types[$ext]['css']
         );
 
         if ($view === null) {

diff --git a/tests/GlValidatorTest.php b/tests/GlValidatorTest.php
@@ -131,7 +131,7 @@ function (SplFileInfo $file) use (&$count) {
             "w3c_css_glicer.html"
         ];
 
-        $this->assertNotEquals(NULL, $result["test1/css/glicer.css"]);
+        $this->assertEquals(NULL, $result["test1/css/glicer.css"]);
         $this->assertEquals(NULL,$result["test1/index.html"]);
         $this->assertNotEquals(NULL, $result["test2/css/glicer.css"]);
         $this->assertNotEquals(NULL, $result["test2/index.html"]);