From b211aecb99d5b09f7f178fa5c5e96e175a136b54 Mon Sep 17 00:00:00 2001
From: Brooke Bryan <brooke@bajb.net>
Date: Sun, 23 Aug 2020 21:55:35 +0100
Subject: [PATCH] Test replacements

---
 .../AbstractDataHandlerDecorator.php          | 10 +++++-----
 src/Decorators/CheckboxDecorator.php          |  2 +-
 src/Decorators/RadioDecorator.php             |  2 +-
 .../DataHandlers/AbstractDataHandlerTest.php  |  8 ++++----
 tests/DataHandlers/BooleanHandlerTest.php     |  6 +++---
 tests/DataHandlers/EnumDataHandlerTest.php    | 20 +++++++++----------
 tests/DataHandlers/TextDataHandlerTest.php    |  8 ++++----
 tests/Decorators/FormCustomDecoratorTest.php  |  4 ++--
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Decorators/AbstractDataHandlerDecorator.php b/src/Decorators/AbstractDataHandlerDecorator.php
index 811c7c6..d256287 100644
--- a/src/Decorators/AbstractDataHandlerDecorator.php
+++ b/src/Decorators/AbstractDataHandlerDecorator.php
@@ -74,10 +74,10 @@ public function getLabel(): ?HtmlTag
 
   protected function _prepareForProduce(): HtmlElement
   {
-    $this->addClass('p-form-field');
+    $this->addClass('p-form__field');
     if($this->_handler->getErrors())
     {
-      $this->addClass('p-form-field--error');
+      $this->addClass('p-form__field--error');
     }
     return parent::_prepareForProduce();
   }
@@ -168,15 +168,15 @@ protected function _formatElements(HtmlTag $input, ?HtmlTag $label, ?HtmlTag $er
     $return = array_fill_keys($this->getElementOrder(), null);
     if(array_key_exists(self::LABEL, $return) && $label)
     {
-      $return[self::LABEL] = Div::create($label)->addClass('p-form--label');
+      $return[self::LABEL] = Div::create($label)->addClass('p-form__label');
     }
     if(array_key_exists(self::ERRORS, $return) && $errors)
     {
-      $return[self::ERRORS] = Div::create($errors)->addClass('p-form--errors');
+      $return[self::ERRORS] = Div::create($errors)->addClass('p-form__errors');
     }
     if(array_key_exists(self::INPUT, $return))
     {
-      $return[self::INPUT] = Div::create($input)->addClass('p-form--input');
+      $return[self::INPUT] = Div::create($input)->addClass('p-form__input');
     }
 
     // array merge, but don't replace existing
diff --git a/src/Decorators/CheckboxDecorator.php b/src/Decorators/CheckboxDecorator.php
index 30bcbf8..6413b98 100644
--- a/src/Decorators/CheckboxDecorator.php
+++ b/src/Decorators/CheckboxDecorator.php
@@ -100,7 +100,7 @@ private function _getContainer(Input $checkbox, $label)
     return Div::create(
       $checkbox,
       Label::create($label)->setAttribute('for', $checkbox->getId())
-    )->addClass('p-form--checkbox');
+    )->addClass('p-form__checkbox');
   }
 
   protected function _formatElements(HtmlTag $input, ?HtmlTag $label, ?HtmlTag $errors)
diff --git a/src/Decorators/RadioDecorator.php b/src/Decorators/RadioDecorator.php
index 2eb59e8..574c6a0 100644
--- a/src/Decorators/RadioDecorator.php
+++ b/src/Decorators/RadioDecorator.php
@@ -43,7 +43,7 @@ protected function _configureInputElement(HtmlElement $input)
             $radio->setAttribute('checked', true);
           }
           $options[] = Div::create($radio, Label::create($label)->setAttribute('for', $radio->getid()))
-            ->addClass('p-form--checkbox');
+            ->addClass('p-form__checkbox');
         }
         $input->setContent($options);
       }
diff --git a/tests/DataHandlers/AbstractDataHandlerTest.php b/tests/DataHandlers/AbstractDataHandlerTest.php
index 2f32283..562a2df 100644
--- a/tests/DataHandlers/AbstractDataHandlerTest.php
+++ b/tests/DataHandlers/AbstractDataHandlerTest.php
@@ -64,14 +64,14 @@ public function testRender()
   {
     $fdh = new ReadOnlyDataHandler();
     $this->assertEquals(
-      '<div class="p-form-field"><div class="p-form--label"><label></label></div><div class="p-form--input"><span></span></div></div>',
+      '<div class="p-form__field"><div class="p-form__label"><label></label></div><div class="p-form__input"><span></span></div></div>',
       $fdh->getDecorator()->render()
     );
 
     $fdh = new ReadOnlyDataHandler();
     $fdh->setName('myName');
     $this->assertRegExp(
-      '/<div class="p-form-field"><div class="p-form--label"><label for="(my-name-...)">My Name<\/label><\/div><div class="p-form--input"><span id="\1"><\/span><\/div><\/div>/',
+      '/<div class="p-form__field"><div class="p-form__label"><label for="(my-name-...)">My Name<\/label><\/div><div class="p-form__input"><span id="\1"><\/span><\/div><\/div>/',
       $fdh->getDecorator()->render()
     );
 
@@ -79,7 +79,7 @@ public function testRender()
     $fdh->setName('myName');
     $fdh->setLabel('This is my input');
     $this->assertRegExp(
-      '/<div class="p-form-field"><div class="p-form--label"><label for="(my-name-...)">This is my input<\/label><\/div><div class="p-form--input"><span id="\1"><\/span><\/div><\/div>/',
+      '/<div class="p-form__field"><div class="p-form__label"><label for="(my-name-...)">This is my input<\/label><\/div><div class="p-form__input"><span id="\1"><\/span><\/div><\/div>/',
       $fdh->getDecorator()->render()
     );
 
@@ -88,7 +88,7 @@ public function testRender()
     $fdh->setLabel('This is my input');
     $fdh->setValue('my value');
     $this->assertRegExp(
-      '/<div class="p-form-field"><div class="p-form--label"><label for="(my-name-...)">This is my input<\/label><\/div><div class="p-form--input"><span id="\1">my value<\/span><\/div><\/div>/',
+      '/<div class="p-form__field"><div class="p-form__label"><label for="(my-name-...)">This is my input<\/label><\/div><div class="p-form__input"><span id="\1">my value<\/span><\/div><\/div>/',
       $fdh->getDecorator()->render()
     );
   }
diff --git a/tests/DataHandlers/BooleanHandlerTest.php b/tests/DataHandlers/BooleanHandlerTest.php
index 6d2c8a9..70d8177 100644
--- a/tests/DataHandlers/BooleanHandlerTest.php
+++ b/tests/DataHandlers/BooleanHandlerTest.php
@@ -23,21 +23,21 @@ public function testCheckbox()
     $this->assertTrue($h->isValid());
 
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
       $decorator->render()
     );
 
     $h->setValueFormatted('yes');
     $this->assertTrue($h->isValid());
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" checked /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" checked /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
       $decorator->render()
     );
 
     $decorator->setRequired(true);
     $this->assertTrue($decorator->isRequired());
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" checked required /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice" value="true" checked required /><label for="\1">Do You Agree\?</label></div></div></div></div>~',
       $decorator->render()
     );
   }
diff --git a/tests/DataHandlers/EnumDataHandlerTest.php b/tests/DataHandlers/EnumDataHandlerTest.php
index b6e2152..4b7fae7 100644
--- a/tests/DataHandlers/EnumDataHandlerTest.php
+++ b/tests/DataHandlers/EnumDataHandlerTest.php
@@ -14,7 +14,7 @@ public function testGetElement()
   {
     $ele = new EnumDataHandler();
     $this->assertEquals(
-      '<div class="p-form-field"><div class="p-form--label"><label></label></div><div class="p-form--input"><select></select></div></div>',
+      '<div class="p-form__field"><div class="p-form__label"><label></label></div><div class="p-form__input"><select></select></div></div>',
       $ele->getDecorator()->render()
     );
 
@@ -22,7 +22,7 @@ public function testGetElement()
     $ele->setOptions(['a' => 'one', 'b' => 'two']);
     $ele->validate();
     $this->assertEquals(
-      '<div class="p-form-field p-form-field--error"><div class="p-form--label"><label></label></div><div class="p-form--errors"><ul><li>not a valid value</li></ul></div><div class="p-form--input"><select><option value="a">one</option><option value="b">two</option></select></div></div>',
+      '<div class="p-form__field p-form__field--error"><div class="p-form__label"><label></label></div><div class="p-form__errors"><ul><li>not a valid value</li></ul></div><div class="p-form__input"><select><option value="a">one</option><option value="b">two</option></select></div></div>',
       $ele->getDecorator()->render()
     );
 
@@ -31,7 +31,7 @@ public function testGetElement()
     $ele->setValue('b');
     $ele->validate();
     $this->assertEquals(
-      '<div class="p-form-field"><div class="p-form--label"><label></label></div><div class="p-form--input"><select><option value="a">one</option><option value="b" selected>two</option></select></div></div>',
+      '<div class="p-form__field"><div class="p-form__label"><label></label></div><div class="p-form__input"><select><option value="a">one</option><option value="b" selected>two</option></select></div></div>',
       $ele->getDecorator()->render()
     );
 
@@ -43,7 +43,7 @@ public function testGetElement()
     $this->assertTrue($ele->isValidValue('c'));
 
     $this->assertEquals(
-      '<div class="p-form-field"><div class="p-form--label"><label></label></div><div class="p-form--input"><select><option value="a">one</option><option value="b" selected>two</option><option value="c">three</option></select></div></div>',
+      '<div class="p-form__field"><div class="p-form__label"><label></label></div><div class="p-form__input"><select><option value="a">one</option><option value="b" selected>two</option><option value="c">three</option></select></div></div>',
       $ele->getDecorator()->render()
     );
 
@@ -52,7 +52,7 @@ public function testGetElement()
     /** @var SelectDecorator $dec */
     $ele->getDecorator()->getInput()->setId('mySelect');
     $this->assertEquals(
-      '<div class="p-form-field"><div class="p-form--label"><label for="mySelect"></label></div><div class="p-form--input"><select id="mySelect"><option value="a">one</option><option value="b" selected>two</option><option value="c">three</option></select></div></div>',
+      '<div class="p-form__field"><div class="p-form__label"><label for="mySelect"></label></div><div class="p-form__input"><select id="mySelect"><option value="a">one</option><option value="b" selected>two</option><option value="c">three</option></select></div></div>',
       $ele->getDecorator()->render()
     );
   }
@@ -65,7 +65,7 @@ public function testCheckboxEnum()
     $h->setOptions(['one' => 'First', 'two' => 'Second', 'three' => 'Third']);
     $h->validate();
     $this->assertRegExp(
-      '~<div class="p-form-field p-form-field--error"><div class="p-form--label"><label>Select One</label></div><div class="p-form--errors"><ul><li>must be an array</li></ul></div><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" /><label for="\1">First</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" /><label for="\3">Third</label></div></div></div></div>~',
+      '~<div class="p-form__field p-form__field--error"><div class="p-form__label"><label>Select One</label></div><div class="p-form__errors"><ul><li>must be an array</li></ul></div><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" /><label for="\1">First</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" /><label for="\3">Third</label></div></div></div></div>~',
       $h->getDecorator()->render()
     );
 
@@ -76,7 +76,7 @@ public function testCheckboxEnum()
     $h->setValueFormatted('one');
     $h->validate();
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label>Select One</label></div><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" checked /><label for="\1">First</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" /><label for="\3">Third</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label>Select One</label></div><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" checked /><label for="\1">First</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" /><label for="\3">Third</label></div></div></div></div>~',
       $h->getDecorator()->render()
     );
 
@@ -87,7 +87,7 @@ public function testCheckboxEnum()
     $h->setValueFormatted(['one', 'three']);
     $h->validate();
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label>Select One</label></div><div class="p-form--input"><div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" checked /><label for="\1">First</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form--checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" checked /><label for="\3">Third</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label>Select One</label></div><div class="p-form__input"><div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="one" checked /><label for="\1">First</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="two" /><label for="\2">Second</label></div><div class="p-form__checkbox"><input type="checkbox" id="(mychoice-...-...)" name="mychoice\[\]" value="three" checked /><label for="\3">Third</label></div></div></div></div>~',
       $h->getDecorator()->render()
     );
   }
@@ -102,7 +102,7 @@ public function testRadioEnum()
     $h->validate();
 
     $this->assertRegExp(
-      '~<div class="p-form-field p-form-field--error"><div class="p-form--label"><label>Select One</label></div><div class="p-form--errors"><ul><li>not a valid value</li></ul></div><div class="p-form--input"><div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="one" /><label for="\1">First</label></div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="two" /><label for="\2">Second</label></div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="three" /><label for="\3">Third</label></div></div></div></div>~',
+      '~<div class="p-form__field p-form__field--error"><div class="p-form__label"><label>Select One</label></div><div class="p-form__errors"><ul><li>not a valid value</li></ul></div><div class="p-form__input"><div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="one" /><label for="\1">First</label></div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="two" /><label for="\2">Second</label></div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="three" /><label for="\3">Third</label></div></div></div></div>~',
       $h->getDecorator()->render()
     );
 
@@ -115,7 +115,7 @@ public function testRadioEnum()
     $h->validate();
 
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label>Select One</label></div><div class="p-form--input"><div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="one" checked /><label for="\1">First</label></div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="two" /><label for="\2">Second</label></div><div class="p-form--checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="three" /><label for="\3">Third</label></div></div></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label>Select One</label></div><div class="p-form__input"><div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="one" checked /><label for="\1">First</label></div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="two" /><label for="\2">Second</label></div><div class="p-form__checkbox"><input type="radio" id="(mychoice-...-...)" name="mychoice" value="three" /><label for="\3">Third</label></div></div></div></div>~',
       $h->getDecorator()->render()
     );
   }
diff --git a/tests/DataHandlers/TextDataHandlerTest.php b/tests/DataHandlers/TextDataHandlerTest.php
index f9b10e5..49c5d54 100644
--- a/tests/DataHandlers/TextDataHandlerTest.php
+++ b/tests/DataHandlers/TextDataHandlerTest.php
@@ -18,12 +18,12 @@ public function testTextHandler()
     $text->setName('test');
     $text->setValue('my text');
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label for="test-(...)">Test</label></div><div class="p-form--input"><input type="text" id="test-\1" name="test" placeholder="Test" value="my text" /></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label for="test-(...)">Test</label></div><div class="p-form__input"><input type="text" id="test-\1" name="test" placeholder="Test" value="my text" /></div></div>~',
       $text->getDecorator()->render()
     );
     $text->getDecorator()->getLabel()->setContent('changed label');
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label for="test-(...)">changed label</label></div><div class="p-form--input"><input type="text" id="test-\1" name="test" placeholder="Test" value="my text" /></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label for="test-(...)">changed label</label></div><div class="p-form__input"><input type="text" id="test-\1" name="test" placeholder="Test" value="my text" /></div></div>~',
       $text->getDecorator()->render()
     );
   }
@@ -35,7 +35,7 @@ public function testElementOrder()
     $text->setValue('my text');
     $text->getDecorator()->setElementOrder([DataHandlerDecorator::INPUT, DataHandlerDecorator::LABEL]);
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--input"><input type="text" id="(test-...)" name="test" placeholder="Test" value="my text" /></div><div class="p-form--label"><label for="\1">Test</label></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__input"><input type="text" id="(test-...)" name="test" placeholder="Test" value="my text" /></div><div class="p-form__label"><label for="\1">Test</label></div></div>~',
       $text->getDecorator()->render()
     );
   }
@@ -65,7 +65,7 @@ public function testHidden()
     $text->setName('text');
     $text->setDecorator($dec);
     $this->assertRegExp(
-      '~<div class="p-form-field"><div class="p-form--label"><label for="(text-...)">Text</label></div><div class="p-form--input"><input type="hidden" id="\1" name="text" /></div></div>~',
+      '~<div class="p-form__field"><div class="p-form__label"><label for="(text-...)">Text</label></div><div class="p-form__input"><input type="hidden" id="\1" name="text" /></div></div>~',
       $text->getDecorator()->render()
     );
   }
diff --git a/tests/Decorators/FormCustomDecoratorTest.php b/tests/Decorators/FormCustomDecoratorTest.php
index e732aac..489f132 100644
--- a/tests/Decorators/FormCustomDecoratorTest.php
+++ b/tests/Decorators/FormCustomDecoratorTest.php
@@ -24,7 +24,7 @@ public function testCustomDecorator()
     $this->assertContains('placeholder="Email" value="test@example.com"', $output);
     $this->assertContains('placeholder="Name" value="Mr Test"', $output);
     $this->assertContains('<div class="err"></div>', $output);
-    $this->assertContains('<div class="inp"><div class="p-form--input">', $output);
-    $this->assertContains('<div class="lbl"><div class="p-form--label">', $output);
+    $this->assertContains('<div class="inp"><div class="p-form__input">', $output);
+    $this->assertContains('<div class="lbl"><div class="p-form__label">', $output);
   }
 }