summaryrefslogtreecommitdiffstats
path: root/tests/integration/fixtures/feedfixture.php
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-12-03 21:40:46 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-01-17 18:18:39 +0100
commit570c75db776a79294d97a05cd8ac63ac4ab39685 (patch)
treedeedd28a10628a06b9d0b53400a2719b7a659562 /tests/integration/fixtures/feedfixture.php
parente5d606d3ee7dc046e7db9eb1f94b6cc6e542ecbe (diff)
fix several integration test issues
Diffstat (limited to 'tests/integration/fixtures/feedfixture.php')
-rw-r--r--tests/integration/fixtures/feedfixture.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/integration/fixtures/feedfixture.php b/tests/integration/fixtures/feedfixture.php
index 8c87a8efd..5394ebf6b 100644
--- a/tests/integration/fixtures/feedfixture.php
+++ b/tests/integration/fixtures/feedfixture.php
@@ -21,7 +21,7 @@ class FeedFixture extends Feed {
public function __construct(array $defaults=[]) {
parent::__construct();
- $defaults = array_combine([
+ $defaults = array_merge([
'userId' => 'test',
'urlHash' => 'urlHash',
'url' => 'http://the.url.com',
@@ -29,7 +29,6 @@ class FeedFixture extends Feed {
'faviconLink' => 'http://the.faviconLink.com',
'added' => 9,
'folderId' => 0,
- 'unreadCount' => 0,
'link' => 'http://thelink.com',
'preventUpdate' => false,
'deletedAt' => 0,