mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-21 08:31:40 +03:00
7d078de52f
We want to move towards having each functional domain in a separate crate. The main benefit of that for our project is that this will enforce a unidirectional dependency graph (i.e. no cycles). Starting off with virutal_branches - a lot of the implementation is still in core (i.e. virtual.rs), that will be moved in a separate PR. Furthermore, the virtual branches controller (as well as virtual.rs) contain functions not directly related to branches (e.g. commit reordering etc). That will be furthe separate in a crate.
205 lines
5.9 KiB
Rust
205 lines
5.9 KiB
Rust
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn twice() {
|
|
let data_dir = paths::data_dir();
|
|
let projects = projects::Controller::from_path(data_dir.path());
|
|
|
|
let test_project = TestProject::default();
|
|
|
|
let controller = Controller::default();
|
|
|
|
{
|
|
let project = projects
|
|
.add(test_project.path())
|
|
.expect("failed to add project");
|
|
controller
|
|
.set_base_branch(&project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
assert!(controller
|
|
.list_virtual_branches(&project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.is_empty());
|
|
projects.delete(project.id).await.unwrap();
|
|
controller
|
|
.list_virtual_branches(&project)
|
|
.await
|
|
.unwrap_err();
|
|
}
|
|
|
|
{
|
|
let project = projects.add(test_project.path()).unwrap();
|
|
controller
|
|
.set_base_branch(&project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
// even though project is on gitbutler/integration, we should not import it
|
|
assert!(controller
|
|
.list_virtual_branches(&project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.is_empty());
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn dirty_non_target() {
|
|
// a situation when you initialize project while being on the local verison of the master
|
|
// that has uncommited changes.
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
repository.checkout(&"refs/heads/some-feature".parse().unwrap());
|
|
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(branches[0].files[0].hunks.len(), 1);
|
|
assert!(branches[0].upstream.is_none());
|
|
assert_eq!(branches[0].name, "some-feature");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn dirty_target() {
|
|
// a situation when you initialize project while being on the local verison of the master
|
|
// that has uncommited changes.
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(branches[0].files[0].hunks.len(), 1);
|
|
assert!(branches[0].upstream.is_none());
|
|
assert_eq!(branches[0].name, "master");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn commit_on_non_target_local() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
repository.checkout(&"refs/heads/some-feature".parse().unwrap());
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
repository.commit_all("commit on target");
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert!(branches[0].files.is_empty());
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert!(branches[0].upstream.is_none());
|
|
assert_eq!(branches[0].name, "some-feature");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn commit_on_non_target_remote() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
repository.checkout(&"refs/heads/some-feature".parse().unwrap());
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
repository.commit_all("commit on target");
|
|
repository.push_branch(&"refs/heads/some-feature".parse().unwrap());
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert!(branches[0].files.is_empty());
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert!(branches[0].upstream.is_some());
|
|
assert_eq!(branches[0].name, "some-feature");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn commit_on_target() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
repository.commit_all("commit on target");
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert!(branches[0].files.is_empty());
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert!(branches[0].upstream.is_none());
|
|
assert_eq!(branches[0].name, "master");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn submodule() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
let test_project = TestProject::default();
|
|
let submodule_url: git::Url = test_project.path().display().to_string().parse().unwrap();
|
|
repository.add_submodule(&submodule_url, path::Path::new("submodule"));
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(branches[0].files[0].hunks.len(), 1);
|
|
}
|