Skip to content

Commit 6e4feea

Browse files
committed
test [nfc]: Inline eg.globalSettings
This isn't really any longer than invoking it, and cuts out a layer of indirection.
1 parent ae4586d commit 6e4feea

File tree

5 files changed

+13
-21
lines changed

5 files changed

+13
-21
lines changed

test/example_data.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:zulip/api/route/realm.dart';
1111
import 'package:zulip/api/route/channels.dart';
1212
import 'package:zulip/model/database.dart';
1313
import 'package:zulip/model/narrow.dart';
14-
import 'package:zulip/model/settings.dart';
1514
import 'package:zulip/model/store.dart';
1615

1716
import 'model/test_store.dart';
@@ -874,16 +873,6 @@ ChannelUpdateEvent channelUpdateEvent(
874873
// The entire per-account or global state.
875874
//
876875

877-
GlobalSettingsData globalSettings({
878-
ThemeSetting? themeSetting,
879-
BrowserPreference? browserPreference,
880-
}) {
881-
return GlobalSettingsData(
882-
themeSetting: themeSetting,
883-
browserPreference: browserPreference,
884-
);
885-
}
886-
887876
TestGlobalStore globalStore({
888877
GlobalSettingsData? globalSettings,
889878
List<Account> accounts = const [],

test/model/settings_test.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:checks/checks.dart';
22
import 'package:flutter/foundation.dart';
33
import 'package:flutter_test/flutter_test.dart';
44
import 'package:zulip/model/binding.dart';
5+
import 'package:zulip/model/database.dart';
56
import 'package:zulip/model/settings.dart';
67

78
import '../example_data.dart' as eg;
@@ -14,37 +15,37 @@ void main() {
1415

1516
group('getUrlLaunchMode', () {
1617
testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for HTTP links', () {
17-
final globalStore = eg.globalStore(globalSettings: eg.globalSettings(
18+
final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
1819
browserPreference: null));
1920
check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
2021
defaultTargetPlatform == TargetPlatform.android
2122
? UrlLaunchMode.inAppBrowserView : UrlLaunchMode.externalApplication);
2223
});
2324

2425
testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links', () {
25-
final globalStore = eg.globalStore(globalSettings: eg.globalSettings(
26+
final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
2627
browserPreference: null));
2728
check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(
2829
defaultTargetPlatform == TargetPlatform.android
2930
? UrlLaunchMode.platformDefault : UrlLaunchMode.externalApplication);
3031
});
3132

3233
testAndroidIos('globalSettings.browserPreference is inApp; follow the user preference for http links', () {
33-
final globalStore = eg.globalStore(globalSettings: eg.globalSettings(
34+
final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
3435
browserPreference: BrowserPreference.inApp));
3536
check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
3637
UrlLaunchMode.inAppBrowserView);
3738
});
3839

3940
testAndroidIos('globalSettings.browserPreference is inApp; use platform default for non-http links', () {
40-
final globalStore = eg.globalStore(globalSettings: eg.globalSettings(
41+
final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
4142
browserPreference: BrowserPreference.inApp));
4243
check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(
4344
UrlLaunchMode.platformDefault);
4445
});
4546

4647
testAndroidIos('globalSettings.browserPreference is external; follow the user preference', () {
47-
final globalStore = eg.globalStore(globalSettings: eg.globalSettings(
48+
final globalStore = eg.globalStore(globalSettings: GlobalSettingsData(
4849
browserPreference: BrowserPreference.external));
4950
check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(
5051
UrlLaunchMode.externalApplication);

test/model/test_store.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class TestGlobalStore extends GlobalStore with _ApiConnectionsMixin, _DatabaseMi
138138
TestGlobalStore({
139139
GlobalSettingsData? globalSettings,
140140
required super.accounts,
141-
}) : super(globalSettings: globalSettings ?? eg.globalSettings());
141+
}) : super(globalSettings: globalSettings ?? GlobalSettingsData());
142142

143143
final Map<int, InitialSnapshot> _initialSnapshots = {};
144144

@@ -202,7 +202,7 @@ class UpdateMachineTestGlobalStore extends GlobalStore with _ApiConnectionsMixin
202202
UpdateMachineTestGlobalStore({
203203
GlobalSettingsData? globalSettings,
204204
required super.accounts,
205-
}) : super(globalSettings: globalSettings ?? eg.globalSettings());
205+
}) : super(globalSettings: globalSettings ?? GlobalSettingsData());
206206

207207
// [doLoadPerAccount] depends on the cache to prepare the API responses.
208208
// Calling [clearCachedApiConnections] is permitted, though.

test/widgets/content_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
88
import 'package:url_launcher/url_launcher.dart';
99
import 'package:zulip/api/core.dart';
1010
import 'package:zulip/model/content.dart';
11+
import 'package:zulip/model/database.dart';
1112
import 'package:zulip/model/narrow.dart';
1213
import 'package:zulip/model/settings.dart';
1314
import 'package:zulip/model/store.dart';
@@ -801,7 +802,7 @@ void main() {
801802

802803
testWidgets('follow browser preference setting to open URL', (tester) async {
803804
await testBinding.globalStore.updateGlobalSettings(
804-
eg.globalSettings(
805+
GlobalSettingsData(
805806
browserPreference: BrowserPreference.inApp).toCompanion(false));
806807
await prepare(tester,
807808
'<p><a href="https://example/">hello</a></p>');

test/widgets/settings_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:checks/checks.dart';
22
import 'package:flutter/foundation.dart';
33
import 'package:flutter/material.dart';
44
import 'package:flutter_test/flutter_test.dart';
5+
import 'package:zulip/model/database.dart';
56
import 'package:zulip/model/settings.dart';
67
import 'package:zulip/widgets/settings.dart';
78

@@ -51,7 +52,7 @@ void main() {
5152
debugBrightnessOverride = Brightness.light;
5253

5354
await testBinding.globalStore.updateGlobalSettings(
54-
eg.globalSettings(themeSetting: ThemeSetting.light).toCompanion(false));
55+
GlobalSettingsData(themeSetting: ThemeSetting.light).toCompanion(false));
5556
await prepare(tester);
5657
final element = tester.element(find.byType(SettingsPage));
5758
check(Theme.of(element)).brightness.equals(Brightness.light);
@@ -101,7 +102,7 @@ void main() {
101102

102103
testWidgets('smoke', (tester) async {
103104
await testBinding.globalStore.updateGlobalSettings(
104-
eg.globalSettings(
105+
GlobalSettingsData(
105106
browserPreference: BrowserPreference.external).toCompanion(false));
106107
await prepare(tester);
107108
checkSwitchAndGlobalSettings(tester,

0 commit comments

Comments
 (0)