Skip to content

Commit

Permalink
Fix textarea regression bug. Add textarea unit test.
Browse files Browse the repository at this point in the history
  • Loading branch information
rustyio committed Mar 24, 2009
1 parent 8d31d8c commit c68c0a6
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 3 deletions.
37 changes: 35 additions & 2 deletions Nitrogen.tmproj
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,8 @@
<date>2009-01-03T22:05:52Z</date>
</dict>
</array>
<key>expanded</key>
<true/>
<key>name</key>
<string>Forms</string>
</dict>
Expand Down Expand Up @@ -528,6 +530,8 @@
<string>Other</string>
</dict>
</array>
<key>expanded</key>
<true/>
<key>name</key>
<string>Elements</string>
</dict>
Expand Down Expand Up @@ -723,7 +727,7 @@
<key>filename</key>
<string>src/lib/wf_tags.erl</string>
<key>lastUsed</key>
<date>2009-01-24T14:45:29Z</date>
<date>2009-03-24T00:23:00Z</date>
</dict>
<dict>
<key>filename</key>
Expand Down Expand Up @@ -1266,6 +1270,20 @@
<key>firstVisibleLine</key>
<integer>95</integer>
</dict>
<key>src/platforms/nitrogen_inets_app.erl</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>22</integer>
<key>line</key>
<integer>17</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>src/platforms/nitrogen_mochiweb_app.erl</key>
<dict>
<key>caret</key>
Expand Down Expand Up @@ -1437,6 +1455,21 @@
<key>subItems</key>
<dict/>
</dict>
<key>Elements</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>Forms</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
<key>Lib</key>
<dict>
<key>isExpanded</key>
Expand Down Expand Up @@ -1476,6 +1509,6 @@
</dict>
</dict>
<key>windowFrame</key>
<string>{{312, 0}, {907, 778}}</string>
<string>{{310, 0}, {907, 778}}</string>
</dict>
</plist>
5 changes: 4 additions & 1 deletion src/lib/wf_tags.erl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ emit_tag(TagName, Props) ->
emit_tag(TagName, [[], []], Props) ->
emit_tag(TagName, Props);

emit_tag(TagName, [], Props) when TagName =/= 'div' ->
emit_tag(TagName, [], Props) when
TagName =/= 'div',
TagName =/= 'textarea'
->
emit_tag(TagName, Props);

emit_tag(TagName, Content, Props) ->
Expand Down
26 changes: 26 additions & 0 deletions test/src/elements/forms/element_textarea_test.erl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-module(element_textarea_test).
-compile([export_all]).

-include_lib("eunit/include/eunit.hrl").

-include("wf.inc").

new_textarea_1() ->
Rec_textarea = #textarea{},
lists:flatten(element_textarea:render("1",Rec_textarea)).

new_textarea_2() ->
Rec_textarea = #textarea{class="t_textarea"},
lists:flatten(element_textarea:render("2",Rec_textarea)).

new_textarea_3() ->
Rec_textarea = #textarea{class="t_textarea", style="color: cyan;", text="TEXT"},
lists:flatten(element_textarea:render("3",Rec_textarea)).

basic_test_() ->
[?_assertEqual("<textarea id='1' name='1' class='textarea'></textarea>",new_textarea_1()),
?_assertEqual("<textarea id='2' name='2' class='textarea t_textarea'></textarea>",new_textarea_2()),
?_assertEqual("<textarea id='3' name='3' class='textarea t_textarea' style='color: cyan;'>TEXT</textarea>",new_textarea_3()),
?_assertEqual([module,id,actions,show_if,class,style,text,html_encode],
element_textarea:reflect())
].
2 changes: 2 additions & 0 deletions test/src/test_suite.erl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ all_test_() ->
{module, element_span_test},
{module, element_value_test},

{module, element_textarea_test},

{module, action_add_class_test},
{module, action_alert_test},
{module, action_jquery_effect_test},
Expand Down

0 comments on commit c68c0a6

Please sign in to comment.