Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
275 lines
7.7 KiB
Rust
275 lines
7.7 KiB
Rust
use super::*;
|
||
use client::{Client, UserStore};
|
||
use clock::FakeSystemClock;
|
||
use gpui::{App, AppContext as _, Entity};
|
||
use http_client::FakeHttpClient;
|
||
use rpc::proto::{self};
|
||
use settings::SettingsStore;
|
||
|
||
#[gpui::test]
|
||
fn test_update_channels(cx: &mut App) {
|
||
let channel_store = init_test(cx);
|
||
|
||
update_channels(
|
||
&channel_store,
|
||
proto::UpdateChannels {
|
||
channels: vec![
|
||
proto::Channel {
|
||
id: 1,
|
||
name: "b".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: Vec::new(),
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 2,
|
||
name: "a".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: Vec::new(),
|
||
channel_order: 2,
|
||
},
|
||
],
|
||
..Default::default()
|
||
},
|
||
cx,
|
||
);
|
||
assert_channels(
|
||
&channel_store,
|
||
&[
|
||
//
|
||
(0, "b".to_string()),
|
||
(0, "a".to_string()),
|
||
],
|
||
cx,
|
||
);
|
||
|
||
update_channels(
|
||
&channel_store,
|
||
proto::UpdateChannels {
|
||
channels: vec![
|
||
proto::Channel {
|
||
id: 3,
|
||
name: "x".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![1],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 4,
|
||
name: "y".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![2],
|
||
channel_order: 1,
|
||
},
|
||
],
|
||
..Default::default()
|
||
},
|
||
cx,
|
||
);
|
||
assert_channels(
|
||
&channel_store,
|
||
&[
|
||
(0, "b".to_string()),
|
||
(1, "x".to_string()),
|
||
(0, "a".to_string()),
|
||
(1, "y".to_string()),
|
||
],
|
||
cx,
|
||
);
|
||
}
|
||
|
||
#[gpui::test]
|
||
fn test_update_channels_order_independent(cx: &mut App) {
|
||
/// Based on: https://stackoverflow.com/a/59939809
|
||
fn unique_permutations<T: Clone>(items: Vec<T>) -> Vec<Vec<T>> {
|
||
if items.len() == 1 {
|
||
vec![items]
|
||
} else {
|
||
let mut output: Vec<Vec<T>> = vec![];
|
||
|
||
for (ix, first) in items.iter().enumerate() {
|
||
let mut remaining_elements = items.clone();
|
||
remaining_elements.remove(ix);
|
||
for mut permutation in unique_permutations(remaining_elements) {
|
||
permutation.insert(0, first.clone());
|
||
output.push(permutation);
|
||
}
|
||
}
|
||
output
|
||
}
|
||
}
|
||
|
||
let test_data = vec![
|
||
proto::Channel {
|
||
id: 6,
|
||
name: "β".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![1, 3],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 5,
|
||
name: "α".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![1],
|
||
channel_order: 2,
|
||
},
|
||
proto::Channel {
|
||
id: 3,
|
||
name: "x".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![1],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 4,
|
||
name: "y".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![2],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 1,
|
||
name: "b".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: Vec::new(),
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 2,
|
||
name: "a".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: Vec::new(),
|
||
channel_order: 2,
|
||
},
|
||
];
|
||
|
||
let channel_store = init_test(cx);
|
||
let permutations = unique_permutations(test_data);
|
||
|
||
for test_instance in permutations {
|
||
channel_store.update(cx, |channel_store, _| channel_store.reset());
|
||
|
||
update_channels(
|
||
&channel_store,
|
||
proto::UpdateChannels {
|
||
channels: test_instance,
|
||
..Default::default()
|
||
},
|
||
cx,
|
||
);
|
||
|
||
assert_channels(
|
||
&channel_store,
|
||
&[
|
||
(0, "b".to_string()),
|
||
(1, "x".to_string()),
|
||
(2, "β".to_string()),
|
||
(1, "α".to_string()),
|
||
(0, "a".to_string()),
|
||
(1, "y".to_string()),
|
||
],
|
||
cx,
|
||
);
|
||
}
|
||
}
|
||
|
||
#[gpui::test]
|
||
fn test_dangling_channel_paths(cx: &mut App) {
|
||
let channel_store = init_test(cx);
|
||
|
||
update_channels(
|
||
&channel_store,
|
||
proto::UpdateChannels {
|
||
channels: vec![
|
||
proto::Channel {
|
||
id: 0,
|
||
name: "a".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 1,
|
||
name: "b".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![0],
|
||
channel_order: 1,
|
||
},
|
||
proto::Channel {
|
||
id: 2,
|
||
name: "c".to_string(),
|
||
visibility: proto::ChannelVisibility::Members as i32,
|
||
parent_path: vec![0, 1],
|
||
channel_order: 1,
|
||
},
|
||
],
|
||
..Default::default()
|
||
},
|
||
cx,
|
||
);
|
||
// Sanity check
|
||
assert_channels(
|
||
&channel_store,
|
||
&[
|
||
//
|
||
(0, "a".to_string()),
|
||
(1, "b".to_string()),
|
||
(2, "c".to_string()),
|
||
],
|
||
cx,
|
||
);
|
||
|
||
update_channels(
|
||
&channel_store,
|
||
proto::UpdateChannels {
|
||
delete_channels: vec![1, 2],
|
||
..Default::default()
|
||
},
|
||
cx,
|
||
);
|
||
|
||
// Make sure that the 1/2/3 path is gone
|
||
assert_channels(&channel_store, &[(0, "a".to_string())], cx);
|
||
}
|
||
|
||
fn init_test(cx: &mut App) -> Entity<ChannelStore> {
|
||
let settings_store = SettingsStore::test(cx);
|
||
cx.set_global(settings_store);
|
||
release_channel::init(semver::Version::new(0, 0, 0), cx);
|
||
|
||
let clock = Arc::new(FakeSystemClock::new());
|
||
let http = FakeHttpClient::with_404_response();
|
||
let client = Client::new(clock, http, cx);
|
||
let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
|
||
|
||
client::init(&client, cx);
|
||
crate::init(&client, user_store, cx);
|
||
|
||
ChannelStore::global(cx)
|
||
}
|
||
|
||
fn update_channels(
|
||
channel_store: &Entity<ChannelStore>,
|
||
message: proto::UpdateChannels,
|
||
cx: &mut App,
|
||
) {
|
||
let task = channel_store.update(cx, |store, cx| store.update_channels(message, cx));
|
||
assert!(task.is_none());
|
||
}
|
||
|
||
#[track_caller]
|
||
fn assert_channels(
|
||
channel_store: &Entity<ChannelStore>,
|
||
expected_channels: &[(usize, String)],
|
||
cx: &mut App,
|
||
) {
|
||
let actual = channel_store.update(cx, |store, _| {
|
||
store
|
||
.ordered_channels()
|
||
.map(|(depth, channel)| (depth, channel.name.to_string()))
|
||
.collect::<Vec<_>>()
|
||
});
|
||
assert_eq!(actual, expected_channels);
|
||
}
|