Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ coverage:
base: auto
patch:
default:
target: 80%
target: 80%

ignore:
- "packages/stream_feeds_test/**/*" # Internal test utilities package
5 changes: 2 additions & 3 deletions packages/stream_feeds/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ dev_dependencies:
build_runner: ^2.4.15
freezed: ^3.0.0
json_serializable: ^6.9.5
mocktail: ^1.0.4
retrofit_generator: ^9.6.0
test: ^1.26.3
web_socket_channel: ^3.0.3
stream_feeds_test:
path: ../stream_feeds_test
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import 'package:stream_feeds/src/client/feeds_client_impl.dart';
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
test('Create a feeds client', () {
Expand Down
2 changes: 1 addition & 1 deletion packages/stream_feeds/test/models/feed_id_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
test('feed id should be created with group and id', () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import 'package:stream_feeds/src/resolvers/resolvers.dart';
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
group('pollAnswerCastedFeedEventResolver PollVoteCastedFeedEvent', () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import 'package:stream_feeds/src/resolvers/resolvers.dart';
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
group('pollAnswerRemovedFeedEventResolver', () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
const activityId = 'activity-1';
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/activity_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
const activityId = 'activity-1';
Expand Down
4 changes: 1 addition & 3 deletions packages/stream_feeds/test/state/activity_test.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:mocktail/mocktail.dart';
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
const activityId = 'activity-1';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/bookmark_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/comment_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
const commentId = 'comment-1';
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/feed_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
37 changes: 21 additions & 16 deletions packages/stream_feeds/test/state/feed_test.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// ignore_for_file: avoid_redundant_argument_values

import 'package:mocktail/mocktail.dart';
import 'package:stream_feeds/src/utils/filter.dart';
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down Expand Up @@ -1815,17 +1813,18 @@ void main() {

group('OnNewActivity', () {
const feedId = FeedId(group: 'user', id: 'john');
const currentUserId = 'luke_skywalker';
const otherUserId = 'other_user';
const currentUser = User(id: 'luke_skywalker');
const otherUser = User(id: 'other_user');

final initialActivities = [
createDefaultActivityResponse(id: 'activity-1', userId: currentUserId),
createDefaultActivityResponse(id: 'activity-2', userId: currentUserId),
createDefaultActivityResponse(id: 'activity-3', userId: otherUserId),
createDefaultActivityResponse(id: 'activity-1', userId: currentUser.id),
createDefaultActivityResponse(id: 'activity-2', userId: currentUser.id),
createDefaultActivityResponse(id: 'activity-3', userId: otherUser.id),
];

feedTest(
'defaultOnNewActivity - should add current user activity to start when matching filter',
user: currentUser,
build: (client) => client.feedFromQuery(
FeedQuery(
fid: feedId,
Expand All @@ -1850,7 +1849,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: currentUserId,
userId: currentUser.id,
type: 'post',
),
),
Expand All @@ -1863,6 +1862,7 @@ void main() {

feedTest(
'defaultOnNewActivity - should ignore activity from other user',
user: currentUser,
build: (client) => client.feedFromQuery(
FeedQuery(
fid: feedId,
Expand All @@ -1887,7 +1887,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: otherUserId,
userId: otherUser.id,
type: 'post',
),
),
Expand All @@ -1899,6 +1899,7 @@ void main() {

feedTest(
'defaultOnNewActivity - should ignore current user activity that does not match filter',
user: currentUser,
build: (client) => client.feedFromQuery(
FeedQuery(
fid: feedId,
Expand All @@ -1923,7 +1924,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: currentUserId,
userId: currentUser.id,
type: 'comment', // Doesn't match 'post' filter
),
),
Expand All @@ -1935,6 +1936,7 @@ void main() {

feedTest(
'custom onNewActivity - should add to start',
user: currentUser,
build: (client) => client.feedFromQuery(
const FeedQuery(fid: feedId),
onNewActivity: (query, activity, currentUserId) {
Expand All @@ -1957,7 +1959,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: otherUserId,
userId: otherUser.id,
),
),
);
Expand All @@ -1969,6 +1971,7 @@ void main() {

feedTest(
'custom onNewActivity - should add to end',
user: currentUser,
build: (client) => client.feedFromQuery(
const FeedQuery(fid: feedId),
onNewActivity: (query, activity, currentUserId) {
Expand All @@ -1991,7 +1994,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: otherUserId,
userId: otherUser.id,
),
),
);
Expand All @@ -2003,6 +2006,7 @@ void main() {

feedTest(
'custom onNewActivity - should ignore',
user: currentUser,
build: (client) => client.feedFromQuery(
const FeedQuery(fid: feedId),
onNewActivity: (query, activity, currentUserId) {
Expand All @@ -2025,7 +2029,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: currentUserId,
userId: currentUser.id,
),
),
);
Expand All @@ -2036,6 +2040,7 @@ void main() {

feedTest(
'custom onNewActivity - should use query and activity context',
user: currentUser,
build: (client) => client.feedFromQuery(
FeedQuery(
fid: feedId,
Expand Down Expand Up @@ -2069,7 +2074,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-4',
userId: otherUserId,
userId: otherUser.id,
type: 'post',
),
),
Expand All @@ -2087,7 +2092,7 @@ void main() {
fid: feedId.rawValue,
activity: createDefaultActivityResponse(
id: 'activity-5',
userId: otherUserId,
userId: otherUser.id,
type: 'comment', // Doesn't match 'post' filter
),
),
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/follow_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/poll_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
3 changes: 1 addition & 2 deletions packages/stream_feeds/test/state/poll_vote_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:stream_feeds/stream_feeds.dart';
import 'package:test/test.dart';

import '../test_utils.dart';
import 'package:stream_feeds_test/stream_feeds_test.dart';

void main() {
// ============================================================
Expand Down
16 changes: 0 additions & 16 deletions packages/stream_feeds/test/test_utils.dart

This file was deleted.

Loading