Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue#936 #973

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 21 additions & 17 deletions test/screens/weekplan_screen_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,7 @@ void main() {
MaterialApp(home: WeekplanScreen(mockWeek, user, key: UniqueKey())));
await tester.pumpAndSettle();


// Find cross (cancelled) icon by key
expect(find.byKey(const Key('IconCanceled')), findsOneWidget);
}
Expand Down Expand Up @@ -1257,18 +1258,20 @@ void main() {
Future<void> _activityCardStartTimeWhenActivatedAndShowsItForCitizen(
WidgetTester tester) async {
final Completer<bool> checkCompleted = Completer<bool>();
int i = 0;
if(DateTime.now().toString() == DateTime.monday.toString()){
i++;
}
mockActivities[2].state = ActivityState.Normal;
mockActivities[2].timer!.paused = true;
mockActivities[2].timer!.fullLength = 100;
mockWeek.days![i].activities!.add(mockActivities[2]);
authBloc.setMode(WeekplanMode.citizen);
final WeekplanScreen weekplanScreen = WeekplanScreen(mockWeek, user, key: UniqueKey());
await tester.pumpWidget(MaterialApp(home: weekplanScreen));

mockActivities[2].state = ActivityState.Normal;
mockActivities[2].timer!.paused = true;
mockActivities[2].timer!.fullLength = 100;
mockWeek.days![0].activities!.add(mockActivities[2]);
authBloc.setMode(WeekplanMode.citizen);
final WeekplanScreen weekplanScreen =
WeekplanScreen(mockWeek, user, key: UniqueKey());
await tester.pumpWidget(MaterialApp(home: weekplanScreen));

await tester.pumpAndSettle();
await tester.tap(find.byKey(Key(mockWeek.days![0].day!.index.toString() +
await tester.pumpAndSettle();
await tester.tap(find.byKey(Key(mockWeek.days![i].day!.index.toString() +
mockActivities[2].id.toString())));
await tester.pumpAndSettle();

Expand Down Expand Up @@ -1305,20 +1308,21 @@ void main() {
WidgetTester tester) async {
await tester.runAsync(() async {
final Completer<bool> checkCompleted = Completer<bool>();

int i = 0;
if(DateTime.now().toString() == DateTime.monday.toString()){
i++;
}
mockActivities[2].state = ActivityState.Normal;
mockActivities[2].timer!.paused = true;
mockActivities[2].timer!.fullLength = 100;
mockWeek.days![0].activities!.add(mockActivities[2]);
mockWeek.days![i].activities!.add(mockActivities[2]);
authBloc.setMode(WeekplanMode.citizen);
final WeekplanScreen weekplanScreen =
WeekplanScreen(mockWeek, user, key: UniqueKey());
await tester.pumpWidget(MaterialApp(home: weekplanScreen));

await tester.pumpAndSettle();
await tester.tap(find.byKey(Key(
mockWeek.days![0].day!.index.toString() +
mockActivities[2].id.toString())));
await tester.tap(find.byKey(Key(mockWeek.days![i].day!.index.toString()
+ mockActivities[2].id.toString())));
await tester.pumpAndSettle();

expect(find.byKey(const Key('TimerInitKey')), findsOneWidget);
Expand Down