Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix integration test flakes in CI #4391

Merged
merged 3 commits into from
Oct 20, 2022
Merged

Fix integration test flakes in CI #4391

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15facc0
Use helix_view::apply_transaction in integration-tests
the-mikedavis Oct 20, 2022
7d7ee75
Remove language-server configuration in integration tests
the-mikedavis Oct 20, 2022
c4875cc
Silence dead_code warning on AppBuilder::with_config
the-mikedavis Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions helix-term/tests/test/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,12 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
let sel = doc.selection(view.id).clone();

// replace the initial text with the input text
doc.apply(
&Transaction::change_by_selection(doc.text(), &sel, |_| {
(0, doc.text().len_chars(), Some((&test_case.in_text).into()))
})
.with_selection(test_case.in_selection.clone()),
view.id,
);
let transaction = Transaction::change_by_selection(doc.text(), &sel, |_| {
(0, doc.text().len_chars(), Some((&test_case.in_text).into()))
})
.with_selection(test_case.in_selection.clone());

helix_view::apply_transaction(&transaction, doc, view);

test_key_sequence(
&mut app,
Expand All @@ -144,9 +143,27 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(

/// Generates language configs that merge in overrides, like a user language
/// config. The argument string must be a raw TOML document.
///
/// By default, language server configuration is dropped from the languages.toml
/// document. If a language-server is necessary for a test, it must be explicitly
/// added in `overrides`.
pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Configuration {
let mut lang = helix_loader::config::default_lang_config();

for lang_config in lang
.as_table_mut()
.expect("Expected languages.toml to be a table")
.get_mut("language")
.expect("Expected languages.toml to have \"language\" keys")
.as_array_mut()
.expect("Expected an array of language configurations")
{
lang_config
.as_table_mut()
.expect("Expected language config to be a TOML table")
.remove("language-server");
}

if let Some(overrides) = overrides {
let override_toml = toml::from_str(&overrides).unwrap();
lang = helix_loader::merge_toml_values(lang, override_toml, 3);
Expand Down Expand Up @@ -237,14 +254,24 @@ pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
Ok(file)
}

#[derive(Default)]
pub struct AppBuilder {
args: Args,
config: Config,
syn_conf: helix_core::syntax::Configuration,
input: Option<(String, Selection)>,
}

impl Default for AppBuilder {
fn default() -> Self {
Self {
args: Args::default(),
config: Config::default(),
syn_conf: test_syntax_conf(None),
input: None,
}
}
}

impl AppBuilder {
pub fn new() -> Self {
AppBuilder::default()
Expand All @@ -259,6 +286,8 @@ impl AppBuilder {
self
}

// Remove this attribute once `with_config` is used in a test:
#[allow(dead_code)]
pub fn with_config(mut self, config: Config) -> Self {
self.config = config;
self
Expand Down Expand Up @@ -286,7 +315,7 @@ impl AppBuilder {
.with_selection(selection);

// replace the initial text with the input text
doc.apply(&trans, view.id);
helix_view::apply_transaction(&trans, doc, view);
}

Ok(app)
Expand Down