Merge remote-tracking branch 'origin/main' into add-ci-test

TheoBrigitte · TheoBrigitte · commit 3d61287b7b69 · 2025-11-19T20:07:51.000+01:00
diff --git a/tests/test_clone.bats b/tests/test_clone.bats
@@ -15,7 +15,6 @@ load test_helper
   cd test-remote
   assert_git_checkout_clean
   assert_base_configuration
-  assert_permission_configured
   refute_is_global_repository
 }
 
diff --git a/tests/test_init.bats b/tests/test_init.bats
@@ -12,7 +12,6 @@ load test_helper
   assert_dir_exists ".git"
 
   assert_base_configuration
-  assert_permission_configured
   assert_encryption_configured
   refute_is_global_repository
 }
@@ -37,11 +36,11 @@ load test_helper
   refute_encryption_configured
 }
 
-@test "init_normal: --without-permissions skips permissions setup" {
-  run trk init --without-permissions
+@test "init_normal: --with-permissions adds permissions setup" {
+  run trk init --with-permissions
   assert_success
 
-  refute_permission_configured
+  assert_permission_configured
 }
 
 @test "init_normal: --key-file imports encryption key" {
@@ -66,7 +65,6 @@ load test_helper
   assert_output --partial  "Initializing repository with worktree $worktree"
 
   assert_base_configuration
-  assert_permission_configured
   assert_encryption_configured
   assert_is_global_repository
 }
diff --git a/tests/test_setup.bats b/tests/test_setup.bats
@@ -10,7 +10,6 @@ load test_helper
   assert_success
 
   assert_base_configuration
-  assert_permission_configured
   assert_encryption_configured
   refute_is_global_repository
 }
@@ -24,13 +23,13 @@ load test_helper
   refute_encryption_configured
 }
 
-@test "setup: --without-permissions skips permissions setup" {
+@test "setup: --with-permissions adds permissions setup" {
   init_test_repo
 
-  run trk setup --without-permissions
+  run trk setup --with-permissions
   assert_success
 
-  refute_permission_configured
+  assert_permission_configured
 }
 
 @test "setup: with --key-file imports encryption key" {
@@ -85,7 +84,6 @@ load test_helper
   assert_success
 
   assert_base_configuration
-  assert_permission_configured
   assert_encryption_configured
   refute_is_global_repository
 
@@ -107,7 +105,6 @@ load test_helper
   assert_success
 
   assert_base_configuration
-  assert_permission_configured
   assert_encryption_configured
   refute_is_global_repository
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ load test_helper`
`15`	`15`	`cd test-remote`
`16`	`16`	`assert_git_checkout_clean`
`17`	`17`	`assert_base_configuration`
`18`		`- assert_permission_configured`
`19`	`18`	`refute_is_global_repository`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ load test_helper`
`12`	`12`	`assert_dir_exists ".git"`
`13`	`13`
`14`	`14`	`assert_base_configuration`
`15`		`- assert_permission_configured`
`16`	`15`	`assert_encryption_configured`
`17`	`16`	`refute_is_global_repository`
`18`	`17`	`}`
`@@ -37,11 +36,11 @@ load test_helper`
`37`	`36`	`refute_encryption_configured`
`38`	`37`	`}`
`39`	`38`
`40`		`-@test "init_normal: --without-permissions skips permissions setup" {`
`41`		`- run trk init --without-permissions`
	`39`	`+@test "init_normal: --with-permissions adds permissions setup" {`
	`40`	`+ run trk init --with-permissions`
`42`	`41`	`assert_success`
`43`	`42`
`44`		`- refute_permission_configured`
	`43`	`+ assert_permission_configured`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`@test "init_normal: --key-file imports encryption key" {`
`@@ -66,7 +65,6 @@ load test_helper`
`66`	`65`	`assert_output --partial "Initializing repository with worktree $worktree"`
`67`	`66`
`68`	`67`	`assert_base_configuration`
`69`		`- assert_permission_configured`
`70`	`68`	`assert_encryption_configured`
`71`	`69`	`assert_is_global_repository`
`72`	`70`	`}`