Explorar o código

fix: integration tests

Lucas Nogueira hai 10 meses
pai
achega
6d629cbf93

+ 0 - 1
core/tauri-config-schema/schema.json

@@ -248,7 +248,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"

+ 2 - 0
core/tests/app-updater/tests/fixtures/tauri-v1/Cargo.lock

@@ -3003,10 +3003,12 @@ dependencies = [
  "ignore",
  "indexmap 1.9.3",
  "infer",
+ "log",
  "minisign-verify",
  "objc",
  "once_cell",
  "percent-encoding",
+ "plist",
  "rand 0.8.5",
  "raw-window-handle",
  "reqwest",

+ 1 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

+ 1 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules

+ 1 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

+ 18 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Headers/test.h

@@ -0,0 +1,18 @@
+//
+//  test.h
+//  test
+//
+//  Created by Trey Smith on 9/15/23.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for test.
+FOUNDATION_EXPORT double testVersionNumber;
+
+//! Project version string for test.
+FOUNDATION_EXPORT const unsigned char testVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <test/PublicHeader.h>
+
+

+ 6 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module test {
+  umbrella header "test.h"
+
+  export *
+  module * { export * }
+}

+ 46 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/Resources/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>22D68</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>test</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.tauri.test</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>test</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string></string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>13.3</string>
+	<key>DTSDKBuild</key>
+	<string>22E245</string>
+	<key>DTSDKName</key>
+	<string>macosx13.3</string>
+	<key>DTXcode</key>
+	<string>1431</string>
+	<key>DTXcodeBuild</key>
+	<string>14E300c</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>13.2</string>
+</dict>
+</plist>

+ 142 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/_CodeSignature/CodeResources

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/Info.plist</key>
+		<data>
+		/aPV7Q20g0elr7OiZJoUNggTOcg=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/test.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			5RA6Mnq5sNoaC4wKcFe6zymVmEL5Vb44G4BGqFjgZMM=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			C6uLLSnQu9M2qLElVCkeo2JpnvWMxtArinQzmlh3v2A=
+			</data>
+		</dict>
+		<key>Resources/Info.plist</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			nPMotNIMgvMfHtkRdpeehzfBiCZLnksfiD3nldUPzTE=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

BIN=BIN
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/A/test


+ 1 - 0
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/frameworks/test.framework/Versions/Current

@@ -0,0 +1 @@
+A

+ 6 - 1
core/tests/app-updater/tests/fixtures/tauri-v2/src-tauri/tauri.conf.json

@@ -14,7 +14,12 @@
       "../../../../../../../examples/.icons/128x128@2x.png",
       "../../../../../../../examples/.icons/icon.icns",
       "../../../../../../../examples/.icons/icon.ico"
-    ]
+    ],
+    "macOS": {
+      "frameworks": [
+        "./frameworks/test.framework"
+      ]
+    }
   },
   "version": "1.0.0",
   "identifier": "com.tauri.updater",

+ 0 - 1
tooling/cli/schema.json

@@ -248,7 +248,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"