Author: jab Date: 2009-02-19 10:00:56 -0700 (Thu, 19 Feb 2009) New Revision: 3786
Modified: FormEncode/trunk/tests/test_htmlfill.py Log: apply patches from http://sourceforge.net/tracker2/?func=detail&aid=2616805&group_id=91231&atid=596416 to fix test failures and keep test names consistent. thanks Marius Gedminas (mgedmin) Modified: FormEncode/trunk/tests/test_htmlfill.py =================================================================== --- FormEncode/trunk/tests/test_htmlfill.py 2009-02-19 15:08:48 UTC (rev 3785) +++ FormEncode/trunk/tests/test_htmlfill.py 2009-02-19 17:00:56 UTC (rev 3786) @@ -134,91 +134,91 @@ dict(tags=[])) == '<input type="checkbox" name="tags" value="2" />') -def test_defaults_not_form_submission_textarea(): +def test_not_force_defaults_textarea(): html = """<textarea name="textarea-1" class="my_textarea">i like this text</textarea>""" rendered_html = htmlfill.render(html, defaults=dict(), - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_not_form_submission_textarea_value(): +def test_not_force_defaults_textarea_value(): html = """<textarea name="textarea-1" class="my_textarea">i like this text</textarea>""" expected_html = """<textarea name="textarea-1" class="my_textarea">this text is better</textarea>""" rendered_html = htmlfill.render(html, defaults={"textarea-1": "this text is better"}, - defaults_as_form_submission=False) + force_defaults=False) assert expected_html == rendered_html, rendered_html -def test_defaults_as_form_submission_textarea(): +def test_force_defaults_textarea(): html = """<textarea name="textarea-1" class="my_textarea">i like this text</textarea>""" expected_html = \ """<textarea name="textarea-1" class="my_textarea"></textarea>""" rendered_html = htmlfill.render(html, defaults=dict()) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_checkbox(): +def test_not_force_defaults_checkbox(): html = """<input type="checkbox" name="checkbox-1" class="my_checkbox" checked="checked" value="cb">""" rendered_html = htmlfill.render(html, defaults=dict(), - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_as_form_submission_checkbox(): +def test_force_defaults_checkbox(): html = """<input type="checkbox" name="checkbox-1" class="my_checkbox" checked="checked" value="cb">""" expected_html = \ """<input type="checkbox" name="checkbox-1" class="my_checkbox" value="cb">""" rendered_html = htmlfill.render(html, defaults=dict()) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_checkbox_default_unchecked(): +def test_not_force_defaults_checkbox_default_unchecked(): html = """<input type="checkbox" name="checkbox-1" class="my_checkbox" checked="checked" value="cb">""" expected_html = \ """<input type="checkbox" name="checkbox-1" class="my_checkbox" value="cb">""" rendered_html = htmlfill.render(html, defaults={"checkbox-1": False}) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_checkbox_default_checked(): +def test_not_force_defaults_checkbox_default_checked(): html = """<input type="checkbox" name="checkbox-1" class="my_checkbox" value="cb">""" expected_html = \ """<input type="checkbox" name="checkbox-1" class="my_checkbox" value="cb" checked="checked">""" rendered_html = htmlfill.render(html, defaults={"checkbox-1": "cb"}, - defaults_as_form_submission=False) + force_defaults=False) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_radio(): +def test_not_force_defaults_radio(): html = """<input type="radio" name="radio-1" class="my_radio" checked="checked" value="cb">""" rendered_html = htmlfill.render(html, defaults=dict(), - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_not_form_submission_radio_unchecked(): +def test_not_force_defaults_radio_unchecked(): html = """<input type="radio" name="radio-1" class="my_radio" checked="checked" value="cb">""" expected_html = """<input type="radio" name="radio-1" class="my_radio" value="cb">""" rendered_html = htmlfill.render(html, defaults={"radio-1": "ba"}, - defaults_as_form_submission=False) + force_defaults=False) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_radio_checked(): +def test_not_force_defaults_radio_checked(): html = """<input type="radio" name="radio-1" class="my_radio" value="cb">""" expected_html = """<input type="radio" name="radio-1" class="my_radio" value="cb" checked="checked">""" rendered_html = htmlfill.render(html, defaults={"radio-1": "cb"}, - defaults_as_form_submission=False) + force_defaults=False) assert expected_html == rendered_html, rendered_html -def test_defaults_as_form_submission_radio(): +def test_force_defaults_radio(): html = """<input type="radio" name="radio-1" class="my_radio" checked="checked" value="cb">""" expected_html = """<input type="radio" name="radio-1" class="my_radio" value="cb">""" rendered_html = htmlfill.render(html, defaults=dict()) assert expected_html == rendered_html, rendered_html -def test_defaults_not_form_submission_select(): +def test_not_force_defaults_select(): html = """ <select name="select-1" class="my_select"> <option value="option-1" selected="selected">this is option-1</option> </select> """ rendered_html = htmlfill.render(html, defaults=dict(), - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_not_form_submission_select_selected(): +def test_not_force_defaults_select_selected(): html = """ <select name="select-1" class="my_select"> <option value="option-1">this is option-1</option> @@ -230,10 +230,10 @@ </select> """ rendered_html = htmlfill.render(html, defaults={"select-1": "option-1"}, - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_not_form_submission_select_not_selected(): +def test_not_force_defaults_select_not_selected(): html = """ <select name="select-1" class="my_select"> <option value="option-1" selected="selected">this is option-1</option> @@ -245,10 +245,10 @@ </select> """ rendered_html = htmlfill.render(html, defaults={"select-1": "option-2"}, - defaults_as_form_submission=False) + force_defaults=False) assert html == rendered_html, rendered_html -def test_defaults_as_form_submission_select(): +def test_force_defaults_select(): html = """ <select name="select-1" class="my_select"> <option value="option-1" selected="selected">this is option-1</option> ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ FormEncode-CVS mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/formencode-cvs
