Changeset 1188 for trunk/testapp/modules

Show
Ignore:
Timestamp:
12/01/08 12:58:35 (1 month ago)
Author:
julieni
Message:

ticket #751: jForms: javascript check of secret control's confirmation does not work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

    r1176 r1188  
    10081008        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10091009        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" value=""/>', $out); 
    1010         $this->assertEqualOrDiff('c = new jFormsJQControlString(\'passwd\', \'mot de passe\'); 
     1010        $this->assertEqualOrDiff('c = new jFormsJQControlSecret(\'passwd\', \'mot de passe\'); 
    10111011c.errInvalid=\'"mot de passe" field is invalid\'; 
    10121012jFormsJQ.tForm.addControl(c); 
    …… 
    10161016        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10171017        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" value="laurent"/>', $out); 
    1018         $this->assertEqualOrDiff('c = new jFormsJQControlString(\'passwd\', \'mot de passe\'); 
     1018        $this->assertEqualOrDiff('c = new jFormsJQControlSecret(\'passwd\', \'mot de passe\'); 
    10191019c.errInvalid=\'"mot de passe" field is invalid\'; 
    10201020jFormsJQ.tForm.addControl(c); 
    …… 
    10241024        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10251025        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" class=" jforms-readonly" value="laurent"/>', $out); 
    1026         $this->assertEqualOrDiff('c = new jFormsJQControlString(\'passwd\', \'mot de passe\'); 
     1026        $this->assertEqualOrDiff('c = new jFormsJQControlSecret(\'passwd\', \'mot de passe\'); 
    10271027c.errInvalid=\'"mot de passe" field is invalid\'; 
    10281028jFormsJQ.tForm.addControl(c); 
    …… 
    10341034        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10351035        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" value="laurent"/>', $out); 
    1036         $this->assertEqualOrDiff('c = new jFormsJQControlString(\'passwd\', \'mot de passe\'); 
     1036        $this->assertEqualOrDiff('c = new jFormsJQControlSecret(\'passwd\', \'mot de passe\'); 
    10371037c.errInvalid=\'"mot de passe" field is invalid\'; 
    10381038jFormsJQ.tForm.addControl(c); 
    …… 
    10431043        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10441044        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" maxlength="10" value="laurent"/>', $out); 
    1045         $this->assertEqualOrDiff('c = new jFormsJQControlString(\'passwd\', \'mot de passe\'); 
     1045        $this->assertEqualOrDiff('c = new jFormsJQControlSecret(\'passwd\', \'mot de passe\'); 
    10461046c.maxLength = \'10\'; 
    10471047c.minLength = \'5\'; 
    …… 
    10621062        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10631063        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" value=""/>', $out); 
    1064         $this->assertEqualOrDiff('c.confirmField = new jFormsJQControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
    1065 ', $this->builder->getJsContent()); 
     1064        $this->assertEqualOrDiff('c = new jFormsJQControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1065c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1066jFormsJQ.tForm.addControl(c); 
     1067', $this->builder->getJsContent()); 
     1068 
     1069        $ctrl->required = true; 
     1070        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
     1071        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" class=" jforms-required" value=""/>', $out); 
     1072        $this->assertEqualOrDiff('c = new jFormsJQControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1073c.required = true; 
     1074c.errRequired=\'"confirmation mot de passe" field is required\'; 
     1075c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1076jFormsJQ.tForm.addControl(c); 
     1077', $this->builder->getJsContent()); 
     1078        $ctrl->required = false; 
    10661079 
    10671080 
    …… 
    10691082        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10701083        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" readonly="readonly" class=" jforms-readonly" value=""/>', $out); 
    1071         $this->assertEqualOrDiff('c.confirmField = new jFormsJQControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
     1084        $this->assertEqualOrDiff('c = new jFormsJQControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1085c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1086jFormsJQ.tForm.addControl(c); 
    10721087', $this->builder->getJsContent()); 
    10731088 
    …… 
    10781093        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10791094        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" value=""/>', $out); 
    1080         $this->assertEqualOrDiff('c.confirmField = new jFormsJQControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
     1095        $this->assertEqualOrDiff('c = new jFormsJQControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1096c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1097jFormsJQ.tForm.addControl(c); 
    10811098', $this->builder->getJsContent()); 
    10821099 

  • trunk/testapp/modules/jelix_tests/tests/jforms.htmllightbuilder.html_cli.php

    r1176 r1188  
    10051005        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10061006        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" value=""/>', $out); 
    1007         $this->assertEqualOrDiff('c = new jFormsControlString(\'passwd\', \'mot de passe\'); 
     1007        $this->assertEqualOrDiff('c = new jFormsControlSecret(\'passwd\', \'mot de passe\'); 
    10081008c.errInvalid=\'"mot de passe" field is invalid\'; 
    10091009jForms.tForm.addControl(c); 
    …… 
    10131013        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10141014        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" value="laurent"/>', $out); 
    1015         $this->assertEqualOrDiff('c = new jFormsControlString(\'passwd\', \'mot de passe\'); 
     1015        $this->assertEqualOrDiff('c = new jFormsControlSecret(\'passwd\', \'mot de passe\'); 
    10161016c.errInvalid=\'"mot de passe" field is invalid\'; 
    10171017jForms.tForm.addControl(c); 
    …… 
    10211021        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10221022        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" class=" jforms-readonly" value="laurent"/>', $out); 
    1023         $this->assertEqualOrDiff('c = new jFormsControlString(\'passwd\', \'mot de passe\'); 
     1023        $this->assertEqualOrDiff('c = new jFormsControlSecret(\'passwd\', \'mot de passe\'); 
    10241024c.errInvalid=\'"mot de passe" field is invalid\'; 
    10251025jForms.tForm.addControl(c); 
    …… 
    10311031        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10321032        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" value="laurent"/>', $out); 
    1033         $this->assertEqualOrDiff('c = new jFormsControlString(\'passwd\', \'mot de passe\'); 
     1033        $this->assertEqualOrDiff('c = new jFormsControlSecret(\'passwd\', \'mot de passe\'); 
    10341034c.errInvalid=\'"mot de passe" field is invalid\'; 
    10351035jForms.tForm.addControl(c); 
    …… 
    10401040        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10411041        $this->assertEqualOrDiff('<input type="password" name="passwd" id="'.$this->formname.'_passwd" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" maxlength="10" value="laurent"/>', $out); 
    1042         $this->assertEqualOrDiff('c = new jFormsControlString(\'passwd\', \'mot de passe\'); 
     1042        $this->assertEqualOrDiff('c = new jFormsControlSecret(\'passwd\', \'mot de passe\'); 
    10431043c.maxLength = \'10\'; 
    10441044c.minLength = \'5\'; 
    …… 
    10591059        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10601060        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" value=""/>', $out); 
    1061         $this->assertEqualOrDiff('c.confirmField = new jFormsControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
    1062 ', $this->builder->getJsContent()); 
     1061        $this->assertEqualOrDiff('c = new jFormsControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1062c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1063jForms.tForm.addControl(c); 
     1064', $this->builder->getJsContent()); 
     1065 
     1066        $ctrl->required = true; 
     1067        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
     1068        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" class=" jforms-required" value=""/>', $out); 
     1069        $this->assertEqualOrDiff('c = new jFormsControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1070c.required = true; 
     1071c.errRequired=\'"confirmation mot de passe" field is required\'; 
     1072c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1073jForms.tForm.addControl(c); 
     1074', $this->builder->getJsContent()); 
     1075        $ctrl->required = false; 
    10631076 
    10641077 
    …… 
    10661079        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10671080        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" readonly="readonly" class=" jforms-readonly" value=""/>', $out); 
    1068         $this->assertEqualOrDiff('c.confirmField = new jFormsControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
     1081        $this->assertEqualOrDiff('c = new jFormsControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1082c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1083jForms.tForm.addControl(c); 
    10691084', $this->builder->getJsContent()); 
    10701085 
    …… 
    10751090        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean(); 
    10761091        $this->assertEqualOrDiff('<input type="password" name="passwd_confirm" id="'.$this->formname.'_passwd_confirm" readonly="readonly" title="ceci est un tooltip" class=" jforms-readonly" value=""/>', $out); 
    1077         $this->assertEqualOrDiff('c.confirmField = new jFormsControlSecretConfirm(\'passwd_confirm_confirm\', \'confirmation mot de passe\'); 
     1092        $this->assertEqualOrDiff('c = new jFormsControlConfirm(\'passwd_confirm\', \'confirmation mot de passe\'); 
     1093c.errInvalid=\'"confirmation mot de passe" field is invalid\'; 
     1094jForms.tForm.addControl(c); 
    10781095', $this->builder->getJsContent()); 
    10791096 
Download in other formats: Unified Diff Zip Archive