Fix tests

badraxas · Jan 23, 2024 · 4bef1dc · 4bef1dc
1 parent 42135a8
commit 4bef1dc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/AdsTxt.php b/src/AdsTxt.php
@@ -32,7 +32,7 @@ class AdsTxt
      */
     public function addLine(AbstractAdsTxtLine $line): self
     {
-        if ($this->valid && !empty($line->getError())) {
+        if ($this->valid && (!empty($line->getError()) || $line instanceof Invalid)) {
             $this->valid = false;
         }
 

diff --git a/src/Lines/Record.php b/src/Lines/Record.php
@@ -69,7 +69,7 @@ public function getRelationship(): string
 
     public function pretty(bool $withComment = true): string
     {
-        $vendor = sprintf('%s, %s, %s', strtolower($this->domain), $this->publisherId, strtolower($this->relationship));
+        $vendor = sprintf('%s, %s, %s', strtolower($this->domain), $this->publisherId, strtoupper($this->relationship));
 
         if (isset($this->certificationId)) {
             $vendor = sprintf('%s, %s', $vendor, $this->certificationId);

diff --git a/src/Lines/Variable.php b/src/Lines/Variable.php
@@ -51,9 +51,9 @@ public function getValue(): mixed
     public function pretty(bool $withComment = true): string
     {
         if (!isset($this->comment)) {
-            return sprintf('%s=%s', $this->name, $this->value);
+            return sprintf('%s=%s', strtoupper($this->name), $this->value);
         }
 
-        return sprintf('%s=%s%s', $this->name, $this->value, $this->comment->pretty($withComment));
+        return sprintf('%s=%s%s', strtoupper($this->name), $this->value, $this->comment->pretty($withComment));
     }
 }
diff --git a/tests/AdsTxtParserTest.php b/tests/AdsTxtParserTest.php
@@ -65,7 +65,7 @@ public function testParseFromMissingFile(): void
 
     public function testParseFromString(): void
     {
-        $adsTxtString = "# First line of file\n\ngreenadexchange.com, XF436, DIRECT, d75815a79# GreenAd certification ID\ncontact=contact@example.org";
+        $adsTxtString = "# First line of file\n\ngreenadexchange.com, XF436, DIRECT, d75815a79# GreenAd certification ID\nCONTACT=contact@example.org";
 
         $adsTxtReference = (new AdsTxt())
             ->addLine(new Comment('First line of file'))
@@ -95,7 +95,7 @@ public function testParseFromString(): void
 
     public function testParseFromStringWithInvalidLines(): void
     {
-        $adsTxtString = "# First line of file\ngreenadexchange.com, XF436, DIRECT, d75815a79, GreenAd certification ID\ncontact=contact@example.org";
+        $adsTxtString = "# First line of file\ngreenadexchange.com, XF436, DIRECT, d75815a79, GreenAd certification ID\nCONTACT=contact@example.org";
 
         $adsTxtReference = (new AdsTxt())
             ->addLine(new Comment('First line of file'))

diff --git a/tests/AdsTxtTest.php b/tests/AdsTxtTest.php
@@ -26,7 +26,7 @@ public function testAdsTxtOutput(): void
         $this->assertEquals('# ads.txt file for example.com:
 greenadexchange.com, 12345, DIRECT, d75815a79
 blueadexchange.com, XF436, DIRECT
-subdomain=divisionone.example.com', $adsTxt->pretty());
+SUBDOMAIN=divisionone.example.com', $adsTxt->pretty());
     }
 
     public function testDiffMethodReturnsMissingLines(): void

diff --git a/tests/Lines/VariableTest.php b/tests/Lines/VariableTest.php
@@ -23,12 +23,12 @@ public function testGetters(): void
     public function testVariableOutput(): void
     {
         $variable = new Variable('contact', 'adops@example.com');
-        $this->assertEquals('contact=adops@example.com', $variable->pretty());
+        $this->assertEquals('CONTACT=adops@example.com', $variable->pretty());
     }
 
     public function testVariableWithComment(): void
     {
         $variable = new Variable('contact', 'adops@example.com', new Comment('a nice comment!'));
-        $this->assertEquals('contact=adops@example.com# a nice comment!', $variable->pretty());
+        $this->assertEquals('CONTACT=adops@example.com# a nice comment!', $variable->pretty());
     }
 }