You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/07/22 14:31:26 UTC

[30/42] allura git commit: [#7897] ticket:814 Fix tests failing due to new widget layout

[#7897] ticket:814 Fix tests failing due to new widget layout


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/18ca4309
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/18ca4309
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/18ca4309

Branch: refs/heads/ib/7897
Commit: 18ca4309b9477cbecc0eedd01ef35357f5be68da
Parents: b246d8f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Jul 8 12:10:12 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Jul 22 10:59:52 2015 +0300

----------------------------------------------------------------------
 ForgeGit/forgegit/tests/functional/test_controllers.py  | 8 --------
 ForgeTracker/forgetracker/tests/functional/test_root.py | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/18ca4309/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index b84cd5a..0affb8c 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -721,14 +721,6 @@ class TestFork(_TestCase):
         assert '<option selected value="zz">zz</option>' in r
         md_edit = r.html.find('div', {'class': 'markdown_edit'})
         assert md_edit is not None, 'MarkdownEdit widget not found'
-        description = md_edit.find('textarea')
-        assert_equal(description['name'], 'description')
-        assert_equal(description['class'], 'auto_resize description')
-        help_btn = md_edit.find('a', {'class': 'markdown_help btn'})
-        preview_btn = md_edit.find('a', {'class': 'markdown_preview btn'})
-        assert_equal(help_btn['href'], '/p/test/src-git/markdown_syntax_dialog')
-        assert_equal(help_btn['title'], 'Formatting Help')
-        assert_equal(preview_btn['title'], 'Preview')
 
         r = self.app.post('/p/test/src-git/merge-requests/1/do_request_merge_edit',
             params={

http://git-wip-us.apache.org/repos/asf/allura/blob/18ca4309/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 871f0fd..8031555 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -840,7 +840,7 @@ class TestFunctionalController(TrackerTestController):
         }, upload_files=[upload]).follow()
         assert file_name in ticket_editor, ticket_editor.showbrowser()
         req = self.app.get('/bugs/1/')
-        file_link = req.html.findAll('form')[1].findAll('a')[6]
+        file_link = req.html.findAll('form')[1].findAll('a')[1]
         assert_equal(file_link.string, file_name)
         self.app.post(str(file_link['href']), {
             'delete': 'True'
@@ -882,7 +882,7 @@ class TestFunctionalController(TrackerTestController):
         ticket_editor = self.app.post('/bugs/1/update_ticket', {
             'summary': 'zzz'
         }, upload_files=[upload]).follow()
-        download = self.app.get(str(ticket_editor.html.findAll('form')[1].findAll('a')[7]['href']))
+        download = self.app.get(str(ticket_editor.html.findAll('form')[1].findAll('a')[1]['href']))
         assert_equal(download.body, file_data)
 
     def test_two_attachments(self):