Return-Path: X-Original-To: apmail-allura-commits-archive@www.apache.org Delivered-To: apmail-allura-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE7D318D2A for ; Wed, 29 Jul 2015 21:10:02 +0000 (UTC) Received: (qmail 92607 invoked by uid 500); 29 Jul 2015 21:10:02 -0000 Delivered-To: apmail-allura-commits-archive@allura.apache.org Received: (qmail 92560 invoked by uid 500); 29 Jul 2015 21:10:02 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 91732 invoked by uid 99); 29 Jul 2015 21:10:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2015 21:10:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DFF6E6824; Wed, 29 Jul 2015 21:10:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: commits@allura.apache.org Date: Wed, 29 Jul 2015 21:10:16 -0000 Message-Id: <0246e1ca1275457a84d4a0fafdd93bd1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/41] 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/682ce1be Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/682ce1be Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/682ce1be Branch: refs/heads/master Commit: 682ce1be555971f933749daa928f14e0473a9021 Parents: a3a5b8b Author: Igor Bondarenko Authored: Wed Jul 8 12:10:12 2015 +0300 Committer: Igor Bondarenko Committed: Mon Jul 27 14:23:55 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/682ce1be/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 7f6bf88..48969fc 100644 --- a/ForgeGit/forgegit/tests/functional/test_controllers.py +++ b/ForgeGit/forgegit/tests/functional/test_controllers.py @@ -725,14 +725,6 @@ class TestFork(_TestCase): assert '' 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/682ce1be/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 de061ca..89041d7 100644 --- a/ForgeTracker/forgetracker/tests/functional/test_root.py +++ b/ForgeTracker/forgetracker/tests/functional/test_root.py @@ -841,7 +841,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' @@ -883,7 +883,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):