fixed broken test after latest changes

rhodecode/tests/__init__.py

@@ -30,7 +30,7 import pylons.test
 #SetupCommand('setup-app').run([config_file])
 
 ##RUNNING DESIRED TESTS
-#nosetests rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account
+#nosetests -x rhodecode.tests.functional.test_admin_settings:TestSettingsController.test_my_account
 
 environ = {}
 

rhodecode/tests/functional/test_admin_settings.py

@@ -71,7 +71,7 class TestAdminSettingsController(TestCo
                                                             email=new_email,))
         response.follow()
 
-        assert 'Your account was updated succesfully' in response.session['flash'][0][1], 'no flash message about success of change'
+        assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change'
         user = self.sa.query(User).filter(User.username == 'test_admin').one()
         assert user.email == new_email , 'incorrect user email after update got %s vs %s' % (user.email, new_email)
         assert user.name == new_name, 'updated field mismatch %s vs %s' % (user.name, new_name)
@@ -94,7 +94,7 class TestAdminSettingsController(TestCo
                                                             email=old_email,))
 
         response.follow()
-        assert 'Your account was updated succesfully' in response.session['flash'][0][1], 'no flash message about success of change'
+        assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change'
         user = self.sa.query(User).filter(User.username == 'test_admin').one()
         assert user.email == old_email , 'incorrect user email after update got %s vs %s' % (user.email, old_email)
 

rhodecode/tests/functional/test_files.py

@@ -74,7 +74,7 class TestFilesController(TestController
                                     f_path='vcs/nodes.py'))
 
         #test or history
-        assert """<select id="diff1" name="diff1">
+        assert """<optgroup label="Changesets">
 <option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776</option>
 <option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35</option>
 <option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c</option>
@@ -108,7 +108,19 class TestFilesController(TestController
 <option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283</option>
 <option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6</option>
 <option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3</option>
-</select>""" in response.body
+</optgroup>
+<optgroup label="Branches">
+<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>
+<option value="97e8b885c04894463c51898e14387d80c30ed1ee">git</option>
+<option value="2e6a2bf9356ca56df08807f4ad86d480da72a8f4">web</option>
+</optgroup>
+<optgroup label="Tags">
+<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">tip</option>
+<option value="fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200">0.1.4</option>
+<option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>
+<option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>
+<option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
+</optgroup>""" in response.body
 
 
         assert """<div class="commit">"Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now.
@@ -126,8 +138,9 removed extra unicode conversion in diff
                                     revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',
                                     f_path='vcs/nodes.py'))
 
-
-        assert """<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776</option>
+        print response.body
+        assert """<optgroup label="Changesets">
+<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776</option>
 <option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35</option>
 <option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c</option>
 <option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329</option>
@@ -160,6 +173,18 removed extra unicode conversion in diff
 <option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283</option>
 <option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6</option>
 <option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3</option>
-</select>""" in response.body, 'missing history in annotation'
+</optgroup>
+<optgroup label="Branches">
+<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>
+<option value="97e8b885c04894463c51898e14387d80c30ed1ee">git</option>
+<option value="2e6a2bf9356ca56df08807f4ad86d480da72a8f4">web</option>
+</optgroup>
+<optgroup label="Tags">
+<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">tip</option>
+<option value="fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200">0.1.4</option>
+<option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>
+<option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>
+<option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>
+</optgroup>""" in response.body, 'missing or wrong history in annotation'
 
         assert """<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""" in response.body, 'missing or wrong branch info'

rhodecode/tests/functional/test_summary.py

@@ -11,7 +11,9 class TestSummaryController(TestControll
         assert """<img style="margin-bottom:2px" class="icon" title="public repository" alt="public repository" src="/images/icons/lock_open.png"/>""" in response.body
 
         #codes stats
-        assert """var data = {"text/x-python": 42, "text/plain": 12};""" in response.body, 'wrong info about % of codes stats'
+        assert """var data = {"Python": 42, "Rst": 11, "Bash": 2, "Makefile": 1, "Batch": 1, "Ini": 1, "Css": 1};""" in response.body, 'wrong info about % of codes stats'
 
         # clone url...
         assert """<input type="text" id="clone_url" readonly="readonly" value="hg clone http://test_admin@localhost:80/%s" size="70"/>""" % HG_REPO in response.body
+
+