Commit: 6fa633948d23e689495ee4f9c46ac6754a5b0a8f - allura (git)

allura

Commit MetaInfo

• Révision: 6fa633948d23e689495ee4f9c46ac6754a5b0a8f (tree)
• l'heure: 2012-07-07 00:47:08
• Auteur: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Yaroslav Luzin

Message de Log

[#4481] ticket:100 Fix test

Change Summary

• modified: Allura/allura/templates/widgets/vote.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py

Modification

--- a/Allura/allura/templates/widgets/vote.html
+++ b/Allura/allura/templates/widgets/vote.html
@@ -6,9 +6,9 @@
   Vote for this ticket:
   <br />
   <span class='vote-uparrow {% if can_vote %}vote-up{% endif %}'>&uArr;</span>
-  <span class='votes-up {% if voted == 1 %}voted{% endif %}'>{{artifact.votes_up}}</span> up&nbsp;
+  <span id='votes-up' class='votes-up {% if voted == 1 %}voted{% endif %}'>{{artifact.votes_up}}</span> up&nbsp;
   <span class='vote-downarrow {% if can_vote %}vote-down{% endif %}'>&dArr;</span>
-  <span class='votes-down {% if voted == -1 %}voted{% endif %}'>{{artifact.votes_down}}</span> down
+  <span id='votes-down' class='votes-down {% if voted == -1 %}voted{% endif %}'>{{artifact.votes_down}}</span> down
   {% if can_vote %}
   <form action="{{ action }}" method="POST">
     {# csrf protection will be automatically inserted here (_session_id field) #}

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -780,9 +780,10 @@ class TestFunctionalController(TrackerTestController):
 
     def test_vote(self):
         r = self.new_ticket(summary='test vote').follow()
-        vote = r.html.find('div', {'id': 'vote'})
-        assert_in('0 up', str(vote))
-        assert_in('0 down', str(vote))
+        votes_up = r.html.find('span', {'id': 'votes-up'})
+        votes_down = r.html.find('span', {'id': 'votes-down'})
+        assert_in('0', str(votes_up))
+        assert_in('0', str(votes_down))
 
         # invalid vote
         r = self.app.post('/bugs/1/vote', dict(vote='invalid'))
@@ -806,9 +807,10 @@ class TestFunctionalController(TrackerTestController):
 
         # make sure that on the page we see the same result
         r = self.app.get('/bugs/1/')
-        vote = r.html.find('div', {'id': 'vote'})
-        assert_in('1 up', str(vote))
-        assert_in('1 down', str(vote))
+        votes_up = r.html.find('span', {'id': 'votes-up'})
+        votes_down = r.html.find('span', {'id': 'votes-down'})
+        assert_in('1', str(votes_up))
+        assert_in('1', str(votes_down))
 
 
 class TestMilestoneAdmin(TrackerTestController):