summaryrefslogtreecommitdiffstats
path: root/tests/Integration/Fixtures
diff options
context:
space:
mode:
authorDaniel Opitz <danopz@users.noreply.github.com>2017-08-14 10:34:53 +0200
committerBernhard Posselt <BernhardPosselt@users.noreply.github.com>2017-08-14 10:34:53 +0200
commita97dd58e3b499b60ac8b37786d402d7f2e371a88 (patch)
tree98bb8a6c750fb33fbef38d22407fa29fbf6c7b1e /tests/Integration/Fixtures
parent7d8a85c82c4c13a71b70ddb4ecb8c40ede4c9b70 (diff)
Split binary to booleans (#203)
* replaced old status with 2 flags for unread and starred * add fields to db, replace int(1,0) with booleans in sql queries, removed StatusFlags class + refactor code relying to it * add repair step for migration * again use integer(1,0) instead of bool in sql queries, because of sqlite doesn't support true/false * add/fix unit tests for new boolean status * set unread/starred flags as statements in sql * fixed mysql unknown column items.unread, fixed marking of read items on repair step * remove unnecessary bool casts * add empty checks to Items::is* methods * update migration to use native sql instead of the querybuilder * don't cast the flags manually, let the api do the work
Diffstat (limited to 'tests/Integration/Fixtures')
-rw-r--r--tests/Integration/Fixtures/ItemFixture.php3
-rw-r--r--tests/Integration/Fixtures/data/default.php14
-rw-r--r--tests/Integration/Fixtures/data/readitem.php12
3 files changed, 15 insertions, 14 deletions
diff --git a/tests/Integration/Fixtures/ItemFixture.php b/tests/Integration/Fixtures/ItemFixture.php
index 2dfe79c28..0832b0ef4 100644
--- a/tests/Integration/Fixtures/ItemFixture.php
+++ b/tests/Integration/Fixtures/ItemFixture.php
@@ -29,7 +29,8 @@ class ItemFixture extends Item {
'enclosureMime' => 'video/mpeg',
'enclosureLink' => 'http://google.de/web.webm',
'feedId' => 0,
- 'status' => 2,
+ 'unread' => true,
+ 'starred' => false,
'lastModified' => 113,
'rtl' => false,
], $defaults);
diff --git a/tests/Integration/Fixtures/data/default.php b/tests/Integration/Fixtures/data/default.php
index d87bb1e6f..862515b12 100644
--- a/tests/Integration/Fixtures/data/default.php
+++ b/tests/Integration/Fixtures/data/default.php
@@ -20,12 +20,12 @@ return [
'articlesPerUpdate' => 1,
'items' => [
['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]
+ ['title' => 'a title2', 'unread' => false, 'starred' => true, 'guid' => 'def'],
+ ['title' => 'a title3', 'unread' => true, 'starred' => true, 'guid' => 'gih'],
+ ['title' => 'del1', 'unread' => false, 'starred' => false],
+ ['title' => 'del2', 'unread' => false, 'starred' => false],
+ ['title' => 'del3', 'unread' => false, 'starred' => false],
+ ['title' => 'del4', 'unread' => false, 'starred' => false]
]
],
[
@@ -69,7 +69,7 @@ return [
'title' => 'fourth feed',
'url' => 'http://blog.fefe.de',
'items' => [
- ['title' => 'no folder', 'status' => 0]
+ ['title' => 'no folder', 'unread' => false, 'starred' => false]
]
]
]
diff --git a/tests/Integration/Fixtures/data/readitem.php b/tests/Integration/Fixtures/data/readitem.php
index 0a587bad7..8f953a845 100644
--- a/tests/Integration/Fixtures/data/readitem.php
+++ b/tests/Integration/Fixtures/data/readitem.php
@@ -15,18 +15,18 @@ return [
'title' => 'john feed',
'userId' => 'john',
'items' => [
- ['title' => 'blubb', 'status' => 2],
- ['title' => 'blubb', 'status' => 2]
+ ['title' => 'blubb', 'unread' => true, 'starred' => false],
+ ['title' => 'blubb', 'unread' => true, 'starred' => false]
]
],
[
'title' => 'test feed',
'userId' => 'test',
'items' => [
- ['title' => 'blubb', 'status' => 2],
- ['title' => 'blubbs', 'status' => 2],
- ['title' => 'blubb', 'status' => 2],
- ['title' => 'blubb', 'status' => 2]
+ ['title' => 'blubb', 'unread' => true, 'starred' => false],
+ ['title' => 'blubbs', 'unread' => true, 'starred' => false],
+ ['title' => 'blubb', 'unread' => true, 'starred' => false],
+ ['title' => 'blubb', 'unread' => true, 'starred' => false]
]
]
]