From 5b7f63739bc9accef372a1eca1ac24e3c5962607 Mon Sep 17 00:00:00 2001 From: Kiril Videlov Date: Sat, 13 Jan 2024 18:28:23 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20chore:=20update=20remote=20URLs?= =?UTF-8?q?=20in=20tests=20to=20match=20new=20repository=20location?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVELOPMENT.md | 4 +-- README.md | 8 ++--- gitbutler-app/src/git/credentials.rs | 24 +++++++------- gitbutler-app/src/git/url/convert.rs | 32 +++++++++---------- .../src/virtual_branches/target/reader.rs | 7 ++-- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 3fb121731..311db6559 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -183,12 +183,12 @@ $ pnpm tauri icon path/to/icon.png ## Release -Building is done via [GitHub Action](https://github.com/gitbutlerapp/gitbutler-client/actions/workflows/publish.yaml). +Building is done via [GitHub Action](https://github.com/gitbutlerapp/gitbutler/actions/workflows/publish.yaml). Go to the link and select `Run workflow` from the desired branch. ### Versioning -When running the [release action](https://github.com/gitbutlerapp/gitbutler-client/actions/workflows/publish.yaml), +When running the [release action](https://github.com/gitbutlerapp/gitbutler/actions/workflows/publish.yaml), you will have to choose one of `major`, `minor`, or `patch` release type. Action will generate a new version based on your input and current version found at `https://app.gitbutler.com/releases`. diff --git a/README.md b/README.md index 187a9f22b..fd684d75a 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,12 @@
-![gitbutler_client](https://github.com/gitbutlerapp/gitbutler-client/assets/70/89466226-fc0b-4d42-951c-67d95590e00c) +![gitbutler_client](https://github.com/gitbutlerapp/gitbutler/assets/70/89466226-fc0b-4d42-951c-67d95590e00c) [![CI][s0]][l0] [![TWEET][s1]][l1] [![DISCORD][s2]][l2] [![INSTA][s3]][l3] [![YOUTUBE][s5]][l5] -[s0]: https://github.com/gitbutlerapp/gitbutler-client/actions/workflows/push.yaml/badge.svg -[l0]: https://github.com/gitbutlerapp/gitbutler-client/actions/workflows/push.yaml +[s0]: https://github.com/gitbutlerapp/gitbutler/actions/workflows/push.yaml/badge.svg +[l0]: https://github.com/gitbutlerapp/gitbutler/actions/workflows/push.yaml [s1]: https://img.shields.io/badge/Twitter-black?logo=x&logoColor=white [l1]: https://twitter.com/intent/follow?screen_name=gitbutler [s2]: https://img.shields.io/discord/1060193121130000425?label=Discord&color=5865F2 @@ -72,7 +72,7 @@ You can find our end user documentation at: https://docs.gitbutler.com ## Bugs and Feature Requests -If you have a bug or feature request, feel free to open an [issue](https://github.com/gitbutlerapp/gitbutler-client/issues/new), +If you have a bug or feature request, feel free to open an [issue](https://github.com/gitbutlerapp/gitbutler/issues/new), or [join our Discord server](https://discord.gg/wDKZCPEjXC). ## Contributing diff --git a/gitbutler-app/src/git/credentials.rs b/gitbutler-app/src/git/credentials.rs index 1be153b0c..6425e9776 100644 --- a/gitbutler-app/src/git/credentials.rs +++ b/gitbutler-app/src/git/credentials.rs @@ -571,7 +571,7 @@ mod tests { #[test] fn https() { let test_case = TestCase { - remote_url: "https://github.com/gitbutlerapp/gitbutler-client.git", + remote_url: "https://github.com/gitbutlerapp/gitbutler.git", github_access_token: Some("token"), ..Default::default() }; @@ -579,7 +579,7 @@ mod tests { assert_eq!(flow.len(), 1); assert_eq!( flow[0].0, - "https://github.com/gitbutlerapp/gitbutler-client.git".to_string(), + "https://github.com/gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!( flow[0].1, @@ -592,7 +592,7 @@ mod tests { #[test] fn ssh() { let test_case = TestCase { - remote_url: "git@github.com:gitbutlerapp/gitbutler-client.git", + remote_url: "git@github.com:gitbutlerapp/gitbutler.git", github_access_token: Some("token"), ..Default::default() }; @@ -600,7 +600,7 @@ mod tests { assert_eq!(flow.len(), 1); assert_eq!( flow[0].0, - "https://github.com/gitbutlerapp/gitbutler-client.git".to_string(), + "https://github.com/gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!( flow[0].1, @@ -620,7 +620,7 @@ mod tests { #[test] fn https() { let test_case = TestCase { - remote_url: "https://github.com/gitbutlerapp/gitbutler-client.git", + remote_url: "https://github.com/gitbutlerapp/gitbutler.git", ..Default::default() }; let flow = test_case.run(); @@ -629,7 +629,7 @@ mod tests { assert_eq!( flow[0].0, - "git@github.com:gitbutlerapp/gitbutler-client.git".to_string(), + "git@github.com:gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!(flow[0].1.len(), 1); assert!(matches!( @@ -641,7 +641,7 @@ mod tests { #[test] fn ssh() { let test_case = TestCase { - remote_url: "git@github.com:gitbutlerapp/gitbutler-client.git", + remote_url: "git@github.com:gitbutlerapp/gitbutler.git", ..Default::default() }; let flow = test_case.run(); @@ -650,7 +650,7 @@ mod tests { assert_eq!( flow[0].0, - "git@github.com:gitbutlerapp/gitbutler-client.git".to_string(), + "git@github.com:gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!(flow[0].1.len(), 1); assert!(matches!( @@ -666,7 +666,7 @@ mod tests { #[test] fn https() { let test_case = TestCase { - remote_url: "https://github.com/gitbutlerapp/gitbutler-client.git", + remote_url: "https://github.com/gitbutlerapp/gitbutler.git", github_access_token: Some("token"), preferred_key: projects::AuthKey::Local { private_key_path: path::PathBuf::from("/tmp/id_rsa"), @@ -678,7 +678,7 @@ mod tests { assert_eq!(flow.len(), 1); assert_eq!( flow[0].0, - "git@github.com:gitbutlerapp/gitbutler-client.git".to_string(), + "git@github.com:gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!( flow[0].1, @@ -692,7 +692,7 @@ mod tests { #[test] fn ssh() { let test_case = TestCase { - remote_url: "git@github.com:gitbutlerapp/gitbutler-client.git", + remote_url: "git@github.com:gitbutlerapp/gitbutler.git", github_access_token: Some("token"), preferred_key: projects::AuthKey::Local { private_key_path: path::PathBuf::from("/tmp/id_rsa"), @@ -704,7 +704,7 @@ mod tests { assert_eq!(flow.len(), 1); assert_eq!( flow[0].0, - "git@github.com:gitbutlerapp/gitbutler-client.git".to_string(), + "git@github.com:gitbutlerapp/gitbutler.git".to_string(), ); assert_eq!( flow[0].1, diff --git a/gitbutler-app/src/git/url/convert.rs b/gitbutler-app/src/git/url/convert.rs index 1da345d23..c11d84f1a 100644 --- a/gitbutler-app/src/git/url/convert.rs +++ b/gitbutler-app/src/git/url/convert.rs @@ -62,20 +62,20 @@ mod tests { fn to_https_url_test() { for (input, expected) in [ ( - "https://github.com/gitbutlerapp/gitbutler-client.git", - "https://github.com/gitbutlerapp/gitbutler-client.git", + "https://github.com/gitbutlerapp/gitbutler.git", + "https://github.com/gitbutlerapp/gitbutler.git", ), ( - "http://github.com/gitbutlerapp/gitbutler-client.git", - "https://github.com/gitbutlerapp/gitbutler-client.git", + "http://github.com/gitbutlerapp/gitbutler.git", + "https://github.com/gitbutlerapp/gitbutler.git", ), ( - "git@github.com:gitbutlerapp/gitbutler-client.git", - "https://github.com/gitbutlerapp/gitbutler-client.git", + "git@github.com:gitbutlerapp/gitbutler.git", + "https://github.com/gitbutlerapp/gitbutler.git", ), ( - "ssh://git@github.com/gitbutlerapp/gitbutler-client.git", - "https://github.com/gitbutlerapp/gitbutler-client.git", + "ssh://git@github.com/gitbutlerapp/gitbutler.git", + "https://github.com/gitbutlerapp/gitbutler.git", ), ( "git@bitbucket.org:gitbutler-nikita/test.git", @@ -96,20 +96,20 @@ mod tests { fn to_ssh_url_test() { for (input, expected) in [ ( - "git@github.com:gitbutlerapp/gitbutler-client.git", - "git@github.com:gitbutlerapp/gitbutler-client.git", + "git@github.com:gitbutlerapp/gitbutler.git", + "git@github.com:gitbutlerapp/gitbutler.git", ), ( - "https://github.com/gitbutlerapp/gitbutler-client.git", - "git@github.com:gitbutlerapp/gitbutler-client.git", + "https://github.com/gitbutlerapp/gitbutler.git", + "git@github.com:gitbutlerapp/gitbutler.git", ), ( - "https://github.com/gitbutlerapp/gitbutler-client.git", - "git@github.com:gitbutlerapp/gitbutler-client.git", + "https://github.com/gitbutlerapp/gitbutler.git", + "git@github.com:gitbutlerapp/gitbutler.git", ), ( - "ssh://git@github.com/gitbutlerapp/gitbutler-client.git", - "ssh://git@github.com/gitbutlerapp/gitbutler-client.git", + "ssh://git@github.com/gitbutlerapp/gitbutler.git", + "ssh://git@github.com/gitbutlerapp/gitbutler.git", ), ( "https://bitbucket.org/gitbutler-nikita/test.git", diff --git a/gitbutler-app/src/virtual_branches/target/reader.rs b/gitbutler-app/src/virtual_branches/target/reader.rs index e3b3fedc2..8a7e4dcf9 100644 --- a/gitbutler-app/src/virtual_branches/target/reader.rs +++ b/gitbutler-app/src/virtual_branches/target/reader.rs @@ -115,7 +115,7 @@ mod tests { writer .write_string( "branches/target/remote", - "git@github.com:gitbutlerapp/gitbutler-client.git", + "git@github.com:gitbutlerapp/gitbutler.git", ) .unwrap(); writer @@ -132,10 +132,7 @@ mod tests { let read = reader.read_default().unwrap(); assert_eq!(read.branch.branch(), "master"); assert_eq!(read.branch.remote(), "origin"); - assert_eq!( - read.remote_url, - "git@github.com:gitbutlerapp/gitbutler-client.git" - ); + assert_eq!(read.remote_url, "git@github.com:gitbutlerapp/gitbutler.git"); assert_eq!( read.sha.to_string(), "dd945831869e9593448aa622fa4342bbfb84813d"