haml/haml — pull request #544 by mattwildig (2012-05-24 23:21:30+00:00)
Title: Resolve test name conflict.

I think this one was hiding on the stable branch, which is why I’ve only just found the redefined method warning.

It’s been there a while too: 60e498d0444466cab7fa5c1667a175986ce72211.

(actual commit message below)

Rename the second of the two
`test_haml_tag_name_and_attribute_classes_merging` tests so it doesn't
override the first.

Swap order of expected classes so that it passes.