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 3324510370 for ; Fri, 27 Sep 2013 16:43:15 +0000 (UTC) Received: (qmail 12237 invoked by uid 500); 27 Sep 2013 16:43:12 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 11798 invoked by uid 500); 27 Sep 2013 16:43:09 -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 11345 invoked by uid 99); 27 Sep 2013 16:43:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 16:43:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4259990C2F9; Fri, 27 Sep 2013 16:43:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Fri, 27 Sep 2013 16:43:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/36] git commit: [#6534] ticket:442 added test for mediawiki converter [#6534] ticket:442 added test for mediawiki converter Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/188f3c7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/188f3c7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/188f3c7c Branch: refs/heads/db/6534 Commit: 188f3c7cae1627dd8f184705652b159f6153c737 Parents: 259c588 Author: coldmind Authored: Tue Sep 24 17:12:55 2013 +0300 Committer: Dave Brondsema Committed: Fri Sep 27 16:40:25 2013 +0000 ---------------------------------------------------------------------- .../forgeimporters/github/tests/test_wiki.py | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/188f3c7c/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 5ad3aed..0f6bf26 100644 --- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py +++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py @@ -301,7 +301,38 @@ Our website is [[http://sf.net]]. assert_equal(f(u'Test Page', prefix, new), u'Test Page') + def test_convert_markup_with_mediawiki2markdown(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'''Look at [[this page|Some Page]] + +More info at: [[MoreInfo]] [[Even More Info]] + +Our website is [[http://sf.net]]. + +'[[Escaped Tag]] + +[External link to the wiki page](https://github.com/a/b/wiki/Page) + +[External link](https://github.com/a/b/issues/1)''' + + result = u'''Look at [this page](Some Page) + +More info at: [MoreInfo] [Even More Info] + +Our website is [[http://sf.net](http://sf.net)]. + +[[Escaped Tag]] + +[External link to the wiki page](https://github.com/a/b/wiki/Page) + +[External link](https://github.com/a/b/issues/1) +''' + assert_equal(f(source, 'test.md', 'md'), result) class TestGitHubWikiImportController(TestController, TestCase):