Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E2B310513 for ; Mon, 21 Oct 2013 21:09:25 +0000 (UTC) Received: (qmail 74780 invoked by uid 500); 21 Oct 2013 21:05:48 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 73717 invoked by uid 500); 21 Oct 2013 21:04:47 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 73433 invoked by uid 99); 21 Oct 2013 21:04:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Oct 2013 21:04:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A04A54F51E; Mon, 21 Oct 2013 21:04:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Mon, 21 Oct 2013 21:05:03 -0000 Message-Id: <8ead7dd1e0494533a3acf2162238bc00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] git commit: [#6534] ticket:450 added test for [#6534] ticket:450 added test for Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0a76622b Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0a76622b Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0a76622b Branch: refs/heads/cj/6686 Commit: 0a76622b2498ba558136e67e829614a988b9ea84 Parents: b07a1fe Author: coldmind Authored: Thu Oct 10 16:05:00 2013 +0300 Committer: Dave Brondsema Committed: Tue Oct 15 21:27:53 2013 +0000 ---------------------------------------------------------------------- .../forgeimporters/github/tests/test_wiki.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a76622b/ForgeImporters/forgeimporters/github/tests/test_wiki.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py index edd9391..91528ab 100644 --- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py +++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py @@ -18,7 +18,7 @@ # under the License. from unittest import TestCase -from nose.tools import assert_equal +from nose.tools import assert_equal, assert_not_in from mock import Mock, patch, call from ming.odm import ThreadLocalORMSession @@ -459,6 +459,18 @@ some text and **[Tips n' Tricks]** assert_equal(f(source, 'test3.textile'), result) + def test_convert_textile_special_tag(self): + importer = GitHubWikiImporter() + importer.github_wiki_url = 'https://github.com/a/b/wiki' + importer.app = Mock() + importer.app.url = '/p/test/wiki/' + f = importer.convert_markup + source = u'*[[this checklist|Troubleshooting]]*' + result = u"**[this checklist](Troubleshooting)**" + assert_not_in('', result) + assert_not_in('<notextile>', result) + + class TestGitHubWikiImportController(TestController, TestCase): url = '/p/%s/admin/ext/import/github-wiki/' % test_project_with_wiki