public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-31 22:20:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing rss feed tests.

Browse source
This commit is contained in:
Samuel Clay 2012-03-06 16:11:27 -08:00
parent 74ba777099
commit d5926fe577
8 changed files with 6746 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/rss_feeds/fixtures/slashdot1.json
View file

@ -7,6 +7,7 @@
"days_to_trim": 90,
"feed_link": "%(NEWSBLUR_DIR)s/apps/rss_feeds/fixtures/slashdot1.html",
"feed_link_locked": true,
"fetched_once": true,
"num_subscribers": 1,
"active_subscribers": 1,
"creation": "2009-01-12",

3325
apps/rss_feeds/fixtures/slashdot1.xml
View file

File diff suppressed because one or more lines are too long

1
apps/rss_feeds/fixtures/slashdot2.json
View file

@ -7,6 +7,7 @@
"days_to_trim": 90,
"feed_link": "%(NEWSBLUR_DIR)s/apps/rss_feeds/fixtures/slashdot1.html",
"feed_link_locked": true,
"fetched_once": true,
"num_subscribers": 0,
"creation": "2009-01-12",
"feed_title": "Slashdot",

3325
apps/rss_feeds/fixtures/slashdot2.xml
View file

File diff suppressed because one or more lines are too long

7
apps/rss_feeds/models.py
View file

@ -608,7 +608,7 @@ class Feed(models.Model):
from utils import feed_fetcher
if not options:
options = {}
if settings.DEBUG:
if getattr(settings, 'TEST_DEBUG', False):
self.feed_address = self.feed_address % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR}
self.feed_link = self.feed_link % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR}
@ -649,7 +649,9 @@ class Feed(models.Model):
for story in stories:
story = pre_process_story(story)
if story.get('title'):
if not story.get('title'):
continue
story_content = story.get('story_content')
story_tags = self.get_tags(story)
story_link = self.get_permalink(story)
@ -915,6 +917,7 @@ class Feed(models.Model):
end_date = story_pub_date + datetime.timedelta(hours=8)
for existing_story in existing_stories:
content_ratio = 0
existing_story_pub_date = existing_story.story_date
# print 'Story pub date: %s %s' % (story_published_now, story_pub_date)

14
apps/rss_feeds/tests.py
View file

@ -37,7 +37,7 @@ class FeedTest(TestCase):
url = reverse('load-single-feed', kwargs=dict(feed_id=1))
response = self.client.get(url)
feed = json.decode(response.content)
self.assertEquals(len(feed['stories']), 12)
self.assertEquals(len(feed['stories']), 6)
def test_load_feeds__gothamist(self):
self.client.login(username='conesus', password='test')
@ -55,7 +55,7 @@ class FeedTest(TestCase):
url = reverse('load-single-feed', kwargs=dict(feed_id=4))
response = self.client.get(url)
content = json.decode(response.content)
self.assertEquals(len(content['stories']), 12)
self.assertEquals(len(content['stories']), 6)
management.call_command('loaddata', 'gothamist_aug_2009_2.json', verbosity=0)
management.call_command('refresh_feed', force=1, feed=4, single_threaded=True, daemonize=False)
@ -68,13 +68,13 @@ class FeedTest(TestCase):
# print [c['story_title'] for c in json.decode(response.content)]
content = json.decode(response.content)
# Test: 1 changed char in title
self.assertEquals(len(content['stories']), 12)
self.assertEquals(len(content['stories']), 6)
def test_load_feeds__slashdot(self):
self.client.login(username='conesus', password='test')
old_story_guid = "{'original-id': u'http://yro.slashdot.org/story/09/09/05/0112254/Court-Allows-Microsoft-To-Sell-Word-During-Appeal?from=rss', 'gr:original-id': u'http://yro.slashdot.org/story/09/09/05/0112254/Court-Allows-Microsoft-To-Sell-Word-During-Appeal?from=rss'}"
new_story_guid = "{'original-id': u'http://yro.slashdot.org/story/09/09/05/0112254/Court-Allows-Microsoft-To-Sell-Word-During-Appeal?from=rss!!', 'gr:original-id': u'http://yro.slashdot.org/story/09/09/05/0112254/Court-Allows-Microsoft-To-Sell-Word-During-Appeal?from=rss!!'}"
old_story_guid = "tag:google.com,2005:reader/item/4528442633bc7b2b"
new_story_guid = "tag:google.com,2005:reader/item/4528442633bc7b2b!!'}"
management.call_command('loaddata', 'slashdot1.json', verbosity=0)
@ -110,7 +110,7 @@ class FeedTest(TestCase):
feed = json.decode(response.content)
# Test: 1 changed char in title
self.assertEquals(len(feed['stories']), 12)
self.assertEquals(len(feed['stories']), 6)
response = self.client.get(reverse('refresh-feeds'))
content = json.decode(response.content)
@ -129,7 +129,7 @@ class FeedTest(TestCase):
feed = json.decode(response.content)
# Test: 1 changed char in title
self.assertEquals(len(feed['stories']), 10)
self.assertEquals(len(feed['stories']), 6)
def test_all_feeds(self):
pass

2
utils/test-settings.py
View file

@ -15,7 +15,7 @@ MONGO_DB = {
}
TEST_DATABASE_NAME = ":memory:"
DAYS_OF_UNREAD = 9999
TEST_DEBUG = True
# from django.db import connection