From e0dc5206486dc6370b102fb80b050b7c81bf2420 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 21 Dec 2009 17:26:24 -0800 Subject: Updated for recent K24 Forge changes. --- modules/gallery/tests/DrawForm_Test.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'modules/gallery/tests/DrawForm_Test.php') diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php index 7ee80ca2..baded8de 100644 --- a/modules/gallery/tests/DrawForm_Test.php +++ b/modules/gallery/tests/DrawForm_Test.php @@ -25,9 +25,10 @@ class DrawForm_Test extends Unit_Test_Case { $form->submit("")->value(t("Submit")); $rendered = $form->__toString(); + $csrf = access::csrf_token(); $expected = "
\n" . - "\n" . + "" . " \n" . - "
\n"; + ""; $this->assert_same($expected, $rendered); } @@ -55,9 +56,10 @@ class DrawForm_Test extends Unit_Test_Case { $group->submit("")->value(t("Submit")); $rendered = $form->__toString(); + $csrf = access::csrf_token(); $expected = "
\n" . - "\n" . + "" . "
\n" . " Test Group\n" . "
    \n" . @@ -68,7 +70,7 @@ class DrawForm_Test extends Unit_Test_Case { " \n" . "
  • \n" . " \n" . - " \n" . "
    • \n" . "
  • \n" . @@ -76,7 +78,7 @@ class DrawForm_Test extends Unit_Test_Case { "
    • \n" . "
\n" . "
\n" . - "
\n"; + ""; $this->assert_same($expected, $rendered); } @@ -91,9 +93,10 @@ class DrawForm_Test extends Unit_Test_Case { $group->submit("")->value(t("Submit")); $rendered = $form->__toString(); + $csrf = access::csrf_token(); $expected = "
\n" . - "\n" . + "" . "
\n" . " Test Group\n" . "
    \n" . @@ -104,7 +107,7 @@ class DrawForm_Test extends Unit_Test_Case { " \n" . "
  • \n" . " \n" . - " \n" . "
    • \n" . "
  • \n" . @@ -116,7 +119,7 @@ class DrawForm_Test extends Unit_Test_Case { "\n" . - "
    • \n"; + ""; $this->assert_same($expected, $rendered); } } -- cgit v1.2.3 From fda4227bb10d7c9ae4de5f16e59890bf7cf3b83b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 22 Dec 2009 14:00:52 -0800 Subject: Latest K24 does not automatically add an id attribute to every form element with the same value as the name. Yay! That was a weird and unexpected behavior. --- modules/gallery/tests/DrawForm_Test.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/gallery/tests/DrawForm_Test.php') diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php index baded8de..90361d06 100644 --- a/modules/gallery/tests/DrawForm_Test.php +++ b/modules/gallery/tests/DrawForm_Test.php @@ -28,16 +28,16 @@ class DrawForm_Test extends Unit_Test_Case { $csrf = access::csrf_token(); $expected = "
    \n" . - "" . + "" . "
      \n" . "
    • \n" . " \n" . - " \n" . "
      • \n" . "
    • \n" . " \n" . - " \n" . "
      • \n" . "
    • \n" . @@ -59,18 +59,18 @@ class DrawForm_Test extends Unit_Test_Case { $csrf = access::csrf_token(); $expected = "\n" . - "" . + "" . "
      \n" . " Test Group\n" . "
        \n" . "
      • \n" . " \n" . - " \n" . "
        • \n" . "
      • \n" . " \n" . - " \n" . "
        • \n" . "
      • \n" . @@ -96,18 +96,18 @@ class DrawForm_Test extends Unit_Test_Case { $csrf = access::csrf_token(); $expected = "\n" . - "" . + "" . "
        \n" . " Test Group\n" . "
          \n" . "
        • \n" . " \n" . - " \n" . "
          • \n" . "
        • \n" . " \n" . - " \n" . "
          • \n" . "
        • \n" . -- cgit v1.2.3 From a018e6235f09dd727b07f24801a8f237e07b3260 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 31 Dec 2009 15:49:43 -0800 Subject: Modify Forge to accept multiple hidden params (this was broken by an API change in K24). --- modules/forge/libraries/Forge.php | 5 ++++- modules/gallery/tests/DrawForm_Test.php | 23 +++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'modules/gallery/tests/DrawForm_Test.php') diff --git a/modules/forge/libraries/Forge.php b/modules/forge/libraries/Forge.php index 5807c849..9179aaeb 100644 --- a/modules/forge/libraries/Forge.php +++ b/modules/forge/libraries/Forge.php @@ -299,7 +299,10 @@ class Forge_Core { } // Set the form open and close - $form->open = form::$form_type(arr::remove('action', $this->attr), $this->attr, $hidden); + $form->open = form::$form_type(arr::remove('action', $this->attr), $this->attr); + foreach ($this->hidden as $hidden) { + $form->open .= form::hidden($hidden->name, $hidden->value); + } $form->close = ""; // Set the inputs diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php index 90361d06..da8a6b04 100644 --- a/modules/gallery/tests/DrawForm_Test.php +++ b/modules/gallery/tests/DrawForm_Test.php @@ -23,7 +23,6 @@ class DrawForm_Test extends Unit_Test_Case { $form->input("title")->label(t("Title")); $form->textarea("description")->label(t("Text Area")); $form->submit("")->value(t("Submit")); - $rendered = $form->__toString(); $csrf = access::csrf_token(); $expected = "
          \n" . "
        \n" . ""; - $this->assert_same($expected, $rendered); + $this->assert_same($expected, (string) $form); } function group_test() { @@ -54,7 +53,6 @@ class DrawForm_Test extends Unit_Test_Case { $group->input("title")->label(t("Title")); $group->textarea("description")->label(t("Text Area")); $group->submit("")->value(t("Submit")); - $rendered = $form->__toString(); $csrf = access::csrf_token(); $expected = "
        \n" . "
        \n" . ""; - $this->assert_same($expected, $rendered); + $this->assert_same($expected, (string) $form); } function form_script_test() { @@ -91,7 +89,6 @@ class DrawForm_Test extends Unit_Test_Case { ->url(url::file("test.js")) ->text("alert('Test Javascript');"); $group->submit("")->value(t("Submit")); - $rendered = $form->__toString(); $csrf = access::csrf_token(); $expected = "
        \n" . "
        "; - $this->assert_same($expected, $rendered); + $this->assert_same($expected, (string) $form); + } + + function two_hiddens_test() { + $form = new Forge("test/controller", "", "post"); + $form->hidden("HIDDEN_NAME")->value("HIDDEN_VALUE"); + + $csrf = access::csrf_token(); + $expected = "
        \n" . + "" . + "" . + "
          \n" . + "
        \n" . + "
        "; + $this->assert_same($expected, (string) $form); } } -- cgit v1.2.3