Add sentry.properties only setup test (#240)

getsentry · Jun 4, 2024 · 70eb0bf · 70eb0bf
1 parent 608bc1c
commit 70eb0bf
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 29 deletions.
diff --git a/lib/src/cli/_sources.dart b/lib/src/cli/_sources.dart
@@ -8,19 +8,33 @@ const _version = '2.27.0';
 
 final currentCLISources = {
   HostPlatform.darwinUniversal: CLISource(
-      'sentry-cli-Darwin-universal',
-      _version,
-      '8693527282890285f55d9b55414905e8621dd788ad3ae4c85175b84e8eeb6a04'),
-  HostPlatform.linuxAarch64: CLISource('sentry-cli-Linux-aarch64', _version,
-      '54fce909d18c815cb41a3fd24088b76b58872326f211e18ee28646ae844882b0'),
-  HostPlatform.linuxArmv7: CLISource('sentry-cli-Linux-armv7', _version,
-      '7fbc79ea7d90aa39acf7e0cdd66535258494ef981401ce37c477b42393505b79'),
-  HostPlatform.linux64bit: CLISource('sentry-cli-Linux-x86_64', _version,
-      '6b31bbd385d436620415305c12ae181c38bdd3a54c243803dc3ff241ee952356'),
-  HostPlatform.windows32bit: CLISource('sentry-cli-Windows-i686.exe', _version,
-      'de0fa9d55f7c78f16b712955607979b21f797ba89e08e490a76f07991b272d4d'),
+    'sentry-cli-Darwin-universal',
+    _version,
+    '8693527282890285f55d9b55414905e8621dd788ad3ae4c85175b84e8eeb6a04',
+  ),
+  HostPlatform.linuxAarch64: CLISource(
+    'sentry-cli-Linux-aarch64',
+    _version,
+    '54fce909d18c815cb41a3fd24088b76b58872326f211e18ee28646ae844882b0',
+  ),
+  HostPlatform.linuxArmv7: CLISource(
+    'sentry-cli-Linux-armv7',
+    _version,
+    '7fbc79ea7d90aa39acf7e0cdd66535258494ef981401ce37c477b42393505b79',
+  ),
+  HostPlatform.linux64bit: CLISource(
+    'sentry-cli-Linux-x86_64',
+    _version,
+    '6b31bbd385d436620415305c12ae181c38bdd3a54c243803dc3ff241ee952356',
+  ),
+  HostPlatform.windows32bit: CLISource(
+    'sentry-cli-Windows-i686.exe',
+    _version,
+    'de0fa9d55f7c78f16b712955607979b21f797ba89e08e490a76f07991b272d4d',
+  ),
   HostPlatform.windows64bit: CLISource(
-      'sentry-cli-Windows-x86_64.exe',
-      _version,
-      'ff6e8708ef7e95d1358e38ed5dc8bb4e62ebd359aff4749dc336b8d2e48ba5b9'),
+    'sentry-cli-Windows-x86_64.exe',
+    _version,
+    'ff6e8708ef7e95d1358e38ed5dc8bb4e62ebd359aff4749dc336b8d2e48ba5b9',
+  ),
 };
diff --git a/lib/src/configuration.dart b/lib/src/configuration.dart
@@ -113,9 +113,9 @@ class Configuration {
   }
 
   void loadConfig({
-    required ConfigurationValues platformEnvConfig,
     required ConfigurationValues argsConfig,
     required ConfigurationValues fileConfig,
+    required ConfigurationValues platformEnvConfig,
   }) {
     final pubspec = ConfigReader.getPubspec();
 

diff --git a/lib/src/configuration_values.dart b/lib/src/configuration_values.dart
@@ -101,7 +101,6 @@ class ConfigurationValues {
     return ConfigurationValues(
       version: configReader.getString('version'),
       name: configReader.getString('name'),
-
       uploadDebugSymbols: configReader.getBool(
         'upload_debug_symbols',
         deprecatedKey: 'upload_native_symbols',

diff --git a/test/configureation_values_test.dart b/test/configureation_values_test.dart
@@ -14,8 +14,8 @@ void main() {
   group('ctor', () {
     test("fromArguments", () {
       final arguments = [
-        "--sentry-define=version=fixture-version",
-        "--sentry-define=name=fixture-name",
+        "--sentry-define=version=fixture-sentry-version",
+        "--sentry-define=name=fixture-sentry-name",
         "--sentry-define=upload_debug_symbols=true",
         "--sentry-define=upload_source_maps=true",
         "--sentry-define=upload_sources=true",
@@ -35,9 +35,8 @@ void main() {
         "--sentry-define=sentry_cli_cdn_url=fixture-sentry_cli_cdn_url",
       ];
       final sut = ConfigurationValues.fromArguments(arguments);
-      expect(sut.name, 'fixture-name');
-      expect(sut.version, 'fixture-version');
-
+      expect(sut.name, 'fixture-sentry-name');
+      expect(sut.version, 'fixture-sentry-version');
       expect(sut.uploadDebugSymbols, true);
       expect(sut.uploadSourceMaps, true);
       expect(sut.uploadSources, true);
@@ -77,11 +76,10 @@ void main() {
       expect(sut.name, 'fixture=name');
     });
 
-    test('from config reader', () {
-      final config = '''
-      name: fixture-name
-      version: fixture-version
-      
+    test('from config reader as pubspec', () {
+      final sentryPubspec = '''
+      version: fixture-sentry-version
+      name: fixture-sentry-name      
       upload_debug_symbols: true
       upload_source_maps: true
       upload_sources: true
@@ -103,7 +101,7 @@ void main() {
       injector.registerSingleton<FileSystem>(() => fs, override: true);
 
       final pubspecConfig = ConfigFormatter.formatConfig(
-        config,
+        sentryPubspec,
         ConfigFileType.pubspecYaml,
         null,
       );
@@ -116,9 +114,69 @@ void main() {
 
       final reader = ConfigReader();
       final sut = ConfigurationValues.fromReader(reader);
-      expect(sut.name, 'fixture-name');
-      expect(sut.version, 'fixture-version');
 
+      expect(sut.version, 'fixture-sentry-version');
+      expect(sut.name, 'fixture-sentry-name');
+      expect(sut.uploadDebugSymbols, true);
+      expect(sut.uploadSourceMaps, true);
+      expect(sut.uploadSources, true);
+      expect(sut.project, 'p');
+      expect(sut.org, 'o');
+      expect(sut.authToken, 't');
+      expect(sut.url, 'fixture-url');
+      expect(sut.waitForProcessing, true);
+      expect(sut.logLevel, 'fixture-log_level');
+      expect(sut.release, 'fixture-release');
+      expect(sut.dist, 'fixture-dist');
+      expect(sut.buildPath, 'fixture-build_path');
+      expect(sut.webBuildPath, 'fixture-web_build_path');
+      expect(sut.commits, 'fixture-commits');
+      expect(sut.ignoreMissing, true);
+      expect(sut.binDir, 'fixture-bin_dir');
+      expect(sut.sentryCliCdnUrl, 'fixture-sentry_cli_cdn_url');
+    });
+
+    test('from config reader as properties', () {
+      final sentryProperties = '''
+      version=fixture-sentry-version
+      name=fixture-sentry-name   
+      upload_debug_symbols=true
+      upload_source_maps=true
+      upload_sources=true
+      url=fixture-url
+      wait_for_processing=true
+      log_level=fixture-log_level
+      release=fixture-release
+      dist=fixture-dist
+      build_path=fixture-build_path
+      web_build_path=fixture-web_build_path
+      commits=fixture-commits
+      ignore_missing=true
+      bin_dir=fixture-bin_dir
+      sentry_cli_cdn_url=fixture-sentry_cli_cdn_url
+      ''';
+
+      FileSystem fs = MemoryFileSystem.test();
+      fs.currentDirectory = fs.directory('/subdir')..createSync();
+      injector.registerSingleton<FileSystem>(() => fs, override: true);
+
+      final propertiesConfig = ConfigFormatter.formatConfig(
+        sentryProperties,
+        ConfigFileType.sentryProperties,
+        null,
+      );
+      final writer = ConfigWriter(
+        fs,
+        'fixture-name',
+      );
+      writer.write(
+          'fixture-version', ConfigFileType.sentryProperties, propertiesConfig);
+
+      final reader = ConfigReader();
+      final sut = ConfigurationValues.fromReader(reader);
+
+      expect(sut.version, 'fixture-sentry-version');
+      expect(sut.name, 'fixture-sentry-name');
       expect(sut.uploadDebugSymbols, true);
       expect(sut.uploadSourceMaps, true);
       expect(sut.uploadSources, true);