allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [19/40] git commit: [#2835] ticket:288 Fix failing tests due to changes in wiki pages indexation
Date Mon, 01 Apr 2013 14:27:38 GMT
[#2835] ticket:288 Fix failing tests due to changes in wiki pages indexation


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

Branch: refs/heads/cj/5963
Commit: 88d7b8256deb5ea2e75812eb632a1378c63c4b54
Parents: 01c9d1c
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Fri Mar 8 12:05:29 2013 +0000
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Tue Mar 26 20:57:38 2013 +0000

----------------------------------------------------------------------
 .../allura/tests/functional/test_user_profile.py   |    2 +-
 Allura/allura/tests/model/test_notification.py     |    4 ++--
 Allura/allura/tests/test_globals.py                |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/88d7b825/Allura/allura/tests/functional/test_user_profile.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_user_profile.py b/Allura/allura/tests/functional/test_user_profile.py
index fcea8b4..1589a2b 100644
--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -38,4 +38,4 @@ class TestUserProfile(TestController):
     def test_feed(self):
         response = self.app.get('/u/test-admin/profile/feed')
         assert 'Recent posts by Test Admin' in response
-        assert 'WikiPage Home modified by Test Admin' in response
+        assert 'Home modified by Test Admin' in response

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/88d7b825/Allura/allura/tests/model/test_notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_notification.py b/Allura/allura/tests/model/test_notification.py
index 92e244f..f8f8afb 100644
--- a/Allura/allura/tests/model/test_notification.py
+++ b/Allura/allura/tests/model/test_notification.py
@@ -81,7 +81,7 @@ class TestPostNotifications(unittest.TestCase):
         flash_msgs = list(h.pop_user_notifications(u))
         assert len(flash_msgs) == 1, flash_msgs
         msg = flash_msgs[0]
-        assert msg['text'].startswith('WikiPage Home modified by Test Admin')
+        assert msg['text'].startswith('Home modified by Test Admin')
         assert msg['subject'].startswith('[test:wiki]')
         flash_msgs = list(h.pop_user_notifications(u))
         assert not flash_msgs, flash_msgs
@@ -124,7 +124,7 @@ class TestPostNotifications(unittest.TestCase):
         assert_in(str(user2._id), first_destinations)
         assert_equal(email_tasks[0].kwargs['fromaddr'], '"Test Admin" <test-admin@users.localhost>')
         assert_equal(email_tasks[1].kwargs['fromaddr'], '"Test Admin" <test-admin@users.localhost>')
-        assert email_tasks[0].kwargs['text'].startswith('WikiPage Home modified by Test Admin')
+        assert email_tasks[0].kwargs['text'].startswith('Home modified by Test Admin')
         assert 'you indicated interest in ' in email_tasks[0].kwargs['text']
 
     def test_permissions(self):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/88d7b825/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 493787c..7ad940e 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -126,7 +126,7 @@ def test_macros():
     assert_equal(r, '<div class="markdown_content"><p><span class="download-button-%s"
style="margin-bottom: 1em; display: block;"></span></p>\n</div>' % p_test._id)
     h.set_context('--init--', 'wiki', neighborhood='Projects')
     r = g.markdown_wiki.convert('[[neighborhood_feeds tool_name=Wiki]]')
-    assert 'WikiPage Home modified by' in r, r
+    assert 'Home modified by' in r, r
     orig_len = len(r)
     # Make project private & verify we don't see its new feed items
     proj = M.Project.query.get(shortname='test', neighborhood_id=p_nbhd._id)
@@ -316,7 +316,7 @@ def test_macro_include():
 def test_macro_nbhd_feeds():
     with h.push_context('--init--', 'wiki', neighborhood='Projects'):
         r = g.markdown_wiki.convert('[[neighborhood_feeds tool_name=Wiki]]')
-        assert 'WikiPage Home modified by ' in r, r
+        assert 'Home modified by ' in r, r
 
 
 def test_sort_alpha():


Mime
View raw message