summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-01-17 18:50:54 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-01-17 18:50:54 +0100
commitbde168df355233e376afe9cb413c3f959f175ed2 (patch)
treeeefcf4152df1a678330bc7a1555555571118509c
parent570c75db776a79294d97a05cd8ac63ac4ab39685 (diff)
more fixes
-rw-r--r--tests/integration/fixtures/data/default.php24
-rw-r--r--tests/integration/fixtures/feedfixture.php12
-rw-r--r--tests/integration/fixtures/itemfixture.php2
3 files changed, 20 insertions, 18 deletions
diff --git a/tests/integration/fixtures/data/default.php b/tests/integration/fixtures/data/default.php
index 5fc0565f3..d1383c3f7 100644
--- a/tests/integration/fixtures/data/default.php
+++ b/tests/integration/fixtures/data/default.php
@@ -17,14 +17,15 @@ return [
[
'title' => 'first feed',
'url' => 'http://google.de',
+ 'articlesPerUpdate' => 1,
'items' => [
- ['title' => 'a title1'],
- ['title' => 'a title2', 'starred' => true],
- ['title' => 'a title3', 'starred' => true],
- ['title' => 'del1', 'read' => true],
- ['title' => 'del2', 'read' => true],
- ['title' => 'del3', 'read' => true],
- ['title' => 'del4', 'read' => true]
+ ['title' => 'a title1', 'guid' => 'abc'],
+ ['title' => 'a title2', 'status' => 4, 'guid' => 'def'],
+ ['title' => 'a title3', 'status' => 6, 'guid' => 'gih'],
+ ['title' => 'del1', 'status' => 0],
+ ['title' => 'del2', 'status' => 0],
+ ['title' => 'del3', 'status' => 0],
+ ['title' => 'del4', 'status' => 0]
]
],
[
@@ -36,17 +37,18 @@ return [
],
[
'name' => 'second folder',
+ 'opened' => false,
'feeds' => [
[
'title' => 'third feed',
'url' => 'http://heise.de',
- 'items' => [['title' => 'the title9']]
+ 'items' => [['title' => 'a title9']]
],
[
'title' => 'sixth feed',
'url' => 'http://gremlins.de',
'deletedAt' => 999999999,
- 'items' => [['title' => 'not found feed']]
+ 'items' => [['title' => 'not found feed', 'guid' => 'not found']]
]
],
],
@@ -57,7 +59,7 @@ return [
[
'title' => 'fifth feed',
'url' => 'http://prolinux.de',
- 'items' => [['title' => 'not found folder']]
+ 'items' => [['title' => 'not found folder', 'guid' => 'not found']]
]
],
]
@@ -67,7 +69,7 @@ return [
'title' => 'fourth feed',
'url' => 'http://blog.fefe.de',
'items' => [
- ['title' => 'no folder', 'read' => true]
+ ['title' => 'no folder', 'status' => 0]
]
]
]
diff --git a/tests/integration/fixtures/feedfixture.php b/tests/integration/fixtures/feedfixture.php
index 5394ebf6b..cc8e2e159 100644
--- a/tests/integration/fixtures/feedfixture.php
+++ b/tests/integration/fixtures/feedfixture.php
@@ -26,22 +26,22 @@ class FeedFixture extends Feed {
'urlHash' => 'urlHash',
'url' => 'http://the.url.com',
'title' => 'title',
- 'faviconLink' => 'http://the.faviconLink.com',
- 'added' => 9,
+ 'faviconLink' => 'http://feed.com/favicon.ico',
+ 'added' => 3000,
'folderId' => 0,
- 'link' => 'http://thelink.com',
+ 'link' => 'http://feed.com/rss',
'preventUpdate' => false,
'deletedAt' => 0,
- 'articlesPerUpdate' => 50,
+ 'articlesPerUpdate' => 40,
'lastModified' => 10,
'etag' => '',
- 'location' => 'http://thefeed.com',
+ 'location' => 'http://feed.com/rss',
'ordering' => 0,
'fullTextEnabled' => false,
'pinned' => false,
'updateMode' => 0,
'updateErrorCount' => 0,
- 'lastUpdateError' => 'lastUpdateError',
+ 'lastUpdateError' => '',
], $defaults);
unset($defaults['items']);
$this->fillDefaults($defaults);
diff --git a/tests/integration/fixtures/itemfixture.php b/tests/integration/fixtures/itemfixture.php
index 8914773dc..af074718f 100644
--- a/tests/integration/fixtures/itemfixture.php
+++ b/tests/integration/fixtures/itemfixture.php
@@ -23,7 +23,7 @@ class ItemFixture extends Item {
$defaults = array_merge([
'url' => 'http://google.de',
'title' => 'title',
- 'author' => 'author',
+ 'author' => 'my author',
'pubDate' => 2323,
'body' => 'this is a body',
'enclosureMime' => 'video/mpeg',